[PATCH 0/4] Kbuild/Kconfig

[PATCH 0/4] Kbuild/Kconfig

[Arnaud Lacombe]

Hi Michal,

The following small serie unexpose a few Kconfig variable from Kbuild, and
vice-versa. The idea is that Kbuild is a user of Kconfig, not the other way
around.

In the same time, fix a couple of place where we hardcode the `.config' string.

Comments Welcome !
 - Arnaud

Arnaud Lacombe (4):
  kbuild: introduce KBUILD_CONFIG; unexpose KCONFIG_CONFIG
  kbuild: reduce kbuild invasivity within kconfig
  kbuild: do not hardcode .config
  kconfig: do not hardcode .config

 Makefile                                |   20 ++++++++++++++------
 arch/arm/boot/compressed/Makefile       |    2 +-
 arch/unicore32/boot/compressed/Makefile |    2 +-
 scripts/kconfig/Makefile                |   31 ++++++++++++++++---------------
 4 files changed, 32 insertions(+), 23 deletions(-)

-- 
1.7.6.153.g78432

[PATCH 1/4] kbuild: introduce KBUILD_CONFIG; unexpose KCONFIG_CONFIG

[Arnaud Lacombe]

Refine the Kbuild interface to expose it's own variable to architecture
Makefile's and prepare Kconfig environment prior to any %config invocation.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 Makefile                                |    8 ++++++--
 arch/arm/boot/compressed/Makefile       |    2 +-
 arch/unicore32/boot/compressed/Makefile |    2 +-
 scripts/kconfig/Makefile                |    3 +++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index b4ca4e1..26798a4 100644
--- a/Makefile
+++ b/Makefile
@@ -235,8 +235,8 @@ ifeq ($(ARCH),m68knommu)
        hdr-arch  := m68k
 endif
 
-KCONFIG_CONFIG	?= .config
-export KCONFIG_CONFIG
+KBUILD_CONFIG	?= .config
+export KBUILD_CONFIG
 
 # SHELL used by kbuild
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -484,6 +484,10 @@ ifeq ($(config-targets),1)
 include $(srctree)/arch/$(SRCARCH)/Makefile
 export KBUILD_DEFCONFIG KBUILD_KCONFIG
 
+# Prepare Kconfig environment
+KCONFIG_CONFIG    = $(KBUILD_CONFIG)
+export KCONFIG_CONFIG
+
 config: scripts_basic outputmakefile FORCE
 	$(Q)mkdir -p include/linux include/config
 	$(Q)$(MAKE) $(build)=scripts/kconfig $@
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 0c74a6f..1891c0c 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -154,5 +154,5 @@ CFLAGS_font.o := -Dstatic=
 $(obj)/font.c: $(FONTC)
 	$(call cmd,shipped)
 
-$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile $(KCONFIG_CONFIG)
+$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile $(KBUILD_CONFIG)
 	@sed "$(SEDFLAGS)" < $< > $@
diff --git a/arch/unicore32/boot/compressed/Makefile b/arch/unicore32/boot/compressed/Makefile
index b0954a2..90a9841 100644
--- a/arch/unicore32/boot/compressed/Makefile
+++ b/arch/unicore32/boot/compressed/Makefile
@@ -63,6 +63,6 @@ ZTEXTADDR	:= 0x03000000
 ZBSSADDR	:= ALIGN(4)
 
 SEDFLAGS_lds	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
-$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/unicore32/boot/Makefile $(KCONFIG_CONFIG)
+$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/unicore32/boot/Makefile $(KBUILD_CONFIG)
 	@sed "$(SEDFLAGS_lds)" < $< > $@
 
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 82d2eb2..3fa5a65 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -11,6 +11,9 @@ else
 Kconfig := Kconfig
 endif
 
+KCONFIG_CONFIG    ?= .config
+export KCONFIG_CONFIG
+
 xconfig: $(obj)/qconf
 	$< $(Kconfig)
 
-- 
1.7.6.153.g78432

Re: [PATCH 1/4] kbuild: introduce KBUILD_CONFIG; unexpose KCONFIG_CONFIG

[Michal Marek]

On 16.8.2011 07:34, Arnaud Lacombe wrote:
> Refine the Kbuild interface to expose it's own variable to architecture
> Makefile's and prepare Kconfig environment prior to any %config invocation.
> 
> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
> ---
>  Makefile                                |    8 ++++++--
>  arch/arm/boot/compressed/Makefile       |    2 +-
>  arch/unicore32/boot/compressed/Makefile |    2 +-
>  scripts/kconfig/Makefile                |    3 +++
>  4 files changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index b4ca4e1..26798a4 100644
> --- a/Makefile
> +++ b/Makefile
[...]
> +# Prepare Kconfig environment
> +KCONFIG_CONFIG    = $(KBUILD_CONFIG)
> +export KCONFIG_CONFIG

IMO we should preserve the semantics of KCONFIG_CONFIG as much as
possible. make KCONFIG_CONFIG=blah works, but setting it in the
environment does not, because the '=' assignment take precendence.

Michal

Re: [PATCH 1/4] kbuild: introduce KBUILD_CONFIG; unexpose KCONFIG_CONFIG

[Michal Marek]

On 16.9.2011 14:31, Michal Marek wrote:
> On 16.8.2011 07:34, Arnaud Lacombe wrote:
>> Refine the Kbuild interface to expose it's own variable to architecture
>> Makefile's and prepare Kconfig environment prior to any %config invocation.
>>
>> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
>> ---
>>  Makefile                                |    8 ++++++--
>>  arch/arm/boot/compressed/Makefile       |    2 +-
>>  arch/unicore32/boot/compressed/Makefile |    2 +-
>>  scripts/kconfig/Makefile                |    3 +++
>>  4 files changed, 11 insertions(+), 4 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index b4ca4e1..26798a4 100644
>> --- a/Makefile
>> +++ b/Makefile
> [...]
>> +# Prepare Kconfig environment
>> +KCONFIG_CONFIG    = $(KBUILD_CONFIG)
>> +export KCONFIG_CONFIG
> 
> IMO we should preserve the semantics of KCONFIG_CONFIG as much as
> possible. make KCONFIG_CONFIG=blah works, but setting it in the
> environment does not, because the '=' assignment take precendence.

Also, please mention KBUILD_CONFIG variable in
Documentation/kbuild/kconfig.txt. Or maybe
Documentation/kbuild/kbuild.txt, I'm not sure what is the best fit now.

Michal

[PATCH 2/4] kbuild: reduce kbuild invasivity within kconfig

[Arnaud Lacombe]

Introduce `Kconfig' and `KCONFIG_DEFCONFIG' as a Kconfig's interface to kbuild.
These variable are set in the top-level Makefile, which remove reference to
KBUILD_ prefixed variable within Kconfig makefile.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 Makefile                 |    8 ++++++--
 scripts/kconfig/Makefile |   14 +++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 26798a4..e7b576e 100644
--- a/Makefile
+++ b/Makefile
@@ -238,6 +238,9 @@ endif
 KBUILD_CONFIG	?= .config
 export KBUILD_CONFIG
 
+KBUILD_KCONFIG	?= Kconfig
+export KBUILD_KCONFIG
+
 # SHELL used by kbuild
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
 	  else if [ -x /bin/bash ]; then echo /bin/bash; \
@@ -482,11 +485,12 @@ ifeq ($(config-targets),1)
 # KBUILD_DEFCONFIG may point out an alternative default configuration
 # used for 'make defconfig'
 include $(srctree)/arch/$(SRCARCH)/Makefile
-export KBUILD_DEFCONFIG KBUILD_KCONFIG
 
 # Prepare Kconfig environment
+Kconfig           = $(KBUILD_KCONFIG)
 KCONFIG_CONFIG    = $(KBUILD_CONFIG)
-export KCONFIG_CONFIG
+KCONFIG_DEFCONFIG = $(KBUILD_DEFCONFIG)
+export Kconfig KCONFIG_CONFIG KCONFIG_DEFCONFIG
 
 config: scripts_basic outputmakefile FORCE
 	$(Q)mkdir -p include/linux include/config
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 3fa5a65..dabb4f1 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -5,13 +5,9 @@
 PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \
 	localmodconfig localyesconfig
 
-ifdef KBUILD_KCONFIG
-Kconfig := $(KBUILD_KCONFIG)
-else
-Kconfig := Kconfig
-endif
-
+Kconfig           ?= Kconfig
 KCONFIG_CONFIG    ?= .config
+KCONFIG_DEFCONFIG ?=
 export KCONFIG_CONFIG
 
 xconfig: $(obj)/qconf
@@ -113,11 +109,11 @@ savedefconfig: $(obj)/conf
 	$< --$@=defconfig $(Kconfig)
 
 defconfig: $(obj)/conf
-ifeq ($(KBUILD_DEFCONFIG),)
+ifeq ($(KCONFIG_DEFCONFIG),)
 	$< --defconfig $(Kconfig)
 else
-	@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
-	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+	@echo "*** Default configuration is based on '$(KCONFIG_DEFCONFIG)'"
+	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KCONFIG_DEFCONFIG) $(Kconfig)
 endif
 
 %_defconfig: $(obj)/conf
-- 
1.7.6.153.g78432

[PATCH 3/4] kbuild: do not hardcode .config

[Arnaud Lacombe]

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e7b576e..c36195a 100644
--- a/Makefile
+++ b/Makefile
@@ -973,7 +973,7 @@ PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3
 prepare3: include/config/kernel.release
 ifneq ($(KBUILD_SRC),)
 	@$(kecho) '  Using $(srctree) as source for kernel'
-	$(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \
+	$(Q)if [ -f $(srctree)/$(KBUILD_CONFIG) -o -d $(srctree)/include/config ]; then \
 		echo "  $(srctree) is not clean, please run 'make mrproper'";\
 		echo "  in the '$(srctree)' directory.";\
 		/bin/false; \
@@ -1168,7 +1168,7 @@ CLEAN_FILES +=	vmlinux System.map \
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config usr/include include/generated          \
                   arch/*/include/generated
-MRPROPER_FILES += .config .config.old .version .old_version             \
+MRPROPER_FILES += $(KBUILD_CONFIG) $(KBUILD_CONFIG).old .version .old_version \
                   include/linux/version.h                               \
 		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
 
@@ -1295,7 +1295,7 @@ help:
 
 	@echo  '  make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
 	@echo  '  make V=2   [targets] 2 => give reason for rebuild of target'
-	@echo  '  make O=dir [targets] Locate all output files in "dir", including .config'
+	@echo  '  make O=dir [targets] Locate all output files in "dir", including $(KBUILD_CONFIG)'
 	@echo  '  make C=1   [targets] Check all c source with $$CHECK (sparse by default)'
 	@echo  '  make C=2   [targets] Force check of all c source with $$CHECK'
 	@echo  '  make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
-- 
1.7.6.153.g78432

[PATCH 4/4] kconfig: do not hardcode .config

[Arnaud Lacombe]

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 scripts/kconfig/Makefile |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index dabb4f1..a86924b 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -10,6 +10,8 @@ KCONFIG_CONFIG    ?= .config
 KCONFIG_DEFCONFIG ?=
 export KCONFIG_CONFIG
 
+dot-config := $(KCONFIG_CONFIG)
+
 xconfig: $(obj)/qconf
 	$< $(Kconfig)
 
@@ -43,14 +45,14 @@ endif
 localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
 	$(Q)mkdir -p include/generated
 	$(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
-	$(Q)if [ -f .config ]; then 					\
-			cmp -s .tmp.config .config ||			\
-			(mv -f .config .config.old.1;			\
-			 mv -f .tmp.config .config;			\
+	$(Q)if [ -f $(dot-config) ]; then 					\
+			cmp -s .tmp.config .$(dot-config) ||			\
+			(mv -f $(dot-config) $(dot-config).old.1;		\
+			 mv -f .tmp.config $(dot-config);			\
 			 $(obj)/conf --silentoldconfig $(Kconfig);	\
-			 mv -f .config.old.1 .config.old)		\
+			 mv -f $(dot-config).old.1 $(dot-config).old)	\
 	else								\
-			mv -f .tmp.config .config;			\
+			mv -f .tmp.config $(dot-config);		\
 			$(obj)/conf --silentoldconfig $(Kconfig);	\
 	fi
 	$(Q)rm -f .tmp.config
@@ -126,7 +128,7 @@ help:
 	@echo  '  menuconfig	  - Update current config utilising a menu based program'
 	@echo  '  xconfig	  - Update current config utilising a QT based front-end'
 	@echo  '  gconfig	  - Update current config utilising a GTK based front-end'
-	@echo  '  oldconfig	  - Update current config utilising a provided .config as base'
+	@echo  '  oldconfig	  - Update current config utilising a provided $(dot-config) as base'
 	@echo  '  localmodconfig  - Update current config disabling modules not loaded'
 	@echo  '  localyesconfig  - Update current config converting local mods to core'
 	@echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
-- 
1.7.6.153.g78432

Re: [PATCH 0/4] Kbuild/Kconfig

[Arnaud Lacombe]

Hi,

On Tue, Aug 16, 2011 at 1:34 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> Hi Michal,
>
> The following small serie unexpose a few Kconfig variable from Kbuild, and
> vice-versa. The idea is that Kbuild is a user of Kconfig, not the other way
> around.
>
> In the same time, fix a couple of place where we hardcode the `.config' string.
>
> Comments Welcome !
>  - Arnaud
>
ping ?

 - Arnaud

> Arnaud Lacombe (4):
>  kbuild: introduce KBUILD_CONFIG; unexpose KCONFIG_CONFIG
>  kbuild: reduce kbuild invasivity within kconfig
>  kbuild: do not hardcode .config
>  kconfig: do not hardcode .config
>
>  Makefile                                |   20 ++++++++++++++------
>  arch/arm/boot/compressed/Makefile       |    2 +-
>  arch/unicore32/boot/compressed/Makefile |    2 +-
>  scripts/kconfig/Makefile                |   31 ++++++++++++++++---------------
>  4 files changed, 32 insertions(+), 23 deletions(-)
>
> --
> 1.7.6.153.g78432
>
>

Re: [PATCH 0/4] Kbuild/Kconfig

[Arnaud Lacombe]

Hi,

On Mon, Aug 22, 2011 at 11:49 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> Hi,
>
> On Tue, Aug 16, 2011 at 1:34 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
>> Hi Michal,
>>
>> The following small serie unexpose a few Kconfig variable from Kbuild, and
>> vice-versa. The idea is that Kbuild is a user of Kconfig, not the other way
>> around.
>>
>> In the same time, fix a couple of place where we hardcode the `.config' string.
>>
>> Comments Welcome !
>>  - Arnaud
>>
> ping ?
>
ping^2 ?

 - Arnaud

>  - Arnaud
>
>> Arnaud Lacombe (4):
>>  kbuild: introduce KBUILD_CONFIG; unexpose KCONFIG_CONFIG
>>  kbuild: reduce kbuild invasivity within kconfig
>>  kbuild: do not hardcode .config
>>  kconfig: do not hardcode .config
>>
>>  Makefile                                |   20 ++++++++++++++------
>>  arch/arm/boot/compressed/Makefile       |    2 +-
>>  arch/unicore32/boot/compressed/Makefile |    2 +-
>>  scripts/kconfig/Makefile                |   31 ++++++++++++++++---------------
>>  4 files changed, 32 insertions(+), 23 deletions(-)
>>
>> --
>> 1.7.6.153.g78432
>>
>>
>

Re: [PATCH 0/4] Kbuild/Kconfig

[Arnaud Lacombe]

Hi,

On Mon, Aug 29, 2011 at 8:29 PM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> Hi,
>
> On Mon, Aug 22, 2011 at 11:49 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
>> Hi,
>>
>> On Tue, Aug 16, 2011 at 1:34 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
>>> Hi Michal,
>>>
>>> The following small serie unexpose a few Kconfig variable from Kbuild, and
>>> vice-versa. The idea is that Kbuild is a user of Kconfig, not the other way
>>> around.
>>>
>>> In the same time, fix a couple of place where we hardcode the `.config' string.
>>>
>>> Comments Welcome !
>>>  - Arnaud
>>>
>> ping ?
>>
> ping^2 ?
>
ping^3 ?

 - Arnaud

>  - Arnaud
>
>>  - Arnaud
>>
>>> Arnaud Lacombe (4):
>>>  kbuild: introduce KBUILD_CONFIG; unexpose KCONFIG_CONFIG
>>>  kbuild: reduce kbuild invasivity within kconfig
>>>  kbuild: do not hardcode .config
>>>  kconfig: do not hardcode .config
>>>
>>>  Makefile                                |   20 ++++++++++++++------
>>>  arch/arm/boot/compressed/Makefile       |    2 +-
>>>  arch/unicore32/boot/compressed/Makefile |    2 +-
>>>  scripts/kconfig/Makefile                |   31 ++++++++++++++++---------------
>>>  4 files changed, 32 insertions(+), 23 deletions(-)
>>>
>>> --
>>> 1.7.6.153.g78432
>>>
>>>
>>
>