summaryrefslogtreecommitdiff
path: root/package/boot
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
parent3f55e5aeb5ef269db8e64eea1b113cb6daf20327 (diff)
downloadmtk-20170518-c9e4cf229923cf6fa79729a764f651827086e3f1.zip
mtk-20170518-c9e4cf229923cf6fa79729a764f651827086e3f1.tar.gz
mtk-20170518-c9e4cf229923cf6fa79729a764f651827086e3f1.tar.bz2
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')
-rw-r--r--package/boot/uboot-kirkwood/patches/120-iconnect.patch21
-rw-r--r--package/boot/uboot-kirkwood/patches/130-ib62x0.patch27
-rw-r--r--package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch19
-rw-r--r--package/boot/uboot-kirkwood/patches/200-openwrt-config.patch6
4 files changed, 39 insertions, 34 deletions
diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
index 501f3f6..102a147 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
diff --git a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
index baed02a..f2ba813 100644
--- a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
+++ b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
@@ -1,21 +1,36 @@
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
-@@ -74,7 +74,8 @@
+@@ -62,27 +62,22 @@
+ */
+ #define CONFIG_BOOTCOMMAND \
+ "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; " \
++ "ubi read 0x800000 kernel; " \
++ "bootm 0x800000"
+
+ #define CONFIG_MTDPARTS \
"mtdparts=orion_nand:" \
"0xe0000@0x0(uboot)," \
"0x20000@0xe0000(uboot_env)," \
- "-@0x100000(root)\0"
+ "0x100000@0x100000(second_stage_uboot)," \
-+ "-@0x200000(root)\0"
++ "-@0x200000(ubi)\0"
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
-@@ -82,7 +83,7 @@
+ "mtdids=nand0=orion_nand\0" \
"mtdparts="CONFIG_MTDPARTS \
- "kernel=/boot/zImage\0" \
- "fdt=/boot/ib62x0.dtb\0" \
+- "kernel=/boot/zImage\0" \
+- "fdt=/boot/ib62x0.dtb\0" \
- "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
-+ "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
++ "bootargs_root=\0"
/*
* Ethernet driver configuration
diff --git a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
index 5eb9a12..f803467 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
diff --git a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
index e9cca08..37f30d0 100644
--- a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
+++ b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
@@ -19,7 +19,7 @@
#endif /* _CONFIG_DOCKSTAR_H */
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
-@@ -114,4 +114,6 @@
+@@ -108,4 +108,6 @@
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
@@ -28,7 +28,7 @@
#endif /* _CONFIG_IB62x0_H */
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
-@@ -109,4 +109,6 @@
+@@ -103,4 +103,6 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
@@ -80,7 +80,7 @@
+#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
-@@ -104,4 +104,6 @@
+@@ -99,4 +99,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_LZO