From 4b1f6d2910e97c3612dc9d45b5b35cedfa954e1c Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 25 Oct 2007 20:31:19 +0200
Subject: [PATCH] --- yaml --- r: 72629 b: refs/heads/master c:
 2266cfd50de3872e877eeca3dd4a6f940f22ba60 h: refs/heads/master i:   72627:
 3905ed5fe059f33d300e17aeaabb8a9400bbe3f9 v: v3

---
 [refs]                                                      | 2 +-
 trunk/arch/x86/Makefile                                     | 5 ++++-
 trunk/arch/{i386/defconfig => x86/configs/i386_defconfig}   | 0
 .../arch/{x86_64/defconfig => x86/configs/x86_64_defconfig} | 0
 trunk/scripts/kconfig/Makefile                              | 6 +++---
 5 files changed, 8 insertions(+), 5 deletions(-)
 rename trunk/arch/{i386/defconfig => x86/configs/i386_defconfig} (100%)
 rename trunk/arch/{x86_64/defconfig => x86/configs/x86_64_defconfig} (100%)

diff --git a/[refs] b/[refs]
index ce737e67d484..d5028cea08d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74b469f2e6b1589118b6ac05c7256add01e572d2
+refs/heads/master: 2266cfd50de3872e877eeca3dd4a6f940f22ba60
diff --git a/trunk/arch/x86/Makefile b/trunk/arch/x86/Makefile
index 65077d79c846..309597386a77 100644
--- a/trunk/arch/x86/Makefile
+++ b/trunk/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/trunk/arch/i386/defconfig b/trunk/arch/x86/configs/i386_defconfig
similarity index 100%
rename from trunk/arch/i386/defconfig
rename to trunk/arch/x86/configs/i386_defconfig
diff --git a/trunk/arch/x86_64/defconfig b/trunk/arch/x86/configs/x86_64_defconfig
similarity index 100%
rename from trunk/arch/x86_64/defconfig
rename to trunk/arch/x86/configs/x86_64_defconfig
diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile
index 83c5e76414ce..fbf39cc6afab 100644
--- a/trunk/scripts/kconfig/Makefile
+++ b/trunk/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: