diff mbox

[U-Boot,v5,6/9] kbuild: add include linux/kconfig.h in config.h

Message ID 1485511243-736-7-git-send-email-patrick.delaunay73@gmail.com
State Accepted
Commit 4ac96345b22cc8dcd299c6012cc5c80e44058bae
Delegated to: Tom Rini
Headers show

Commit Message

Patrick Delaunay Jan. 27, 2017, 10 a.m. UTC
From: Patrick Delaunay <patrick.delaunay@st.com>

Allow to use define CONFIG_IS_ENABLED
in include/config_fallbacks.h

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
---

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 scripts/Makefile.autoconf | 1 +
 1 file changed, 1 insertion(+)

Comments

Masahiro Yamada Jan. 27, 2017, 8:36 p.m. UTC | #1
2017-01-27 19:00 GMT+09:00 Patrick Delaunay <patrick.delaunay73@gmail.com>:
> From: Patrick Delaunay <patrick.delaunay@st.com>
>
> Allow to use define CONFIG_IS_ENABLED
> in include/config_fallbacks.h
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>

This patch is unneeded.

include/linux/kconfig.h is forcibly included
from all source files.

See

UBOOTINCLUDE    := \
                -Iinclude \
                $(if $(KBUILD_SRC), -I$(srctree)/include) \
                -I$(srctree)/arch/$(ARCH)/include \
                -include $(srctree)/include/linux/kconfig.h






>
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
>
>  scripts/Makefile.autoconf | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
> index 2f85eb9..2a967ff 100644
> --- a/scripts/Makefile.autoconf
> +++ b/scripts/Makefile.autoconf
> @@ -110,6 +110,7 @@ define filechk_config_h
>         echo \#include \<config_uncmd_spl.h\>;                          \
>         echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;         \
>         echo \#include \<asm/config.h\>;                                \
> +       echo \#include \<linux/kconfig.h\>;                             \
>         echo \#include \<config_fallbacks.h\>;)
>  endef
>
> --
> 1.9.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
Tom Rini Jan. 28, 2017, 12:29 a.m. UTC | #2
On Sat, Jan 28, 2017 at 05:36:33AM +0900, Masahiro Yamada wrote:
> 2017-01-27 19:00 GMT+09:00 Patrick Delaunay <patrick.delaunay73@gmail.com>:
> > From: Patrick Delaunay <patrick.delaunay@st.com>
> >
> > Allow to use define CONFIG_IS_ENABLED
> > in include/config_fallbacks.h
> >
> > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> > Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
> 
> This patch is unneeded.
> 
> include/linux/kconfig.h is forcibly included
> from all source files.
> 
> See
> 
> UBOOTINCLUDE    := \
>                 -Iinclude \
>                 $(if $(KBUILD_SRC), -I$(srctree)/include) \
>                 -I$(srctree)/arch/$(ARCH)/include \
>                 -include $(srctree)/include/linux/kconfig.h

This patch is needed for HOSTCC:
  HOSTCC  tools/atmel_pmecc_params                                                      In file included from include/config.h:9:0,
                 from ../tools/atmel_pmecc_params.c:16:                                 ../include/config_fallbacks.h:58:23: error: missing binary operator before token "("
 #if (CONFIG_IS_ENABLED(PARTITION_UUIDS) || \
                       ^
scripts/Makefile.host:99: recipe for target 'tools/atmel_pmecc_params' failed
make[2]: *** [tools/atmel_pmecc_params] Error 1
/home2/trini/u-boot/u-boot/Makefile:1217: recipe for target 'tools' failed
Masahiro Yamada Jan. 28, 2017, 5:35 a.m. UTC | #3
2017-01-28 9:29 GMT+09:00 Tom Rini <trini@konsulko.com>:
> On Sat, Jan 28, 2017 at 05:36:33AM +0900, Masahiro Yamada wrote:
>> 2017-01-27 19:00 GMT+09:00 Patrick Delaunay <patrick.delaunay73@gmail.com>:
>> > From: Patrick Delaunay <patrick.delaunay@st.com>
>> >
>> > Allow to use define CONFIG_IS_ENABLED
>> > in include/config_fallbacks.h
>> >
>> > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
>> > Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
>>
>> This patch is unneeded.
>>
>> include/linux/kconfig.h is forcibly included
>> from all source files.
>>
>> See
>>
>> UBOOTINCLUDE    := \
>>                 -Iinclude \
>>                 $(if $(KBUILD_SRC), -I$(srctree)/include) \
>>                 -I$(srctree)/arch/$(ARCH)/include \
>>                 -include $(srctree)/include/linux/kconfig.h
>
> This patch is needed for HOSTCC:
>   HOSTCC  tools/atmel_pmecc_params                                                      In file included from include/config.h:9:0,
>                  from ../tools/atmel_pmecc_params.c:16:                                 ../include/config_fallbacks.h:58:23: error: missing binary operator before token "("
>  #if (CONFIG_IS_ENABLED(PARTITION_UUIDS) || \
>                        ^
> scripts/Makefile.host:99: recipe for target 'tools/atmel_pmecc_params' failed
> make[2]: *** [tools/atmel_pmecc_params] Error 1
> /home2/trini/u-boot/u-boot/Makefile:1217: recipe for target 'tools' failed




OK, I see.   Thanks for explaining this.
Tom Rini Jan. 28, 2017, 6:44 p.m. UTC | #4
On Fri, Jan 27, 2017 at 11:00:40AM +0100, Patrick Delaunay wrote:

> From: Patrick Delaunay <patrick.delaunay@st.com>
> 
> Allow to use define CONFIG_IS_ENABLED
> in include/config_fallbacks.h
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 2f85eb9..2a967ff 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -110,6 +110,7 @@  define filechk_config_h
 	echo \#include \<config_uncmd_spl.h\>;				\
 	echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;		\
 	echo \#include \<asm/config.h\>;				\
+	echo \#include \<linux/kconfig.h\>;				\
 	echo \#include \<config_fallbacks.h\>;)
 endef