diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2013-03-17 23:20:06 +0000 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2013-03-17 23:20:06 +0000 |
commit | 8c4242cafab485c6f66e46ea463cb90b8c61be30 (patch) | |
tree | 6b6f62ab21de530d61ab13d6e8bd03679e22e4cf /Makefile.config | |
parent | 8a56c6cd5979e5cddaa9886419dde1f58a4cecde (diff) | |
download | kernel-8c4242cafab485c6f66e46ea463cb90b8c61be30.tar.gz kernel-8c4242cafab485c6f66e46ea463cb90b8c61be30.tar.xz kernel-8c4242cafab485c6f66e46ea463cb90b8c61be30.zip |
Initial merge OMAP support into ARM unified kernel
Add ARM LPAE kernel for Cortex A-15 devices that support LPAE and HW virtualisation
Unified ARM kernel provides highbank and OMAP support
Drop remantents of ARM softfp kernels
Diffstat (limited to 'Makefile.config')
-rw-r--r-- | Makefile.config | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Makefile.config b/Makefile.config index 78085481b..140172d6c 100644 --- a/Makefile.config +++ b/Makefile.config @@ -9,9 +9,8 @@ CONFIGFILES = \ $(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \ $(CFG)-x86_64.config $(CFG)-x86_64-debug.config \ $(CFG)-s390x.config \ - $(CFG)-armv7l.config $(CFG)-armv7hl.config \ - $(CFG)-armv7l-omap.config $(CFG)-armv7hl-omap.config \ - $(CFG)-armv7l-tegra.config $(CFG)-armv7hl-tegra.config \ + $(CFG)-armv7hl.config $(CFG)-armv7hl-lpae.config\ + $(CFG)-armv7hl-omap.config $(CFG)-armv7hl-tegra.config \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ $(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config @@ -33,7 +32,13 @@ temp-generic: config-generic temp-debug-generic: config-generic cat config-generic config-debug > temp-debug-generic -temp-armv7: config-armv7 temp-generic +temp-armv7-generic: config-armv7-generic temp-generic + perl merge.pl $^ > $@ + +temp-armv7: config-armv7 temp-armv7-generic + perl merge.pl $^ > $@ + +temp-armv7-lpae: config-armv7-lpae temp-armv7-generic perl merge.pl $^ > $@ temp-arm-generic: config-arm-generic temp-generic @@ -108,16 +113,10 @@ kernel-$(VERSION)-ppc64p7.config: config-powerpc64p7 temp-powerpc64-generic kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic perl merge.pl $^ s390 > $@ -kernel-$(VERSION)-armv7l.config: /dev/null temp-armv7 - perl merge.pl $^ arm > $@ - -kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap - perl merge.pl $^ arm > $@ - -kernel-$(VERSION)-armv7l-tegra.config: /dev/null temp-armv7l-tegra +kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7 perl merge.pl $^ arm > $@ -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-omap.config: /dev/null temp-armv7l-omap |