Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / arch / arm / mach-bcm283x / Kconfig

diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
index 69f7a4663cfd185b79ea9baf6fb481e3e70987f3..821caedbf7a7405ae4c9a76ecd35df76397365cc 100644 (file)
--- a/arch/arm/mach-bcm283x/Kconfig
+++ b/arch/arm/mach-bcm283x/Kconfig
@@ -7,7 +7,7 @@ config BCM2836
        bool "Broadcom BCM2836 SoC support"
        depends on ARCH_BCM283X
        select ARMV7_LPAE
-       select CPU_V7
+       select CPU_V7A
 
 config BCM2837
        bool "Broadcom BCM2837 SoC support"
@@ -18,7 +18,7 @@ config BCM2837_32B
        depends on ARCH_BCM283X
        select BCM2837
        select ARMV7_LPAE
-       select CPU_V7
+       select CPU_V7A
 
 config BCM2837_64B
        bool "Broadcom BCM2837 SoC 64-bit support"
@@ -44,6 +44,22 @@ config TARGET_RPI
          This option creates a build targetting the ARM1176 ISA.
        select BCM2835
 
+config TARGET_RPI_0_W
+       bool "Raspberry Pi Zero W"
+       help
+         Support for all ARM1176-/BCM2835-based Raspberry Pi variants, such as
+         the RPi Zero model W.
+
+         This option assumes the VideoCore firmware is configured to use the
+         mini UART (rather than PL011) for the serial console. This is the
+         default on the RPi Zero W. To enable the UART console, the following
+         non-default option must be present in config.txt: enable_uart=1.
+         This is required for U-Boot to operate correctly, even if you only
+         care about the HDMI/usbkbd console.
+
+         This option creates a build targetting the ARMv7/AArch32 ISA.
+       select BCM2835
+
 config TARGET_RPI_2
        bool "Raspberry Pi 2"
        help