From f21cd9640052a733e1759519e3d7ca0f9453653b Mon Sep 17 00:00:00 2001 From: Paul Wassi Date: Tue, 13 Mar 2018 17:25:20 +0100 Subject: uboot-kirkwood: update to 2018.03 U-Boot now requires GCC > 5 Catch up with upstream and move some configuration options from the header files to the corresponding defconfig files. Also move some options of patch 010 affecting the whole platform to 010's device only. Signed-off-by: Paul Wassi --- .../boot/uboot-kirkwood/patches/130-ib62x0.patch | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'package/boot/uboot-kirkwood/patches/130-ib62x0.patch') diff --git a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch index 58db8c8..ec0792c 100644 --- a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch +++ b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch @@ -1,6 +1,6 @@ --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h -@@ -49,27 +49,22 @@ +@@ -49,21 +49,15 @@ */ #define CONFIG_BOOTCOMMAND \ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ @@ -15,18 +15,10 @@ + "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(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/zImage\0" \ - "fdt=/boot/ib62x0.dtb\0" \ - "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0" @@ -34,3 +26,14 @@ /* * Ethernet driver configuration +--- a/configs/ib62x0_defconfig ++++ b/configs/ib62x0_defconfig +@@ -19,7 +19,7 @@ CONFIG_CMD_PING=y + CONFIG_CMD_EXT2=y + CONFIG_CMD_FAT=y + CONFIG_CMD_JFFS2=y +-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),-@0x100000(root)" ++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 -- cgit v1.1