diff options
| author | Romain Naour <romain.naour@gmail.com> | 2017-06-03 19:24:10 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-06-04 09:46:46 +0200 |
| commit | 28fed0d861e8ef73eda53a0d2cb3ff65cb1b4674 (patch) | |
| tree | 13060c098afb1475922f7a478e280219d0b17311 | |
| parent | 19ad3a150f6910a6e02befc9a8ce04a330163324 (diff) | |
| download | buildroot-28fed0d861e8ef73eda53a0d2cb3ff65cb1b4674.tar.gz buildroot-28fed0d861e8ef73eda53a0d2cb3ff65cb1b4674.zip | |
package/uboot-tools: revert the removal of 0001-drop-configh-from-tools.patch
Patch 0001-drop-configh-from-tools.patch is not upstream, instead it
must be rebased on top of 2017.05 release since the code was moved by
[1].
Fixes:
http://autobuild.buildroot.net/results/949/94910513d1b14e3b02ec4aed34de89d1b1d7a12a
[1] http://git.denx.de/?p=u-boot.git;a=commit;h=9d80b49a671c9922931adcd823aab0ed319a42d1
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/uboot-tools/0001-drop-configh-from-tools.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/package/uboot-tools/0001-drop-configh-from-tools.patch b/package/uboot-tools/0001-drop-configh-from-tools.patch new file mode 100644 index 0000000000..f19cebee40 --- /dev/null +++ b/package/uboot-tools/0001-drop-configh-from-tools.patch @@ -0,0 +1,47 @@ +From 216832de3bc3e6ef093305c6d07f464f7606f2d6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> +Date: Tue, 4 Aug 2015 22:13:20 +0200 +Subject: [PATCH] drop configh from tools +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We need to build u-boot tools without a board configuration for the target. +fw_env just uses config.h to define the default environment of the created +image, so it really isn't mandatory. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +[Jörg Krause: update for version 2015.07] +Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> +[Romain: update for version 2017.05 + after commit 9d80b49a671c9922931adcd823aab0ed319a42d1] +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + tools/env/fw_env_private.h | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/tools/env/fw_env_private.h b/tools/env/fw_env_private.h +index 0c27da0..e550463 100644 +--- a/tools/env/fw_env_private.h ++++ b/tools/env/fw_env_private.h +@@ -5,17 +5,6 @@ + * SPDX-License-Identifier: GPL-2.0+ + */ + +-/* Pull in the current config to define the default environment */ +-#include <linux/kconfig.h> +- +-#ifndef __ASSEMBLY__ +-#define __ASSEMBLY__ /* get only #defines from config.h */ +-#include <config.h> +-#undef __ASSEMBLY__ +-#else +-#include <config.h> +-#endif +- + /* + * To build the utility with the static configuration + * comment out the next line. +-- +2.9.4 + |
