summaryrefslogtreecommitdiff
path: root/tools/env
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-06-17 16:58:32 +0100
committerTom Rini <trini@konsulko.com>2015-06-18 16:11:42 -0400
commit0b367380a52ac36b552d40ed1b10064d894e35a9 (patch)
treeadf43cabf8167f2fa91b4e453bfef8baece27856 /tools/env
parent7eee2b500da1af93981c8117dff1d8a135ce30e7 (diff)
tools/env/fw_env.h: Correct include order
When building tools-only (or env) we need to be sure that we do use <linux/kconfig.h> and do not use <generated/autoconf.h>. This will fix problems such as running 'make defconfig' or 'make sandbox_config' and then 'make tools-only'. Based on the responses below to the thread add linux/kconfig.h higher in the includes and drop the now unneeded autoconf.h lower down to ensure the default environment is included correctly http://lists.denx.de/pipermail/u-boot/2015-June/216849.html Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Diffstat (limited to 'tools/env')
-rw-r--r--tools/env/fw_env.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
index d6faf34912..60c05177ff 100644
--- a/tools/env/fw_env.h
+++ b/tools/env/fw_env.h
@@ -6,6 +6,8 @@
*/
/* 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>
@@ -13,7 +15,6 @@
#else
#include <config.h>
#endif
-#include <generated/autoconf.h>
/*
* To build the utility with the static configuration