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

   1 --- a/include/configs/iconnect.h
   2 +++ b/include/configs/iconnect.h
   3 @@ -44,24 +44,22 @@
   4  #define CONFIG_ENV_SECT_SIZE   0x20000
   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 +       "ubi part ubi; " \
  19 +       "ubi read 0x800000 kernel; " \
  20         "bootm 0x800000"
  21
  22  #define CONFIG_EXTRA_ENV_SETTINGS \
  23         "console=console=ttyS0,115200\0"        \
  24         "mtdids=nand0=orion_nand\0"             \
  25 -       "mtdparts="CONFIG_MTDPARTS_DEFAULT      \
  26 -       "kernel=/boot/uImage\0"                 \
  27 -       "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
  28 +       "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
  29 +       "bootargs_root=\0"
  30
  31  /*
  32   * Ethernet driver configuration
  33 --- a/configs/iconnect_defconfig
  34 +++ b/configs/iconnect_defconfig
  35 @@ -10,12 +10,13 @@ CONFIG_SYS_PROMPT="iconnect => "
  36  CONFIG_CMD_NAND=y
  37  CONFIG_CMD_USB=y
  38  # CONFIG_CMD_SETEXPR is not set
  39 +CONFIG_CMD_DHCP=y
  40  CONFIG_CMD_MII=y
  41  CONFIG_CMD_PING=y
  42  CONFIG_CMD_EXT2=y
  43  CONFIG_CMD_FAT=y
  44  CONFIG_CMD_JFFS2=y
  45 -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x80000@0x0(uboot),0x20000@0x80000(uboot_env),-@0xa0000(rootfs)"
  46 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
  47  CONFIG_CMD_UBI=y
  48  CONFIG_ISO_PARTITION=y
  49  CONFIG_ENV_IS_IN_NAND=y