From 9d6505ea5c67b69c487a7af8f50cb18e90b8a924 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Thu, 19 Sep 2013 22:21:11 +0000
Subject: [PATCH] [armhf] Add armmp-lpae flavour which enables large memory
 support

svn path=/dists/trunk/linux/; revision=20653
---
 debian/changelog                |  1 +
 debian/config/armhf/config.lpae | 14 ++++++++++++++
 debian/config/armhf/defines     | 13 +++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 debian/config/armhf/config.lpae

diff --git a/debian/changelog b/debian/changelog
index edcb7faa0..e8ffa2ff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ linux (3.11.1-1~exp1) UNRELEASED; urgency=low
   [ Ian Campbell ]
   * [armhf] Enable CONFIG_PCI for multiplatform flavour.
     - Enable standard NIC and SCSI modules and include in udebs.
+  * [armhf] Add multiplatform + LPAE flavour (armmp-lpae).
 
  -- Ben Hutchings <ben@decadent.org.uk>  Fri, 13 Sep 2013 04:37:21 +0100
 
diff --git a/debian/config/armhf/config.lpae b/debian/config/armhf/config.lpae
new file mode 100644
index 000000000..a23edc64b
--- /dev/null
+++ b/debian/config/armhf/config.lpae
@@ -0,0 +1,14 @@
+##
+## file: arch/arm/Kconfig
+##
+CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
+
+##
+## file: arch/arm/mm/Kconfig
+##
+CONFIG_ARM_LPAE=y
+
+##
+## file: drivers/iommu/Kconfig
+##
+CONFIG_ARM_SMMU=y
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 643a4d30e..5405c1656 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -1,6 +1,7 @@
 [base]
 flavours:
  armmp
+ armmp-lpae
  mx5
  omap
  vexpress
@@ -19,6 +20,18 @@ image-file: arch/arm/boot/zImage
 hardware: ARMv7 multiplatform compatible SoCs
 hardware-long: ARMv7 multiplatform kernel for Marvell Armada 370/xp, Freescale iMX5x/iMX6
 
+[armmp-lpae_build]
+image-file: arch/arm/boot/zImage
+
+[armmp-lpae_description]
+hardware: ARMv7 multiplatform compatible SoCs supporting LPAE
+hardware-long: ARMv7 multiplatform kernel supporting LPAE
+
+[armmp-lpae_image]
+configs:
+ armhf/config.armmp
+ armhf/config.lpae
+
 [mx5_build]
 image-file: arch/arm/boot/zImage