summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Amlie <kristian.amlie@northern.tech>2017-12-13 15:03:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-02 17:24:37 +0000
commit589bf877024db81e96e505ab9a7b8210efb9b704 (patch)
tree0e14a222469a5a6ff11cbf145f1f374724de03cc
parentc8ed2e09478a449c46fa13bee8298b05a902e686 (diff)
downloadpoky-589bf877024db81e96e505ab9a7b8210efb9b704.tar.gz
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 <kristian.amlie@northern.tech> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch37
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc1
2 files changed, 38 insertions, 0 deletions
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 @@
1From ded84f90a1066eef5f34daa4539273de64f7b811 Mon Sep 17 00:00:00 2001
2From: Stefan Agner <stefan.agner@toradex.com>
3Date: Tue, 14 Nov 2017 15:47:18 +0100
4Subject: [PATCH 1/1] envtools: make sure version/timestamp header file are
5 available
6
7With commit 84d46e7e8948 ("tools: env: allow to print U-Boot version")
8the fw_env utilities need the version.h header file. Building only
9the envtools in a pristine build directory will fail due to missing
10header files.
11
12Make sure the header files are a dependency of the envtools target.
13
14Fixes: 84d46e7e8948 ("tools: env: allow to print U-Boot version")
15Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
16Tested-by: Peter Robinson <pbrobinson@gmail.com>
17Reviewed-by: Simon Glass <sjg@chromium.org>
18---
19 Makefile | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/Makefile b/Makefile
23index 61fd973..f8c66a2 100644
24--- a/Makefile
25+++ b/Makefile
26@@ -1447,7 +1447,7 @@ checkarmreloc: u-boot
27 false; \
28 fi
29
30-envtools: scripts_basic
31+envtools: scripts_basic $(version_h) $(timestamp_h)
32 $(Q)$(MAKE) $(build)=tools/env
33
34 tools-only: scripts_basic $(version_h) $(timestamp_h)
35--
362.7.4
37
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"
12SRC_URI = "git://git.denx.de/u-boot.git \ 12SRC_URI = "git://git.denx.de/u-boot.git \
13 file://MPC8315ERDB-enable-DHCP.patch \ 13 file://MPC8315ERDB-enable-DHCP.patch \
14 file://10m50-update-device-tree.patch \ 14 file://10m50-update-device-tree.patch \
15 file://v2017.11-fw-utils-build-fix.patch \
15" 16"
16 17
17S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"