Skip to content

Commit 9f64e48

Browse files
nullr0utemadisongh
authored andcommitted
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>
1 parent 6c187f2 commit 9f64e48

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tools/env/fw_env.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
*/
77

88
/* Pull in the current config to define the default environment */
9+
#include <linux/kconfig.h>
10+
911
#ifndef __ASSEMBLY__
1012
#define __ASSEMBLY__ /* get only #defines from config.h */
1113
#include <config.h>
1214
#undef __ASSEMBLY__
1315
#else
1416
#include <config.h>
1517
#endif
16-
#include <generated/autoconf.h>
1718

1819
/*
1920
* To build the utility with the static configuration

0 commit comments

Comments
 (0)