aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-kirkwood/patches/120-iconnect.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-12-22 15:07:38 +0100
committerFelix Fietkau <nbd@nbd.name>2016-12-24 09:40:46 +0100
commitc9e4cf229923cf6fa79729a764f651827086e3f1 (patch)
tree746e4fc846cca04bc0be8c083eba997c4c4e0424 /package/boot/uboot-kirkwood/patches/120-iconnect.patch
parent3f55e5aeb5ef269db8e64eea1b113cb6daf20327 (diff)
downloadupstream-c9e4cf229923cf6fa79729a764f651827086e3f1.tar.gz
upstream-c9e4cf229923cf6fa79729a764f651827086e3f1.tar.bz2
upstream-c9e4cf229923cf6fa79729a764f651827086e3f1.zip
kirkwood: convert iconnect, ib62x0 and pogoplug_e02 to the new image build code
Update the correspoding u-boot configs to stop relying on kernel-in-rootfs, which was removed a while back Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/boot/uboot-kirkwood/patches/120-iconnect.patch')
-rw-r--r--package/boot/uboot-kirkwood/patches/120-iconnect.patch21
1 files changed, 8 insertions, 13 deletions
diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
index 501f3f610e..102a147c2f 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
-@@ -59,30 +59,35 @@
+@@ -59,30 +59,29 @@
#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x20000
@@ -13,14 +13,11 @@
#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"
+- "ubifsmount ubi:rootfs; " \
+- "ubifsload 0x800000 ${kernel}; " \
++ "ubi part ubi; " \
++ "ubi read 0x800000 kernel; " \
+ "bootm 0x800000"
#define CONFIG_MTDPARTS \
- "mtdparts=orion_nand:" \
@@ -31,7 +28,7 @@
+ "0xe0000@0x0(uboot)," \
+ "0x20000@0xe0000(uboot_env)," \
+ "0x100000@0x100000(second_stage_uboot)," \
-+ "-@0x200000(root)\0"
++ "-@0x200000(ubi)\0"
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
@@ -39,9 +36,7 @@
"mtdparts="CONFIG_MTDPARTS \
- "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"
++ "bootargs_root=\0"
/*
* Ethernet driver configuration