package/boot/uboot-kirkwood/patches/130-ib62x0.patch

   1 --- a/include/configs/ib62x0.h
   2 +++ b/include/configs/ib62x0.h
   3 @@ -62,27 +62,22 @@
   4   */
   5  #define CONFIG_BOOTCOMMAND \
   6         "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
   7 -       "ubi part root; "                                               \
   8 -       "ubifsmount ubi:rootfs; "                                       \
   9 -       "ubifsload 0x800000 ${kernel}; "                                \
  10 -       "ubifsload 0x700000 ${fdt}; "                                   \
  11 -       "ubifsumount; "                                                 \
  12 -       "fdt addr 0x700000; fdt resize; fdt chosen; "                   \
  13 -       "bootz 0x800000 - 0x700000"
  14 +       "ubi part ubi; " \
  15 +       "ubi read 0x800000 kernel; " \
  16 +       "bootm 0x800000"
  17
  18  #define CONFIG_MTDPARTS \
  19         "mtdparts=orion_nand:"                                          \
  20         "0xe0000@0x0(uboot),"                                           \
  21         "0x20000@0xe0000(uboot_env),"                                   \
  22 -       "-@0x100000(root)\0"
  23 +       "0x100000@0x100000(second_stage_uboot),"                        \
  24 +       "-@0x200000(ubi)\0"
  25
  26  #define CONFIG_EXTRA_ENV_SETTINGS \
  27         "console=console=ttyS0,115200\0"                                \
  28         "mtdids=nand0=orion_nand\0"                                     \
  29         "mtdparts="CONFIG_MTDPARTS                                      \
  30 -       "kernel=/boot/zImage\0"                                         \
  31 -       "fdt=/boot/ib62x0.dtb\0"                                        \
  32 -       "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
  33 +       "bootargs_root=\0"
  34
  35  /*
  36   * Ethernet driver configuration