openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Sam Ravnborg 2007-10-25 20:31:19 +02:00
parent 74b469f2e6
commit 2266cfd50d
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/Makefile
View File

@ -1,6 +1,9 @@
# Unified Makefile for i386 and x86_64 # 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%: ; $(srctree)/arch/x86/Makefile%: ;
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)

0
arch/i386/defconfig → arch/x86/configs/i386_defconfig
View File

0
arch/x86_64/defconfig → arch/x86/configs/x86_64_defconfig
View File

6
scripts/kconfig/Makefile
View File

@ -60,12 +60,12 @@ defconfig: $(obj)/conf
ifeq ($(KBUILD_DEFCONFIG),) ifeq ($(KBUILD_DEFCONFIG),)
$< -d arch/$(ARCH)/Kconfig $< -d arch/$(ARCH)/Kconfig
else else
@echo *** Default configuration is based on '$(KBUILD_DEFCONFIG)' @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
$(Q)$< -D arch/$(ARCH)/configs/$(KBUILD_DEFCONFIG) arch/$(ARCH)/Kconfig $(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) arch/$(ARCH)/Kconfig
endif endif
%_defconfig: $(obj)/conf %_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 text used by make help
help: help: