Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
[sfrench/cifs-2.6.git] / arch / arm / mach-realview / Kconfig
index bf35cfd89f34c2c4692d5484899749602fedbe9c..d4cfa214538649cde7e389e281cbf634aced1e13 100644 (file)
@@ -47,6 +47,15 @@ config MACH_REALVIEW_PB1176
        help
          Include support for the ARM(R) RealView ARM1176 Platform Baseboard.
 
+config REALVIEW_PB1176_SECURE_FLASH
+       bool "Allow access to the secure flash memory block"
+       depends on MACH_REALVIEW_PB1176
+       default n
+       help
+         Select this option if Linux will only run in secure mode on the
+         RealView PB1176 platform and access to the secure flash memory
+         block (64MB @ 0x3c000000) is required.
+
 config MACH_REALVIEW_PBA8
        bool "Support RealView/PB-A8 platform"
        select CPU_V7
@@ -57,6 +66,13 @@ config MACH_REALVIEW_PBA8
          PB-A8 is a platform with an on-board Cortex-A8 and has support for
          PCI-E and Compact Flash.
 
+config MACH_REALVIEW_PBX
+       bool "Support RealView/PBX platform"
+       select ARM_GIC
+       select HAVE_PATA_PLATFORM
+       help
+         Include support for the ARM(R) RealView PBX platform.
+
 config REALVIEW_HIGH_PHYS_OFFSET
        bool "High physical base address for the RealView platform"
        depends on !MACH_REALVIEW_PB1176