From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 17 Jun 2015 15:58:32 +0000 (+0100)
Subject: tools/env/fw_env.h: Correct include order
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0b367380a52ac36b552d40ed1b10064d894e35a9;p=project%2Fbcm63xx%2Fu-boot.git

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>
---

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