diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
| commit | cfc70a48027b1b56231df62a30a7da888f33e3ce (patch) | |
| tree | cb2e856d51f1a79822a2b21d8c2cbaea55ae170d /package/uboot-tools/0001-drop-configh-from-tools.patch | |
| parent | 70874e321dbd50203187c41214cb888507cd6df1 (diff) | |
| parent | aa016797444017d4379a139e39697e38ed2e2357 (diff) | |
| download | buildroot-cfc70a48027b1b56231df62a30a7da888f33e3ce.tar.gz buildroot-cfc70a48027b1b56231df62a30a7da888f33e3ce.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/uboot-tools/0001-drop-configh-from-tools.patch')
| -rw-r--r-- | package/uboot-tools/0001-drop-configh-from-tools.patch | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/package/uboot-tools/0001-drop-configh-from-tools.patch b/package/uboot-tools/0001-drop-configh-from-tools.patch index a36332fb8c..e77a301760 100644 --- a/package/uboot-tools/0001-drop-configh-from-tools.patch +++ b/package/uboot-tools/0001-drop-configh-from-tools.patch @@ -1,18 +1,33 @@ +From 2e54434e4dd178773e8e11e48afc81299771f3e7 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 1/1] 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> +--- + tools/env/fw_env.h | 11 ----------- + 1 file changed, 11 deletions(-) diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h -index aff471b..dfe7439 100644 +index 60c0517..1c5daaa 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h -@@ -5,14 +5,6 @@ +@@ -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> @@ -20,6 +35,10 @@ index aff471b..dfe7439 100644 -#else -#include <config.h> -#endif - +- /* * To build the utility with the static configuration + * comment out the next line. +-- +2.5.0 + |
