[PATCH] UBUNTU: [Config] disable LPAE support

[Paolo Pisati]

Omap3 doesn't support 64bit addressint and LPAE cut off from
proc_info (see arch/arm/mm/proc-v7.S::__v7_ca5mp_proc_info) all
cpus not supporing it, making the kernel unbootable: fix it.

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/armel/config.common.armel |    2 --
 debian.master/config/armel/config.flavour.omap |    2 ++
 debian.master/config/armhf/config.common.armhf |    2 --
 debian.master/config/armhf/config.flavour.omap |    2 ++
 debian.master/config/config.common.ubuntu      |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index e39680f..d2a4cf4 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -2,7 +2,6 @@
 # Config options for config.common.armel automatically generated by splitconfig.pl
 #
 # CONFIG_APM_EMULATION is not set
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
@@ -93,7 +92,6 @@ CONFIG_PANEL_DVI=y
 CONFIG_PANEL_GENERIC_DPI=y
 # CONFIG_PCCARD is not set
 # CONFIG_PCI_SYSCALL is not set
-CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_POWER_SUPPLY=y
 CONFIG_PRINT_QUOTA_WARNING=y
diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap
index 6f08ab9..31513bc 100644
--- a/debian.master/config/armel/config.flavour.omap
+++ b/debian.master/config/armel/config.flavour.omap
@@ -1,3 +1,5 @@
 #
 # Config options for config.flavour.omap automatically generated by splitconfig.pl
 #
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 310e05a..c5c19fc 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -2,7 +2,6 @@
 # Config options for config.common.armhf automatically generated by splitconfig.pl
 #
 # CONFIG_APM_EMULATION is not set
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
@@ -93,7 +92,6 @@ CONFIG_PANEL_DVI=y
 CONFIG_PANEL_GENERIC_DPI=y
 # CONFIG_PCCARD is not set
 # CONFIG_PCI_SYSCALL is not set
-CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_POWER_SUPPLY=y
 CONFIG_PRINT_QUOTA_WARNING=y
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 6f08ab9..31513bc 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -1,3 +1,5 @@
 #
 # Config options for config.flavour.omap automatically generated by splitconfig.pl
 #
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 32fa044..f366404 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -366,7 +366,7 @@ CONFIG_ARM_ERRATA_754322=y
 CONFIG_ARM_KPROBES_TEST=m
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_LPAE=y
+# CONFIG_ARM_LPAE is not set
 CONFIG_ARM_NR_BANKS=8
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
-- 
1.7.9.5