diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2007-10-25 14:31:19 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2007-10-25 16:27:41 -0400 |
| commit | 2266cfd50de3872e877eeca3dd4a6f940f22ba60 (patch) | |
| tree | 362afb85ef2d13b12c479b3183e92aacb5da64db /arch | |
| 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>
Diffstat (limited to 'arch')
| -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 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 65077d79c846..309597386a77 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | # Unified Makefile for i386 and x86_64 | 1 | # Unified Makefile for i386 and x86_64 |
| 2 | 2 | ||
| 3 | # No need to remake these files | 3 | # select defconfig based on actual architecture |
| 4 | KBUILD_DEFCONFIG := $(ARCH)_defconfig | ||
| 5 | |||
| 6 | # # No need to remake these files | ||
| 4 | $(srctree)/arch/x86/Makefile%: ; | 7 | $(srctree)/arch/x86/Makefile%: ; |
| 5 | 8 | ||
| 6 | ifeq ($(ARCH),i386) | 9 | ifeq ($(ARCH),i386) |
diff --git a/arch/i386/defconfig b/arch/x86/configs/i386_defconfig index 54ee1764fdae..54ee1764fdae 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 b091c5e35558..b091c5e35558 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||