aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index baf6dc6e9a1b..3b3de99c2d6c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -901,6 +901,7 @@ config ARCH_U300
901 901
902config ARCH_U8500 902config ARCH_U8500
903 bool "ST-Ericsson U8500 Series" 903 bool "ST-Ericsson U8500 Series"
904 depends on MMU
904 select CPU_V7 905 select CPU_V7
905 select ARM_AMBA 906 select ARM_AMBA
906 select GENERIC_CLOCKEVENTS 907 select GENERIC_CLOCKEVENTS
@@ -1280,7 +1281,7 @@ config ARM_ERRATA_743622
1280 depends on CPU_V7 1281 depends on CPU_V7
1281 help 1282 help
1282 This option enables the workaround for the 743622 Cortex-A9 1283 This option enables the workaround for the 743622 Cortex-A9
1283 (r2p0..r2p2) erratum. Under very rare conditions, a faulty 1284 (r2p*) erratum. Under very rare conditions, a faulty
1284 optimisation in the Cortex-A9 Store Buffer may lead to data 1285 optimisation in the Cortex-A9 Store Buffer may lead to data
1285 corruption. This workaround sets a specific bit in the diagnostic 1286 corruption. This workaround sets a specific bit in the diagnostic
1286 register of the Cortex-A9 which disables the Store Buffer 1287 register of the Cortex-A9 which disables the Store Buffer
@@ -1577,7 +1578,7 @@ config LOCAL_TIMERS
1577config ARCH_NR_GPIO 1578config ARCH_NR_GPIO
1578 int 1579 int
1579 default 1024 if ARCH_SHMOBILE || ARCH_TEGRA 1580 default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
1580 default 350 if ARCH_U8500 1581 default 355 if ARCH_U8500
1581 default 0 1582 default 0
1582 help 1583 help
1583 Maximum number of GPIOs in the system. 1584 Maximum number of GPIOs in the system.