---

yaml --- r: 72629 b: refs/heads/master c: 2266cfd h: refs/heads/master i: 72627: 3905ed5 v: v3
git-mirror · Oct 25, 2007 · 4b1f6d2 · 4b1f6d2
1 parent 2465f23
commit 4b1f6d2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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 → trunk/arch/x86/configs/i386_defconfig b/trunk/arch/i386/defconfig → trunk/arch/x86/configs/i386_defconfig
diff --git a/trunk/arch/x86_64/defconfig → trunk/arch/x86/configs/x86_64_defconfig b/trunk/arch/x86_64/defconfig → trunk/arch/x86/configs/x86_64_defconfig
diff --git 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: