From: Arnaud Lacombe <lacombar@gmail.com>
To: Michal Marek <mmarek@suse.cz>
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
Arnaud Lacombe <lacombar@gmail.com>
Subject: [PATCH 1/4] kbuild: introduce KBUILD_CONFIG; unexpose KCONFIG_CONFIG
Date: Tue, 16 Aug 2011 01:34:11 -0400 [thread overview]
Message-ID: <1313472854-14426-2-git-send-email-lacombar@gmail.com> (raw)
In-Reply-To: <1313472854-14426-1-git-send-email-lacombar@gmail.com>
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
next prev parent reply other threads:[~2011-08-16 5:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-16 5:34 [PATCH 0/4] Kbuild/Kconfig Arnaud Lacombe
2011-08-16 5:34 ` Arnaud Lacombe [this message]
2011-09-16 12:31 ` [PATCH 1/4] kbuild: introduce KBUILD_CONFIG; unexpose KCONFIG_CONFIG Michal Marek
2011-09-16 12:33 ` Michal Marek
2011-08-16 5:34 ` [PATCH 2/4] kbuild: reduce kbuild invasivity within kconfig Arnaud Lacombe
2011-08-16 5:34 ` [PATCH 3/4] kbuild: do not hardcode .config Arnaud Lacombe
2011-08-16 5:34 ` [PATCH 4/4] kconfig: " Arnaud Lacombe
2011-08-22 15:49 ` [PATCH 0/4] Kbuild/Kconfig Arnaud Lacombe
2011-08-30 0:29 ` Arnaud Lacombe
2011-09-06 15:05 ` Arnaud Lacombe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313472854-14426-2-git-send-email-lacombar@gmail.com \
--to=lacombar@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome