aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.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/140-pogoplug_e02.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/140-pogoplug_e02.patch')
-rw-r--r--package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch19
1 files changed, 7 insertions, 12 deletions
diff --git a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
index 5eb9a12454..f803467739 100644
--- a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
+++ b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
@@ -1,6 +1,6 @@
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
-@@ -54,23 +54,35 @@
+@@ -54,23 +54,30 @@
#endif
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
@@ -15,20 +15,17 @@
- "run bootcmd_usb; " \
- "bootm 0x00800000 0x01100000"
+ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
-+ "ubi part root; " \
-+ "ubifsmount ubi:rootfs; " \
-+ "ubifsload 0x800000 ${kernel}; " \
-+ "ubifsload 0x700000 ${fdt}; " \
-+ "ubifsumount; " \
-+ "fdt addr 0x700000; fdt resize; fdt chosen; " \
-+ "bootz 0x800000 - 0x700000"
++ "ubi part ubi; " \
++ "ubifsmount ubi:rootfs; " \
++ "ubi read 0x800000 kernel; " \
++ "bootm 0x800000"
+
+#define CONFIG_MTDPARTS \
+ "mtdparts=orion_nand:" \
+ "0xe0000@0x0(uboot)," \
+ "0x20000@0xe0000(uboot_env)," \
+ "0x100000@0x100000(second_stage_uboot)," \
-+ "-@0x200000(root)\0"
++ "-@0x200000(ubi)\0"
#define CONFIG_EXTRA_ENV_SETTINGS \
- "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
@@ -40,9 +37,7 @@
+ "console=console=ttyS0,115200\0" \
+ "mtdids=nand0=orion_nand\0" \
+ "mtdparts="CONFIG_MTDPARTS \
-+ "kernel=/boot/zImage\0" \
-+ "fdt=/boot/pogo_e02.dtb\0" \
-+ "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
++ "bootargs_root=\0"
/*
* Ethernet Driver configuration