uboot-kirkwood: fix malformed boot configuration

[openwrt/staging/mkresin.git] / package / boot / uboot-kirkwood / patches / 120-iconnect.patch

diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
index 36655a98a5740f018d514b18117094f60a77a5b7..114aa1559da26d95f37eda483cf3503d2ad8c454 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/120-iconnect.patch
+++ b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
@@ -1,57 +1,49 @@
 --- a/include/configs/iconnect.h
 +++ b/include/configs/iconnect.h
-@@ -65,30 +65,35 @@
- #define CONFIG_ENV_IS_NOWHERE
+@@ -44,24 +44,22 @@
+ #define CONFIG_ENV_SECT_SIZE  0x20000
  #endif
  #define CONFIG_ENV_SIZE               0x20000
 -#define CONFIG_ENV_OFFSET     0x80000
 +#define CONFIG_ENV_OFFSET     0xe0000
- 
+
  /*
   * Default environment variables
   */
  #define CONFIG_BOOTCOMMAND \
        "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
 -      "ubi part rootfs; "                                             \
-+      "ubi part root; "                                               \
-       "ubifsmount ubi:rootfs; "                                       \
-       "ubifsload 0x800000 ${kernel}; "                                \
--      "bootm 0x800000"
-+      "ubifsload 0x700000 ${fdt}; "                                   \
-+      "ubifsumount; "                                                 \
-+      "fdt addr 0x700000; fdt resize; fdt chosen; "                   \
-+      "bootz 0x800000 - 0x700000"
- 
- #define CONFIG_MTDPARTS \
--      "mtdparts=orion_nand:"          \
--      "0x80000@0x0(uboot),"           \
--      "0x20000@0x80000(uboot_env),"   \
--      "-@0xa0000(rootfs)\0"
-+      "mtdparts=orion_nand:"                          \
-+      "0xe0000@0x0(uboot),"                           \
-+      "0x20000@0xe0000(uboot_env),"                   \
-+      "0x100000@0x100000(second_stage_uboot),"        \
-+      "-@0x200000(root)\0"
- 
+-      "ubifsmount ubi:rootfs; "                                       \
+-      "ubifsload 0x800000 ${kernel}; "                                \
++      "ubi part ubi; " \
++      "ubi read 0x800000 kernel; " \
+       "bootm 0x800000"
+
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"        \
        "mtdids=nand0=orion_nand\0"             \
-       "mtdparts="CONFIG_MTDPARTS              \
+-      "mtdparts="CONFIG_MTDPARTS_DEFAULT      \
 -      "kernel=/boot/uImage\0"                 \
 -      "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
-+      "kernel=/boot/zImage\0"                 \
-+      "fdt=/boot/iconnect.dtb\0"              \
-+      "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
- 
++      "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
++      "bootargs_root=\0"
+
  /*
   * Ethernet driver configuration
---- a/boards.cfg
-+++ b/boards.cfg
-@@ -164,6 +164,7 @@ Active  arm         arm926ejs      kirkw
- Active  arm         arm926ejs      kirkwood    cloudengines    -                   pogo_e02                             -                                                                                                                                 Dave Purdy <david.c.purdy@gmail.com>
- Active  arm         arm926ejs      kirkwood    d-link          -                   dns325                               -                                                                                                                                 Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
- Active  arm         arm926ejs      kirkwood    iomega          -                   iconnect                             -                                                                                                                                 Luka Perkov <luka@openwrt.org>
-+Active  arm         arm926ejs      kirkwood    iomega          iconnect            iconnect_second_stage                iconnect:SECOND_STAGE                                                                                                             Luka Perkov <luka@openwrt.org>
- Active  arm         arm926ejs      kirkwood    karo            tk71                tk71                                 -                                                                                                                                 -
- Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood                          km_kirkwood:KM_KIRKWOOD                                                                                                           Valentin Longchamp <valentin.longchamp@keymile.com>
- Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood_pci                      km_kirkwood:KM_KIRKWOOD_PCI                                                                                                       Valentin Longchamp <valentin.longchamp@keymile.com>
+--- a/configs/iconnect_defconfig
++++ b/configs/iconnect_defconfig
+@@ -10,12 +10,13 @@ CONFIG_SYS_PROMPT="iconnect => "
+ CONFIG_CMD_NAND=y
+ CONFIG_CMD_USB=y
+ # CONFIG_CMD_SETEXPR is not set
++CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_JFFS2=y
+-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x80000@0x0(uboot),0x20000@0x80000(uboot_env),-@0xa0000(rootfs)"
++CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
+ CONFIG_CMD_UBI=y
+ CONFIG_ISO_PARTITION=y
+ CONFIG_ENV_IS_IN_NAND=y