diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-11-25 14:47:27 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 14:47:27 -0800 |
| commit | 6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (patch) | |
| tree | b071c5e43cc2075f9fa7f07bcc0101a56b779c35 /arch/um/Makefile | |
| parent | b2ff4790612bbfa3433cc92e56445c2a40098e2c (diff) | |
| parent | edd5eb4e99e4153ea7be05390fda542d986bf28d (diff) | |
| download | talos-op-linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.tar.gz talos-op-linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.zip | |
Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4
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 |
