From: Zoltan Herpai Date: Tue, 19 Jan 2016 21:50:11 +0000 (+0000) Subject: packages: bump uboot-mxs to 2016.01, refresh patches X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=76b903a415671a1606146e6da6d34e85aa25ddeb;p=openwrt%2Fstaging%2Fnbd.git packages: bump uboot-mxs to 2016.01, refresh patches Signed-off-by: Zoltan HERPAI SVN-Revision: 48374 --- diff --git a/package/boot/uboot-mxs/Makefile b/package/boot/uboot-mxs/Makefile index 373b8d8f80..3b82db59b5 100644 --- a/package/boot/uboot-mxs/Makefile +++ b/package/boot/uboot-mxs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2013-2015 OpenWrt.org +# Copyright (C) 2013-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=u-boot -PKG_VERSION:=2015.07 +PKG_VERSION:=2016.01 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:=3dac9a0b46fed77fc768ad3bd2d68c05 +PKG_MD5SUM:=7d4f65fd43d4d706f5c5650e020d899d PKG_LICENSE:=GPL-2.0 GPL-2.0+ PKG_LICENSE_FILES:=Licenses/README @@ -30,11 +30,11 @@ define uboot/Default endef define uboot/mx23_olinuxino - TITLE:=U-Boot 2015.07 for the Olinuxino i.MX233 + TITLE:=U-Boot 2016.01 for the Olinuxino i.MX233 endef define uboot/duckbill - TITLE:=U-Boot 2015.07 for the I2SE Duckbill + TITLE:=U-Boot 2016.01 for the I2SE Duckbill endef UBOOTS := \ diff --git a/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch b/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch index 79138d227f..91f583f36e 100644 --- a/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch +++ b/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch @@ -40,11 +40,11 @@ Signed-off-by: Michael Heimpold @@ -926,6 +931,7 @@ source "board/genesi/mx51_efikamx/Kconfi source "board/gumstix/pepper/Kconfig" source "board/h2200/Kconfig" - source "board/hale/tt01/Kconfig" + source "board/hisilicon/hikey/Kconfig" +source "board/i2se/duckbill/Kconfig" - source "board/icpdas/lp8x4x/Kconfig" source "board/imx31_phycore/Kconfig" source "board/isee/igep0033/Kconfig" + source "board/maxbcm/Kconfig" --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1109,6 +1109,7 @@ extern unsigned int __machine_arch_type; diff --git a/package/boot/uboot-mxs/patches/100-gcc-5-fix.patch b/package/boot/uboot-mxs/patches/100-gcc-5-fix.patch deleted file mode 100644 index bec6ee72a6..0000000000 --- a/package/boot/uboot-mxs/patches/100-gcc-5-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/arm/cpu/arm926ejs/mxs/mxs.c -+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c -@@ -24,7 +24,7 @@ - DECLARE_GLOBAL_DATA_PTR; - - /* Lowlevel init isn't used on i.MX28, so just have a dummy here */ --inline void lowlevel_init(void) {} -+void lowlevel_init(void) {} - - void reset_cpu(ulong ignored) __attribute__((noreturn)); -