From b5a96d7b4ad73e31d7a269b0a0a3c98659c93875 Mon Sep 17 00:00:00 2001 From: Paolo Pisati Date: Tue, 5 Jun 2012 17:34:06 +0200 Subject: [PATCH 1/2] UBUNTU: [Config] disable LPAE support 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 --- debian.master/config/armel/config.common.armel | 5 ++--- debian.master/config/armhf/config.common.armhf | 2 ++ debian.master/config/armhf/config.flavour.highbank | 3 --- debian.master/config/armhf/config.flavour.omap | 3 --- debian.master/config/config.common.ubuntu | 1 + 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 92f0837..41e0ac8 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -8,13 +8,12 @@ CONFIG_AMIGA_PARTITION=y # CONFIG_APM_EMULATION is not set # CONFIG_ARCH_HIGHBANK is not set CONFIG_ARCH_OMAP=y -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_ARM_ERRATA_430973=y CONFIG_ARM_ERRATA_743622=y -CONFIG_ARM_LPAE=y CONFIG_ASYNC_TX_DMA=y CONFIG_ATARI_PARTITION=y # CONFIG_ATA_NONSTANDARD is not set @@ -197,7 +196,7 @@ CONFIG_PATA_ARASAN_CF=m # CONFIG_PCCARD is not set # CONFIG_PCI_SYSCALL is not set CONFIG_PERF_COUNTERS=y -CONFIG_PHYS_ADDR_T_64BIT=y +# CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_PL330_DMA=m CONFIG_PMIC_ADP5520=y CONFIG_PMIC_DA903X=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index c2f7753..63bb328 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -2,6 +2,7 @@ # Config options for config.common.armhf automatically generated by splitconfig.pl # # CONFIG_APM_EMULATION is not set +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SUPPORTS_MSI is not set @@ -62,6 +63,7 @@ CONFIG_NVRAM=m CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PCCARD is not set # CONFIG_PCI_SYSCALL is not set +# CONFIG_PHYS_ADDR_T_64BIT is not set # CONFIG_PM_DEBUG is not set CONFIG_POWER_SUPPLY=y CONFIG_PRINT_QUOTA_WARNING=y diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index c8b7046..6ca2812 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -7,10 +7,8 @@ # CONFIG_AMIGA_PARTITION is not set CONFIG_ARCH_HIGHBANK=y # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set # CONFIG_ARM_ERRATA_430973 is not set # CONFIG_ARM_ERRATA_743622 is not set -# CONFIG_ARM_LPAE is not set # CONFIG_ASYNC_TX_DMA is not set # CONFIG_ATARI_PARTITION is not set # CONFIG_ATMEL_PWM is not set @@ -137,7 +135,6 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_PARPORT_1284 is not set # CONFIG_PATA_ARASAN_CF is not set # CONFIG_PERF_COUNTERS is not set -# CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_PL330_DMA=y # CONFIG_PMIC_ADP5520 is not set # CONFIG_PMIC_DA903X is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index b169187..2b73fda 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -7,10 +7,8 @@ CONFIG_AMBA_PL08X=y CONFIG_AMIGA_PARTITION=y # CONFIG_ARCH_HIGHBANK is not set CONFIG_ARCH_OMAP=y -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARM_ERRATA_430973=y CONFIG_ARM_ERRATA_743622=y -CONFIG_ARM_LPAE=y CONFIG_ASYNC_TX_DMA=y CONFIG_ATARI_PARTITION=y CONFIG_ATMEL_PWM=m @@ -137,7 +135,6 @@ CONFIG_OSF_PARTITION=y CONFIG_PARPORT_1284=y CONFIG_PATA_ARASAN_CF=m CONFIG_PERF_COUNTERS=y -CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_PL330_DMA=m CONFIG_PMIC_ADP5520=y CONFIG_PMIC_DA903X=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 6576f5e..1da26ae 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -364,6 +364,7 @@ CONFIG_ARM_GIC=y CONFIG_ARM_KPROBES_TEST=m CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=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