summaryrefslogtreecommitdiffstats
path: root/Makefile.config
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.config')
-rw-r--r--Makefile.config14
1 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.config b/Makefile.config
index 086685496..0e71c35c0 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -8,7 +8,8 @@ CONFIGFILES = \
$(CFG)-i686.config $(CFG)-i686-debug.config \
$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
- $(CFG)-s390x.config $(CFG)-arm.config \
+ $(CFG)-s390x.config \
+ $(CFG)-arm.config $(CFG)-armv7l-omap.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-sparc64.config \
$(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
@@ -32,6 +33,12 @@ temp-generic: config-generic
temp-debug-generic: config-generic
cat config-generic config-debug > temp-debug-generic
+temp-arm-generic: config-arm-generic temp-generic
+ perl merge.pl $^ > $@
+
+temp-armv7l-omap-generic: config-arm-omap-generic temp-arm-generic
+ perl merge.pl $^ > $@
+
temp-x86-32: config-x86-32-generic config-x86-generic
perl merge.pl $^ > $@
@@ -98,7 +105,10 @@ kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generi
kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
perl merge.pl $^ s390 > $@
-kernel-$(VERSION)-arm.config: config-arm temp-generic
+kernel-$(VERSION)-arm.config: /dev/null temp-arm-generic
+ perl merge.pl $^ arm > $@
+
+kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap-generic
perl merge.pl $^ arm > $@
kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic