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/200-openwrt-config.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/200-openwrt-config.patch')
| -rw-r--r-- | package/boot/uboot-kirkwood/patches/200-openwrt-config.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch index 04614f77cc..6400e5bb69 100644 --- a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch +++ b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig -@@ -90,4 +90,7 @@ source "board/zyxel/nsa310/Kconfig" +@@ -94,4 +94,7 @@ source "board/zyxel/nsa310/Kconfig" source "board/zyxel/nsa310s/Kconfig" source "board/zyxel/nsa325/Kconfig" @@ -10,7 +10,7 @@ endif --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h -@@ -76,4 +76,6 @@ +@@ -68,4 +68,6 @@ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS @@ -19,7 +19,7 @@ #endif /* _CONFIG_DOCKSTAR_H */ --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h -@@ -94,4 +94,6 @@ +@@ -87,4 +87,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 -@@ -83,4 +83,6 @@ +@@ -76,4 +76,6 @@ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS @@ -71,7 +71,7 @@ +#endif /* __OPENWRT_KIRKWOOD_COMMON_H */ --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h -@@ -83,4 +83,6 @@ +@@ -76,4 +76,6 @@ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS @@ -80,7 +80,7 @@ #endif /* _CONFIG_POGO_E02_H */ --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h -@@ -105,4 +105,6 @@ +@@ -101,4 +101,6 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */ @@ -89,7 +89,7 @@ #endif /* _CONFIG_GOFLEXHOME_H */ --- a/include/configs/nsa310.h +++ b/include/configs/nsa310.h -@@ -123,4 +123,6 @@ +@@ -116,4 +116,6 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */ @@ -98,7 +98,7 @@ #endif /* _CONFIG_NSA310_H */ --- a/configs/dockstar_defconfig +++ b/configs/dockstar_defconfig -@@ -25,3 +25,8 @@ CONFIG_USB=y +@@ -26,3 +26,8 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y @@ -109,7 +109,7 @@ +CONFIG_LZO=y --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig -@@ -29,3 +29,8 @@ CONFIG_USB=y +@@ -32,3 +32,8 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y @@ -120,20 +120,19 @@ +CONFIG_LZO=y --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig -@@ -27,5 +27,9 @@ CONFIG_SYS_NS16550=y +@@ -29,5 +29,8 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_LZMA=y CONFIG_OF_LIBFDT=y -+CONFIG_CMD_BOOTZ=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_LZMA=y +CONFIG_LZO=y --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig -@@ -24,5 +24,9 @@ CONFIG_SYS_NS16550=y +@@ -25,5 +25,9 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y @@ -146,7 +145,7 @@ +CONFIG_LZO=y --- a/configs/nsa310_defconfig +++ b/configs/nsa310_defconfig -@@ -30,5 +30,8 @@ CONFIG_CMD_UBI=y +@@ -32,6 +32,9 @@ CONFIG_CMD_UBI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y @@ -155,9 +154,10 @@ +CONFIG_FIT_VERBOSE=y CONFIG_LZMA=y CONFIG_LZO=y + CONFIG_SYS_LONGHELP=y --- a/configs/pogo_e02_defconfig +++ b/configs/pogo_e02_defconfig -@@ -25,3 +25,8 @@ CONFIG_USB=y +@@ -26,3 +26,8 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y |