Upgrade U-Boot to the latest version. Since the latest version has the default gcc patch in it, drop it.
Signed-off-by: Marek Vasut <ma...@denx.de> Cc: Denys Dmytriyenko <de...@denix.org> Cc: Richard Purdie <richard.pur...@linuxfoundation.org> Cc: Ross Burton <ross.bur...@intel.com> --- meta/recipes-bsp/u-boot/files/default-gcc.patch | 39 ---------------------- ...ommon_2017.01.inc => u-boot-common_2017.05.inc} | 2 +- ...utils_2017.01.bb => u-boot-fw-utils_2017.05.bb} | 2 -- ...kimage_2017.01.bb => u-boot-mkimage_2017.05.bb} | 2 -- .../{u-boot_2017.01.bb => u-boot_2017.05.bb} | 0 5 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/default-gcc.patch rename meta/recipes-bsp/u-boot/{u-boot-common_2017.01.inc => u-boot-common_2017.05.inc} (86%) rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2017.01.bb => u-boot-fw-utils_2017.05.bb} (96%) rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2017.01.bb => u-boot-mkimage_2017.05.bb} (96%) rename meta/recipes-bsp/u-boot/{u-boot_2017.01.bb => u-boot_2017.05.bb} (100%) diff --git a/meta/recipes-bsp/u-boot/files/default-gcc.patch b/meta/recipes-bsp/u-boot/files/default-gcc.patch deleted file mode 100644 index 04184df8b3..0000000000 --- a/meta/recipes-bsp/u-boot/files/default-gcc.patch +++ /dev/null @@ -1,39 +0,0 @@ -OE needs to be able to change the default compiler. If we pass in HOSTCC -through the make command, it overwrites not only this setting but also the -setting in tools/Makefile wrapped in ifneq ($(CROSS_BUILD_TOOLS),) which -breaks the build. - -We therefore use override to ensure the value of HOSTCC is overwritten when -needed. - -RP: Updated the patch to the version being submitted to upstream u-boot - -Upstream-Status: Submitted [emailed to Masahiro Yamada for discussion] -RP 2017/3/11 - -Index: git/tools/Makefile -=================================================================== ---- git.orig/tools/Makefile -+++ git/tools/Makefile -@@ -262,7 +262,7 @@ $(LICENSE_H): $(obj)/bin2header $(srctre - subdir- += env - - ifneq ($(CROSS_BUILD_TOOLS),) --HOSTCC = $(CC) -+override HOSTCC = $(CC) - - quiet_cmd_crosstools_strip = STRIP $^ - cmd_crosstools_strip = $(STRIP) $^; touch $@ -Index: git/tools/env/Makefile -=================================================================== ---- git.orig/tools/env/Makefile -+++ git/tools/env/Makefile -@@ -8,7 +8,7 @@ - # fw_printenv is supposed to run on the target system, which means it should be - # built with cross tools. Although it may look weird, we only replace "HOSTCC" - # with "CC" here for the maximum code reuse of scripts/Makefile.host. --HOSTCC = $(CC) -+override HOSTCC = $(CC) - - # Compile for a hosted environment on the target - HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc b/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc similarity index 86% rename from meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc rename to meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc index df24c853dd..3719aee52d 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc @@ -7,7 +7,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "a705ebc81b7f91bbd0ef7c634284208342901149" +SRCREV = "64c4ffa9fa223f7ae8640f9c8f3044bfa0e3bfda" SRC_URI = "git://git.denx.de/u-boot.git" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb similarity index 96% rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb index 26314990b9..c2e8f0fb84 100644 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb @@ -1,7 +1,5 @@ require u-boot-common_${PV}.inc -SRC_URI += "file://default-gcc.patch" - SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" DEPENDS = "mtd-utils" diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb similarity index 96% rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb index 1aa95e7c86..50e2acb9ea 100644 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb @@ -1,7 +1,5 @@ require u-boot-common_${PV}.inc -SRC_URI += "file://default-gcc.patch" - SUMMARY = "U-Boot bootloader image creation tool" DEPENDS = "openssl" diff --git a/meta/recipes-bsp/u-boot/u-boot_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot_2017.05.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot_2017.01.bb rename to meta/recipes-bsp/u-boot/u-boot_2017.05.bb -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core