aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-kirkwood/patches/120-iconnect.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/boot/uboot-kirkwood/patches/120-iconnect.patch')
-rw-r--r--package/boot/uboot-kirkwood/patches/120-iconnect.patch24
1 files changed, 10 insertions, 14 deletions
diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
index bd1dab818f..d2e89115e8 100644
--- a/package/boot/uboot-kirkwood/patches/120-iconnect.patch
+++ b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
@@ -1,6 +1,6 @@
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
-@@ -44,30 +44,29 @@
+@@ -44,24 +44,22 @@
#define CONFIG_ENV_SECT_SIZE 0x20000
#endif
#define CONFIG_ENV_SIZE 0x20000
@@ -19,21 +19,10 @@
+ "ubi read 0x800000 kernel; " \
"bootm 0x800000"
- #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(ubi)\0"
-
#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"
+ "bootargs_root=\0"
@@ -42,7 +31,7 @@
* Ethernet driver configuration
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
-@@ -10,6 +10,7 @@ CONFIG_SYS_PROMPT="iconnect => "
+@@ -10,12 +10,13 @@ CONFIG_SYS_PROMPT="iconnect => "
CONFIG_CMD_NAND=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
@@ -50,3 +39,10 @@
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