From 589bf877024db81e96e505ab9a7b8210efb9b704 Mon Sep 17 00:00:00 2001 From: Kristian Amlie Date: Wed, 13 Dec 2017 15:03:27 +0100 Subject: u-boot-fw-utils: Fix broken makefile in v2017.11. See the patch for details. This patch has already been applied upstream, but we need it for v2017.11. Upstream-Status: Accepted [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811] (From OE-Core rev: bb6a45bc7e122c61386d0657e7c97895d1697bd7) Signed-off-by: Kristian Amlie Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../u-boot/files/v2017.11-fw-utils-build-fix.patch | 37 ++++++++++++++++++++++ meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch b/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch new file mode 100644 index 0000000000..fe89735056 --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch @@ -0,0 +1,37 @@ +From ded84f90a1066eef5f34daa4539273de64f7b811 Mon Sep 17 00:00:00 2001 +From: Stefan Agner +Date: Tue, 14 Nov 2017 15:47:18 +0100 +Subject: [PATCH 1/1] envtools: make sure version/timestamp header file are + available + +With commit 84d46e7e8948 ("tools: env: allow to print U-Boot version") +the fw_env utilities need the version.h header file. Building only +the envtools in a pristine build directory will fail due to missing +header files. + +Make sure the header files are a dependency of the envtools target. + +Fixes: 84d46e7e8948 ("tools: env: allow to print U-Boot version") +Signed-off-by: Stefan Agner +Tested-by: Peter Robinson +Reviewed-by: Simon Glass +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 61fd973..f8c66a2 100644 +--- a/Makefile ++++ b/Makefile +@@ -1447,7 +1447,7 @@ checkarmreloc: u-boot + false; \ + fi + +-envtools: scripts_basic ++envtools: scripts_basic $(version_h) $(timestamp_h) + $(Q)$(MAKE) $(build)=tools/env + + tools-only: scripts_basic $(version_h) $(timestamp_h) +-- +2.7.4 + diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc b/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc index bfdf1a0d8f..65f1228043 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc @@ -12,6 +12,7 @@ SRCREV = "c253573f3e269fd9a24ee6684d87dd91106018a5" SRC_URI = "git://git.denx.de/u-boot.git \ file://MPC8315ERDB-enable-DHCP.patch \ file://10m50-update-device-tree.patch \ + file://v2017.11-fw-utils-build-fix.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf