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/140-pogoplug_e02.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/140-pogoplug_e02.patch')
| -rw-r--r-- | package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch index 5c8ff35bee..34379f2617 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 -@@ -44,23 +44,30 @@ +@@ -44,23 +44,23 @@ #endif #define CONFIG_ENV_SIZE 0x20000 /* 128k */ @@ -14,18 +14,11 @@ - "setenv bootargs $(bootargs_console); " \ - "run bootcmd_usb; " \ - "bootm 0x00800000 0x01100000" -+ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ ++ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ + "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(ubi)\0" #define CONFIG_EXTRA_ENV_SETTINGS \ - "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \ @@ -36,8 +29,18 @@ - "ext2load usb 0:1 0x01100000 /uInitrd\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/pogo_e02_defconfig ++++ b/configs/pogo_e02_defconfig +@@ -16,6 +16,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@0x100000(second_stage_uboot),-@0x200000(ubi)" + CONFIG_CMD_UBI=y + CONFIG_ISO_PARTITION=y + CONFIG_ENV_IS_IN_NAND=y |