Skip to contentSkip to conversation

Fix default env includes to fix sandbox build

PATCH In review Peter Robinson 3 participants 5 messages Jun 17, 2015 – Jun 18, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix default env includes to fix sandbox build

defconfig and sandbox fails to build due to a with with the following error:

error: expected '}' before 'BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX'
CONFIG_EXTRA_ENV_SETTINGS

Based on the responaes below to the thread add linux/kconfig.h higher in th 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

---
 tools/env/fw_env.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/env/fw_env.h +2 -1
index d6faf34..60c0517 100644
@@ -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
Signature · 1 line
2.4.3
#1 lore raw

PATCH 1/1 Fix default env includes to fix sandbox build

Hi Peter,

The subject "Fix default env includes to fix sandbox build" sounds confusing to me.

I can currently build sandbox because tools/env is not built by default.

We hit this problem when we do "make env" or "make tools-all".

2015-06-18 0:58 GMT+09:00 Peter Robinson <[email protected]>:

Quoted 39 lines

defconfig and sandbox fails to build due to a with with the following error:

error: expected '}' before 'BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX'
CONFIG_EXTRA_ENV_SETTINGS

Based on the responaes below to the thread add linux/kconfig.h higher in th 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

---
 tools/env/fw_env.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/env/fw_env.h +2 -2
index d6faf34..60c0517 100644
@@ -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
--

2.4.3

Signature · 2 lines
Best Regards
Masahiro Yamada
#2 lore raw

PATCH 1/1 Fix default env includes to fix sandbox build

Quoted 9 lines · Masahiro Yamada

Hi Peter,

The subject "Fix default env includes to fix sandbox build" sounds confusing to me.

I can currently build sandbox because tools/env is not built by default.

We hit this problem when we do "make env" or "make tools-all".

Yes, I'll re-word slightly when pushing.

Quoted 53 lines

2015-06-18 0:58 GMT+09:00 Peter Robinson <[email protected]>:

Quoted 39 lines

defconfig and sandbox fails to build due to a with with the following error:

error: expected '}' before 'BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX'
CONFIG_EXTRA_ENV_SETTINGS

Based on the responaes below to the thread add linux/kconfig.h higher in th 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

---
 tools/env/fw_env.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/env/fw_env.h +2 -2
index d6faf34..60c0517 100644
@@ -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
--

2.4.3

Signature · 6 lines
Best Regards
Masahiro Yamada
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150618/bef5828c/attachment.sig>
#3 lore raw

PATCH 1/1 Fix default env includes to fix sandbox build

Quoted 5 lines · Tom Rini
Quoted 3 lines · Masahiro Yamada

Hi Peter,

Quoted 8 lines
Quoted 6 lines

The subject "Fix default env includes to fix sandbox build" sounds confusing to me.

I can currently build sandbox because tools/env is not built by default.

We hit this problem when we do "make env" or "make tools-all".

Yes, I'll re-word slightly when pushing.

Great, thanks,

Peter

Quoted 56 lines
Quoted 40 lines

2015-06-18 0:58 GMT+09:00 Peter Robinson <[email protected]>:

Quoted 35 lines

defconfig and sandbox fails to build due to a with with the following error:

error: expected '}' before 'BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX'
CONFIG_EXTRA_ENV_SETTINGS

Based on the responaes below to the thread add linux/kconfig.h higher in th 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

---
 tools/env/fw_env.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/env/fw_env.h +2 -1
index d6faf34..60c0517 100644
@@ -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>
 
Quoted 13 lines
Quoted 4 lines
tools/env/fw_env.h +0 -1
 /*
  * To build the utility with the static configuration
--

2.4.3

--
Best Regards
Masahiro Yamada
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

--
Tom

#4 lore raw
In reply to Peter Robinson
Quoted 5 lines · Peter Robinson

defconfig and sandbox fails to build due to a with with the following error:

error: expected '}' before 'BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX'
CONFIG_EXTRA_ENV_SETTINGS

Quoted 7 lines

Based on the responaes below to the thread add linux/kconfig.h higher in th 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

Reworded the commit message and applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150618/344a41a9/attachment.sig>