diff --git a/bsp/buildroot/boot/uboot/uboot.mk b/bsp/buildroot/boot/uboot/uboot.mk index 7c3512ad..64d828f3 100644 --- a/bsp/buildroot/boot/uboot/uboot.mk +++ b/bsp/buildroot/boot/uboot/uboot.mk @@ -177,7 +177,7 @@ define UBOOT_INSTALL_IMAGES_CMDS $(if $(BR2_TARGET_UBOOT_ENVIMAGE), cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) | \ $(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ - $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ + -p 0 $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ -o $(BINARIES_DIR)/uboot-env.bin -) endef diff --git a/bsp/buildroot/package/ntp/Config.in b/bsp/buildroot/package/ntp/Config.in index 8ce9a5b0..4e802374 100644 --- a/bsp/buildroot/package/ntp/Config.in +++ b/bsp/buildroot/package/ntp/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_NTP bool "ntp" - select BR2_PACKAGE_LIBEVENT help Network Time Protocol suite/programs. Provides things like ntpd, ntpdate, ntpq, etc... diff --git a/bsp/buildroot/package/ntp/ntp.mk b/bsp/buildroot/package/ntp/ntp.mk index 0b6304b1..a94380db 100644 --- a/bsp/buildroot/package/ntp/ntp.mk +++ b/bsp/buildroot/package/ntp/ntp.mk @@ -7,7 +7,7 @@ NTP_VERSION_MAJOR = 4.2 NTP_VERSION = $(NTP_VERSION_MAJOR).8p8 NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) -NTP_DEPENDENCIES = host-pkgconf libevent $(if $(BR2_PACKAGE_BUSYBOX),busybox) +NTP_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_BUSYBOX),busybox) NTP_LICENSE = ntp license NTP_LICENSE_FILES = COPYRIGHT NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no diff --git a/bsp/buildroot/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch b/bsp/buildroot/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch index 795466f4..c201bf74 100644 --- a/bsp/buildroot/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch +++ b/bsp/buildroot/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch @@ -18,20 +18,22 @@ Based on Debian patch from u-boot-tools: http://ftp.de.debian.org/debian/pool/main/u/u-boot/u-boot_2014.10+dfsg1-2.1.debian.tar.xz Signed-off-by: Jörg Krause +[fabio: adapt it to 2016.09] +Signed-off-by: Fabio Estevam --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 954a865..3ab5958 100644 +index 1cf15ce..75e85eb 100644 --- a/Makefile +++ b/Makefile -@@ -424,7 +424,7 @@ timestamp_h := include/generated/timestamp_autogenerated.h +@@ -425,7 +425,7 @@ timestamp_h := include/generated/timestamp_autogenerated.h no-dot-config-targets := clean clobber mrproper distclean \ help %docs check% coccicheck \ -- ubootversion backup -+ ubootversion backup tools-only +- ubootversion backup tests ++ ubootversion backup tests tools-only config-targets := 0 mixed-targets := 0 diff --git a/bsp/buildroot/package/uboot-tools/uboot-tools.hash b/bsp/buildroot/package/uboot-tools/uboot-tools.hash index cf27e90a..db60dabf 100644 --- a/bsp/buildroot/package/uboot-tools/uboot-tools.hash +++ b/bsp/buildroot/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 974fb7225c0af6a721307631f66b81e20dbda82a4d7cc32aba2a625727231253 u-boot-2016.07.tar.bz2 +sha256 95728e89dd476d17428f94080752ab48884be477b6a678941582aeef618b70bb u-boot-2016.09.01.tar.bz2 diff --git a/bsp/buildroot/package/uboot-tools/uboot-tools.mk b/bsp/buildroot/package/uboot-tools/uboot-tools.mk index e7826bde..a3335a5e 100644 --- a/bsp/buildroot/package/uboot-tools/uboot-tools.mk +++ b/bsp/buildroot/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2016.07 +UBOOT_TOOLS_VERSION = 2016.09.01 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPLv2+ diff --git a/bsp/buildroot/support/scripts/apply-patches.sh b/bsp/buildroot/support/scripts/apply-patches.sh index 7ccb39dd..06cb847f 100755 --- a/bsp/buildroot/support/scripts/apply-patches.sh +++ b/bsp/buildroot/support/scripts/apply-patches.sh @@ -118,6 +118,8 @@ function apply_patch { if [ $? != 0 ] ; then echo "Patch failed! Please fix ${patch}!" exit 1 + else + echo "Patch OK" fi }