diff options
| author | Paul Wassi <p.wassi@gmx.at> | 2018-03-13 17:25:20 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-20 21:45:27 +0100 |
| commit | f21cd9640052a733e1759519e3d7ca0f9453653b (patch) | |
| tree | 5441029a3371926da96ce49ac8a74745f08b139e /package/boot/uboot-kirkwood/patches/120-iconnect.patch | |
| parent | 89b8ba96b404d2e412d5573e25348287255671dd (diff) | |
| download | upstream-f21cd9640052a733e1759519e3d7ca0f9453653b.tar.gz upstream-f21cd9640052a733e1759519e3d7ca0f9453653b.tar.bz2 upstream-f21cd9640052a733e1759519e3d7ca0f9453653b.zip | |
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 <p.wassi@gmx.at>
Diffstat (limited to 'package/boot/uboot-kirkwood/patches/120-iconnect.patch')
| -rw-r--r-- | package/boot/uboot-kirkwood/patches/120-iconnect.patch | 24 |
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 |