From: Paul Wassi <p.wa...@gmx.at> Bump U-Boot for Kirkwood to upstream 2016.11. Local patches refreshed.
Signed-off-by: Paul Wassi <p.wa...@gmx.at> --- This patch bumps uboot-kirkwood to 2016.11. Compile-tested, run-tested on Seagate Dockstar. package/boot/uboot-kirkwood/Makefile | 4 +- package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-add-CONFIG_SYS_GENERIC_BOARD-define.patch | 2 - package/boot/uboot-kirkwood/patches/0002-kirkwood-dockstar-add-CONFIG_SYS_GENERIC_BOARD-defin.patch | 2 - package/boot/uboot-kirkwood/patches/0003-kirkwood-goflexhome-add-CONFIG_SYS_GENERIC_BOARD-def.patch | 2 - package/boot/uboot-kirkwood/patches/0004-kirkwood-iconnect-add-CONFIG_SYS_GENERIC_BOARD-defin.patch | 2 - package/boot/uboot-kirkwood/patches/0006-kirkwood-sheevaplug-add-CONFIG_SYS_GENERIC_BOARD-def.patch | 2 - package/boot/uboot-kirkwood/patches/110-dockstar.patch | 4 +- package/boot/uboot-kirkwood/patches/120-iconnect.patch | 4 +- package/boot/uboot-kirkwood/patches/130-ib62x0.patch | 4 +- package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch | 2 - package/boot/uboot-kirkwood/patches/150-goflexhome.patch | 2 - package/boot/uboot-kirkwood/patches/200-openwrt-config.patch | 14 +++++----- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package/boot/uboot-kirkwood/Makefile b/package/boot/uboot-kirkwood/Makefile --- a/package/boot/uboot-kirkwood/Makefile +++ b/package/boot/uboot-kirkwood/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=u-boot -PKG_VERSION:=2016.09.01 +PKG_VERSION:=2016.11 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=\ http://mirror2.openwrt.org/sources \ ftp://ftp.denx.de/pub/u-boot -PKG_MD5SUM:=61c628f8034477c946e173ed174efeb4 +PKG_MD5SUM:=ca1f6e019d08aff8d0ca1beb2e66737d PKG_TARGETS:=bin PKG_LICENSE:=GPL-2.0 GPL-2.0+ diff --git a/package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-add-CONFIG_SYS_GENERIC_BOARD-define.patch b/package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-add-CONFIG_SYS_GENERIC_BOARD-define.patch --- a/package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-add-CONFIG_SYS_GENERIC_BOARD-define.patch +++ b/package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-add-CONFIG_SYS_GENERIC_BOARD-define.patch @@ -23,5 +23,5 @@ http://lists.denx.de/pipermail/u-boot/2014-July/182900.html +#define CONFIG_SYS_GENERIC_BOARD + /* - * Version number information + * High level configuration options */ diff --git a/package/boot/uboot-kirkwood/patches/0002-kirkwood-dockstar-add-CONFIG_SYS_GENERIC_BOARD-defin.patch b/package/boot/uboot-kirkwood/patches/0002-kirkwood-dockstar-add-CONFIG_SYS_GENERIC_BOARD-defin.patch --- a/package/boot/uboot-kirkwood/patches/0002-kirkwood-dockstar-add-CONFIG_SYS_GENERIC_BOARD-defin.patch +++ b/package/boot/uboot-kirkwood/patches/0002-kirkwood-dockstar-add-CONFIG_SYS_GENERIC_BOARD-defin.patch @@ -19,5 +19,5 @@ CC: Stefan Roese <s...@denx.de> +#define CONFIG_SYS_GENERIC_BOARD + /* - * Version number information + * High Level Configuration Options (easy to change) */ diff --git a/package/boot/uboot-kirkwood/patches/0003-kirkwood-goflexhome-add-CONFIG_SYS_GENERIC_BOARD-def.patch b/package/boot/uboot-kirkwood/patches/0003-kirkwood-goflexhome-add-CONFIG_SYS_GENERIC_BOARD-def.patch --- a/package/boot/uboot-kirkwood/patches/0003-kirkwood-goflexhome-add-CONFIG_SYS_GENERIC_BOARD-def.patch +++ b/package/boot/uboot-kirkwood/patches/0003-kirkwood-goflexhome-add-CONFIG_SYS_GENERIC_BOARD-def.patch @@ -19,5 +19,5 @@ CC: Stefan Roese <s...@denx.de> +#define CONFIG_SYS_GENERIC_BOARD + /* - * Version number information + * High Level Configuration Options (easy to change) */ diff --git a/package/boot/uboot-kirkwood/patches/0004-kirkwood-iconnect-add-CONFIG_SYS_GENERIC_BOARD-defin.patch b/package/boot/uboot-kirkwood/patches/0004-kirkwood-iconnect-add-CONFIG_SYS_GENERIC_BOARD-defin.patch --- a/package/boot/uboot-kirkwood/patches/0004-kirkwood-iconnect-add-CONFIG_SYS_GENERIC_BOARD-defin.patch +++ b/package/boot/uboot-kirkwood/patches/0004-kirkwood-iconnect-add-CONFIG_SYS_GENERIC_BOARD-defin.patch @@ -19,5 +19,5 @@ CC: Stefan Roese <s...@denx.de> +#define CONFIG_SYS_GENERIC_BOARD + /* - * Version number information + * High level configuration options */ diff --git a/package/boot/uboot-kirkwood/patches/0006-kirkwood-sheevaplug-add-CONFIG_SYS_GENERIC_BOARD-def.patch b/package/boot/uboot-kirkwood/patches/0006-kirkwood-sheevaplug-add-CONFIG_SYS_GENERIC_BOARD-def.patch --- a/package/boot/uboot-kirkwood/patches/0006-kirkwood-sheevaplug-add-CONFIG_SYS_GENERIC_BOARD-def.patch +++ b/package/boot/uboot-kirkwood/patches/0006-kirkwood-sheevaplug-add-CONFIG_SYS_GENERIC_BOARD-def.patch @@ -19,5 +19,5 @@ CC: Stefan Roese <s...@denx.de> +#define CONFIG_SYS_GENERIC_BOARD + /* - * Version number information + * High Level Configuration Options (easy to change) */ diff --git a/package/boot/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch --- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch +++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch @@ -1,6 +1,6 @@ --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h -@@ -31,6 +31,7 @@ +@@ -26,6 +26,7 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ @@ -8,7 +8,7 @@ #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND /* -@@ -53,29 +54,29 @@ +@@ -48,29 +49,29 @@ * it has to be rounded to sector size */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */ diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch --- 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 -@@ -59,30 +59,35 @@ +@@ -54,30 +54,35 @@ #define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x20000 @@ -47,7 +47,7 @@ * Ethernet driver configuration --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig -@@ -7,6 +7,7 @@ CONFIG_SYS_PROMPT="iconnect => " +@@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="iconnect => " # CONFIG_CMD_FLASH is not set CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch --- 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 -@@ -74,7 +74,8 @@ +@@ -69,7 +69,8 @@ "mtdparts=orion_nand:" \ "0xe0000@0x0(uboot)," \ "0x20000@0xe0000(uboot_env)," \ @@ -10,7 +10,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ -@@ -82,7 +83,7 @@ +@@ -77,7 +78,7 @@ "mtdparts="CONFIG_MTDPARTS \ "kernel=/boot/zImage\0" \ "fdt=/boot/ib62x0.dtb\0" \ diff --git a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch --- 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 -@@ -54,23 +54,35 @@ +@@ -53,23 +53,35 @@ #endif #define CONFIG_ENV_SIZE 0x20000 /* 128k */ diff --git a/package/boot/uboot-kirkwood/patches/150-goflexhome.patch b/package/boot/uboot-kirkwood/patches/150-goflexhome.patch --- a/package/boot/uboot-kirkwood/patches/150-goflexhome.patch +++ b/package/boot/uboot-kirkwood/patches/150-goflexhome.patch @@ -1,6 +1,6 @@ --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h -@@ -87,20 +87,18 @@ +@@ -80,20 +80,18 @@ */ #define CONFIG_BOOTCOMMAND \ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ diff --git a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch --- 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 -@@ -74,4 +74,7 @@ source "board/Seagate/goflexhome/Kconfig +@@ -78,4 +78,7 @@ source "board/Seagate/goflexhome/Kconfig source "board/Seagate/nas220/Kconfig" source "board/zyxel/nsa310s/Kconfig" @@ -10,7 +10,7 @@ endif --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h -@@ -98,4 +98,6 @@ +@@ -92,4 +92,6 @@ #define CONFIG_CMD_MTDPARTS #define CONFIG_LZO @@ -19,7 +19,7 @@ #endif /* _CONFIG_DOCKSTAR_H */ --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h -@@ -114,4 +114,6 @@ +@@ -109,4 +109,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 -@@ -109,4 +109,6 @@ +@@ -103,4 +103,6 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS @@ -80,7 +80,7 @@ +#endif /* __OPENWRT_KIRKWOOD_COMMON_H */ --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h -@@ -104,4 +104,6 @@ +@@ -102,4 +102,6 @@ #define CONFIG_CMD_MTDPARTS #define CONFIG_LZO @@ -89,7 +89,7 @@ #endif /* _CONFIG_POGO_E02_H */ --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h -@@ -109,4 +109,6 @@ +@@ -104,4 +104,6 @@ #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET #endif /* CONFIG_CMD_IDE */ @@ -98,7 +98,7 @@ #endif /* _CONFIG_SHEEVAPLUG_H */ --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h -@@ -122,4 +122,6 @@ +@@ -115,4 +115,6 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */ _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev