diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2007-10-25 20:31:19 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2007-10-25 22:27:41 +0200 |
| commit | 2266cfd50de3872e877eeca3dd4a6f940f22ba60 (patch) | |
| tree | 362afb85ef2d13b12c479b3183e92aacb5da64db | |
| parent | 74b469f2e6b1589118b6ac05c7256add01e572d2 (diff) | |
x86: move defconfig files for i386 and x86_64 to x86
With some small changes to kconfig makefile we can now
locate the defconfig files for i386 and x86_64 in
the configs/ subdirectory under x86.
make ARCH=i386 defconfig and make defconfig
works as expected also after this change.
But arch maintainers shall now update a defconfig file in
the configs/ directory.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| -rw-r--r-- | arch/x86/Makefile | 5 | ||||
| -rw-r--r-- | arch/x86/configs/i386_defconfig (renamed from arch/i386/defconfig) | 0 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_defconfig (renamed from arch/x86_64/defconfig) | 0 | ||||
| -rw-r--r-- | scripts/kconfig/Makefile | 6 |
4 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 65077d79c84..309597386a7 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -1,6 +1,9 @@ # Unified Makefile for i386 and x86_64 -# No need to remake these files +# select defconfig based on actual architecture +KBUILD_DEFCONFIG := $(ARCH)_defconfig + +# # No need to remake these files $(srctree)/arch/x86/Makefile%: ; ifeq ($(ARCH),i386) diff --git a/arch/i386/defconfig b/arch/x86/configs/i386_defconfig index 54ee1764fda..54ee1764fda 100644 --- a/arch/i386/defconfig +++ b/arch/x86/configs/i386_defconfig diff --git a/arch/x86_64/defconfig b/arch/x86/configs/x86_64_defconfig index b091c5e3555..b091c5e3555 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86/configs/x86_64_defconfig diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 83c5e76414c..fbf39cc6afa 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -60,12 +60,12 @@ defconfig: $(obj)/conf ifeq ($(KBUILD_DEFCONFIG),) $< -d arch/$(ARCH)/Kconfig else - @echo *** Default configuration is based on '$(KBUILD_DEFCONFIG)' - $(Q)$< -D arch/$(ARCH)/configs/$(KBUILD_DEFCONFIG) arch/$(ARCH)/Kconfig + @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" + $(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) arch/$(ARCH)/Kconfig endif %_defconfig: $(obj)/conf - $(Q)$< -D arch/$(ARCH)/configs/$@ arch/$(ARCH)/Kconfig + $(Q)$< -D arch/$(SRCARCH)/configs/$@ arch/$(ARCH)/Kconfig # Help text used by make help help: |