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/110-dockstar.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/110-dockstar.patch')
| -rw-r--r-- | package/boot/uboot-kirkwood/patches/110-dockstar.patch | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/package/boot/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch index 94d62cee82..43dce1a0d3 100644 --- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch +++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch @@ -1,14 +1,14 @@ --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ + #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ #define CONFIG_KW88F6281 1 /* SOC Name */ - #define CONFIG_MACH_DOCKSTAR /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SYS_MVFS /* * mv-common.h should be defined after CMD configs since it used them -@@ -37,29 +38,29 @@ +@@ -36,27 +37,22 @@ * it has to be rounded to sector size */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */ @@ -26,30 +26,32 @@ - "ubifsload 0x800000 ${kernel}; " \ - "ubifsload 0x1100000 ${initrd}; " \ - "bootm 0x800000 0x1100000" -- --#define CONFIG_MTDPARTS "mtdparts=orion_nand:1m(uboot),-(root)\0" + "ubi part ubi; " \ + "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(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" \ - "initrd=/boot/uInitrd\0" \ - "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0" + "console=console=ttyS0,115200\0" \ + "mtdids=nand0=orion_nand\0" \ -+ "mtdparts="CONFIG_MTDPARTS \ ++ "mtdparts="CONFIG_MTDPARTS_DEFAULT \ + "bootargs_root=\0" /* * Ethernet Driver configuration +--- a/configs/dockstar_defconfig ++++ b/configs/dockstar_defconfig +@@ -16,7 +16,7 @@ CONFIG_CMD_PING=y + CONFIG_CMD_EXT2=y + CONFIG_CMD_FAT=y + CONFIG_CMD_JFFS2=y +-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),-(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 |