From 47572387d58a9584c60ebbbdee56fc92c627f16f Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Thu, 25 Oct 2007 21:04:16 +0200 Subject: [PATCH] x86: move i386 and x86_64 Kconfig files to x86 directory After a small change in kconfig Makefile we could move all x86 Kconfig files to x86 directory. Signed-off-by: Sam Ravnborg --- arch/{i386 => x86}/Kconfig.cpu | 0 arch/{i386/Kconfig => x86/Kconfig.i386} | 2 +- arch/{x86_64/Kconfig => x86/Kconfig.x86_64} | 0 scripts/kconfig/Makefile | 7 ++++++- 4 files changed, 7 insertions(+), 2 deletions(-) rename arch/{i386 => x86}/Kconfig.cpu (100%) rename arch/{i386/Kconfig => x86/Kconfig.i386} (99%) rename arch/{x86_64/Kconfig => x86/Kconfig.x86_64} (100%) diff --git a/arch/i386/Kconfig.cpu b/arch/x86/Kconfig.cpu similarity index 100% rename from arch/i386/Kconfig.cpu rename to arch/x86/Kconfig.cpu diff --git a/arch/i386/Kconfig b/arch/x86/Kconfig.i386 similarity index 99% rename from arch/i386/Kconfig rename to arch/x86/Kconfig.i386 index d24e3e2..7331efe8 100644 --- a/arch/i386/Kconfig +++ b/arch/x86/Kconfig.i386 @@ -287,7 +287,7 @@ config ES7000_CLUSTERED_APIC default y depends on SMP && X86_ES7000 && MPENTIUMIII -source "arch/i386/Kconfig.cpu" +source "arch/x86/Kconfig.cpu" config HPET_TIMER bool "HPET Timer Support" diff --git a/arch/x86_64/Kconfig b/arch/x86/Kconfig.x86_64 similarity index 100% rename from arch/x86_64/Kconfig rename to arch/x86/Kconfig.x86_64 diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 3c9db07..5959412 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -4,7 +4,12 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config -Kconfig := arch/$(ARCH)/Kconfig +# If a arch/$(SRCARCH)/Kconfig.$(ARCH) file exist use it +ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/Kconfig.$(ARCH)),) + Kconfig := arch/$(SRCARCH)/Kconfig.$(ARCH) +else + Kconfig := arch/$(SRCARCH)/Kconfig +endif xconfig: $(obj)/qconf $< $(Kconfig) -- 2.7.4