package/boot/uboot-kirkwood/patches/120-iconnect.patch

   1 --- a/include/configs/iconnect.h
   2 +++ b/include/configs/iconnect.h
   3 @@ -66,30 +66,29 @@
   4  #define CONFIG_ENV_IS_NOWHERE
   5  #endif
   6  #define CONFIG_ENV_SIZE                0x20000
   7 -#define CONFIG_ENV_OFFSET      0x80000
   8 +#define CONFIG_ENV_OFFSET      0xe0000
   9
  10  /*
  11   * Default environment variables
  12   */
  13  #define CONFIG_BOOTCOMMAND \
  14         "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
  15 -       "ubi part rootfs; "                                             \
  16 -       "ubifsmount ubi:rootfs; "                                       \
  17 -       "ubifsload 0x800000 ${kernel}; "                                \
  18 -       "bootm 0x800000"
  19 +       "ubi part ubi; "                                                \
  20 +       "ubi read 0x800000 kernel; "                    \
  21 +       "bootz 0x800000"
  22
  23  #define CONFIG_MTDPARTS \
  24 -       "mtdparts=orion_nand:"          \
  25 -       "0x80000@0x0(uboot),"           \
  26 -       "0x20000@0x80000(uboot_env),"   \
  27 -       "-@0xa0000(rootfs)\0"
  28 +       "mtdparts=orion_nand:"                          \
  29 +       "0xe0000@0x0(uboot),"                           \
  30 +       "0x20000@0xe0000(uboot_env),"                   \
  31 +       "0x100000@0x100000(second_stage_uboot),"        \
  32 +       "-@0x200000(ubi)\0"
  33
  34  #define CONFIG_EXTRA_ENV_SETTINGS \
  35         "console=console=ttyS0,115200\0"        \
  36         "mtdids=nand0=orion_nand\0"             \
  37         "mtdparts="CONFIG_MTDPARTS              \
  38 -       "kernel=/boot/uImage\0"                 \
  39 -       "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
  40 +       "bootargs_root=\0"
  41
  42  /*
  43   * Ethernet driver configuration