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

   1 --- a/include/configs/iconnect.h
   2 +++ b/include/configs/iconnect.h
   3 @@ -44,17 +44,15 @@
   4   */
   5  #define CONFIG_BOOTCOMMAND \
   6         "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
   7 -       "ubi part rootfs; "                                             \
   8 -       "ubifsmount ubi:rootfs; "                                       \
   9 -       "ubifsload 0x800000 ${kernel}; "                                \
  10 +       "ubi part ubi; " \
  11 +       "ubi read 0x800000 kernel; " \
  12         "bootm 0x800000"
  13
  14  #define CONFIG_EXTRA_ENV_SETTINGS \
  15         "console=console=ttyS0,115200\0"        \
  16         "mtdids=nand0=orion_nand\0"             \
  17 -       "mtdparts="CONFIG_MTDPARTS_DEFAULT      \
  18 -       "kernel=/boot/uImage\0"                 \
  19 -       "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
  20 +       "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
  21 +       "bootargs_root=\0"
  22
  23  /*
  24   * Ethernet driver configuration
  25 --- a/configs/iconnect_defconfig
  26 +++ b/configs/iconnect_defconfig
  27 @@ -5,7 +5,7 @@ CONFIG_KIRKWOOD=y
  28  CONFIG_SYS_TEXT_BASE=0x600000
  29  CONFIG_TARGET_ICONNECT=y
  30  CONFIG_ENV_SIZE=0x20000
  31 -CONFIG_ENV_OFFSET=0x80000
  32 +CONFIG_ENV_OFFSET=0xE0000
  33  CONFIG_NR_DRAM_BANKS=2
  34  CONFIG_IDENT_STRING=" Iomega iConnect"
  35  CONFIG_BOOTDELAY=3
  36 @@ -16,13 +16,14 @@ CONFIG_SYS_PROMPT="iconnect => "
  37  CONFIG_CMD_NAND=y
  38  CONFIG_CMD_USB=y
  39  # CONFIG_CMD_SETEXPR is not set
  40 +CONFIG_CMD_DHCP=y
  41  CONFIG_CMD_MII=y
  42  CONFIG_CMD_PING=y
  43  CONFIG_CMD_EXT2=y
  44  CONFIG_CMD_FAT=y
  45  CONFIG_CMD_JFFS2=y
  46  CONFIG_CMD_MTDPARTS=y
  47 -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x80000@0x0(uboot),0x20000@0x80000(uboot_env),-@0xa0000(rootfs)"
  48 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
  49  CONFIG_CMD_UBI=y
  50  CONFIG_ISO_PARTITION=y
  51  CONFIG_OF_CONTROL=y