From d07b00d49d07ab014e3f0f3345194891c4da9607 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 9 May 2012 00:06:18 +0100
Subject: Restructure ARM configs to minimise duplication and pull all generic
 options

---
 Makefile.config | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'Makefile.config')

diff --git a/Makefile.config b/Makefile.config
index c92d986f0..e6b4a5bc5 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -9,12 +9,12 @@ CONFIGFILES	= \
 	$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config \
-	$(CFG)-arm.config  $(CFG)-armv5tel.config  $(CFG)-armv7hl.config \
-	$(CFG)-armv5tel-kirkwood.config \
-	$(CFG)-armv7l-imx.config $(CFG)-armv7l-omap.config \
-	$(CFG)-armv7l-tegra.config $(CFG)-armv7l-highbank.config \
-	$(CFG)-armv7hl-imx.config $(CFG)-armv7hl-omap.config \
-	$(CFG)-armv7hl-tegra.config $(CFG)-armv7hl-highbank.config \
+	$(CFG)-arm.config $(CFG)-armv5tel-kirkwood.config \
+	$(CFG)-armv7l.config  $(CFG)-armv7hl.config \
+	$(CFG)-armv7l-imx.config $(CFG)-armv7hl-imx.config \
+	$(CFG)-armv7l-omap.config $(CFG)-armv7hl-omap.config \
+	$(CFG)-armv7l-tegra.config $(CFG)-armv7hl-tegra.config \
+	$(CFG)-armv7l-highbank.config $(CFG)-armv7hl-highbank.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-sparc64.config  \
 	$(CFG)-ppc64.config $(CFG)-ppc64-debug.config 
@@ -40,6 +40,9 @@ temp-debug-generic: config-generic
 temp-arm-generic: config-arm-generic temp-generic
 	perl merge.pl $^  > $@
 
+temp-armv7l-versatile: config-arm-versatile temp-arm-generic
+	perl merge.pl $^  > $@
+
 temp-armv7l-omap: config-arm-omap temp-arm-generic
 	perl merge.pl $^  > $@
 
@@ -121,13 +124,10 @@ kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
 kernel-$(VERSION)-arm.config: /dev/null temp-arm-generic
 	perl merge.pl $^ arm > $@
 
-kernel-$(VERSION)-armv5tel.config: /dev/null temp-arm-generic
-	perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7hl.config: /dev/null temp-arm-generic
+kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood
 	perl merge.pl $^ arm > $@
 
-kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood
+kernel-$(VERSION)-armv7l.config: /dev/null temp-armv7l-versatile
 	perl merge.pl $^ arm > $@
 
 kernel-$(VERSION)-armv7l-imx.config: /dev/null temp-armv7l-imx
@@ -142,6 +142,9 @@ kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap
 kernel-$(VERSION)-armv7l-tegra.config: /dev/null temp-armv7l-tegra
 	perl merge.pl $^ arm > $@
 
+kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7l-versatile
+	perl merge.pl $^ arm > $@
+
 kernel-$(VERSION)-armv7hl-imx.config: /dev/null temp-armv7l-imx
 	perl merge.pl $^ arm > $@
 
-- 
cgit