[U-Boot] [PATCH] 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
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- tools/env/fw_env.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index d6faf34..60c0517 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
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 pbrobinson@gmail.com:
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
Signed-off-by: Peter Robinson pbrobinson@gmail.com
tools/env/fw_env.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index d6faf34..60c0517 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
-- 2.4.3
On Thu, Jun 18, 2015 at 11:04:59AM +0900, Masahiro Yamada wrote:
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.
2015-06-18 0:58 GMT+09:00 Peter Robinson pbrobinson@gmail.com:
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
Signed-off-by: Peter Robinson pbrobinson@gmail.com
tools/env/fw_env.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index d6faf34..60c0517 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
-- 2.4.3
-- Best Regards Masahiro Yamada _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
On Thu, Jun 18, 2015 at 12:51 PM, Tom Rini trini@konsulko.com wrote:
On Thu, Jun 18, 2015 at 11:04:59AM +0900, Masahiro Yamada wrote:
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.
Great, thanks,
Peter
2015-06-18 0:58 GMT+09:00 Peter Robinson pbrobinson@gmail.com:
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
Signed-off-by: Peter Robinson pbrobinson@gmail.com
tools/env/fw_env.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index d6faf34..60c0517 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
-- 2.4.3
-- Best Regards Masahiro Yamada _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
-- Tom
On Wed, Jun 17, 2015 at 04:58:32PM +0100, Peter Robinson wrote:
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
Signed-off-by: Peter Robinson pbrobinson@gmail.com
Reworded the commit message and applied to u-boot/master, thanks!
participants (3)
-
Masahiro Yamada -
Peter Robinson -
Tom Rini