summaryrefslogtreecommitdiffstats
path: root/Makefile.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-04-01 00:45:08 +0100
committerPeter Robinson <pbrobinson@gmail.com>2013-04-01 00:45:08 +0100
commita940693b1080f6e7d04ffda879075f85fb372e40 (patch)
treeea9c89cde08880e485c79843648c8be1d8573b62 /Makefile.config
parent0fe332198dff292e346f9d115934c3196d092d32 (diff)
downloadkernel-a940693b1080f6e7d04ffda879075f85fb372e40.tar.gz
kernel-a940693b1080f6e7d04ffda879075f85fb372e40.tar.xz
kernel-a940693b1080f6e7d04ffda879075f85fb372e40.zip
- Make tegra inherit armv7-generic, fix and re-enable tegra
- Enable SPI on ARM - Drop config-arm-generic - ARM config updates
Diffstat (limited to 'Makefile.config')
-rw-r--r--Makefile.config7
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.config b/Makefile.config
index 5a15ee6bd..69b12baa4 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -41,10 +41,7 @@ temp-armv7: config-armv7 temp-armv7-generic
temp-armv7-lpae: config-armv7-lpae temp-armv7-generic
perl merge.pl $^ > $@
-temp-arm-generic: config-arm-generic temp-generic
- perl merge.pl $^ > $@
-
-temp-armv7l-tegra: config-arm-tegra temp-arm-generic
+temp-armv7-tegra: config-armv7-tegra temp-armv7-generic
perl merge.pl $^ > $@
temp-x86-32: config-x86-32-generic config-x86-generic
@@ -116,7 +113,7 @@ kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7
kernel-$(VERSION)-armv7hl-lpae.config: /dev/null temp-armv7-lpae
perl merge.pl $^ arm > $@
-kernel-$(VERSION)-armv7hl-tegra.config: /dev/null temp-armv7l-tegra
+kernel-$(VERSION)-armv7hl-tegra.config: /dev/null temp-armv7-tegra
perl merge.pl $^ arm > $@
kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic