diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2013-09-27 09:44:46 +0530 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2013-11-17 11:31:48 +0100 |
| commit | e40f04d040c66d8312ecfaf6091b2da78531276c (patch) | |
| tree | e6786cca4420e8d7ecdc5cc9a5b62aa7eedad684 /arch/um/Makefile | |
| parent | e96d1c3695d6f5fde010d27e2a245a6656de688c (diff) | |
arch/um: make it work with defconfig and x86_64
arch/um/defconfig only lists one default configuration, and that applies
only to the i386 architecture. Replace it with two minimal
configuration files generated using `make savedefconfig`:
i386_defconfig and x86_64_defconfig
The build scripts now require two updates:
1. um's Kconfig (arch/x86/um/Kconfig) should specify an ARCH_DEFCONFIG
section explicitly pointing to these scripts if the required
variables are set. Take care to remove the DEFCONFIG_LIST section
defined in the included file arch/um/Kconfig.common.
2. um's Makefile (arch/um/Makefile) should set KBUILD_DEFCONFIG properly
for the top-level Makefile to pick up. Copy the logic in
arch/x86/Makefile to properly pick the defconfig file depending on
the actual architecture; except we're working with $SUBARCH here,
instead of $ARCH.
Now, you can do:
$ ARCH=um make defconfig
$ ARCH=um make
and successfully build User-Mode Linux on an x86_64 box in default
configuration.
Cc: Richard Weinberger <richard@nod.at>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/Makefile')
| -rw-r--r-- | arch/um/Makefile | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 133f7de2a13d..48d92bbe62e9 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -6,6 +6,17 @@ # Licensed under the GPL # +# select defconfig based on actual architecture +ifeq ($(SUBARCH),x86) + ifeq ($(shell uname -m),x86_64) + KBUILD_DEFCONFIG := x86_64_defconfig + else + KBUILD_DEFCONFIG := i386_defconfig + endif +else + KBUILD_DEFCONFIG := $(SUBARCH)_defconfig +endif + ARCH_DIR := arch/um OS := $(shell uname -s) # We require bash because the vmlinux link and loader script cpp use bash |