ARM: zynq: Change zc770 xm011 Nand x16 configurations

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

diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
index a78239d63e4cd9cdf7a0c9c1fe7657b2892c6510..00419bf25495237093b2f67db02b3aa9ff9e84f1 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"
@@ -26,6 +26,23 @@ config BCM2837_64B
        select BCM2837
        select ARM64
 
+config BCM2711
+       bool "Broadcom BCM2711 SoC support"
+       depends on ARCH_BCM283X
+
+config BCM2711_32B
+       bool "Broadcom BCM2711 SoC 32-bit support"
+       depends on ARCH_BCM283X
+       select BCM2711
+       select ARMV7_LPAE
+       select CPU_V7A
+
+config BCM2711_64B
+       bool "Broadcom BCM2711 SoC 64-bit support"
+       depends on ARCH_BCM283X
+       select BCM2711
+       select ARM64
+
 menu "Broadcom BCM283X family"
        depends on ARCH_BCM283X
 
@@ -41,7 +58,7 @@ config TARGET_RPI
          support BCM2836/BCM2837-based Raspberry Pis such as the RPi 2 and
          RPi 3 due to different peripheral address maps.
 
-         This option creates a build targetting the ARM1176 ISA.
+         This option creates a build targeting the ARM1176 ISA.
        select BCM2835
 
 config TARGET_RPI_0_W
@@ -57,7 +74,7 @@ config TARGET_RPI_0_W
          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.
+         This option creates a build targeting the ARMv7/AArch32 ISA.
        select BCM2835
 
 config TARGET_RPI_2
@@ -80,7 +97,7 @@ config TARGET_RPI_2
          arm_loader: emmc clock depends on core clock See:
          https://github.com/raspberrypi/firmware/issues/572".
 
-         This option creates a build targetting the ARMv7/AArch32 ISA.
+         This option creates a build targeting the ARMv7/AArch32 ISA.
        select BCM2836
 
 config TARGET_RPI_3_32B
@@ -96,7 +113,7 @@ config TARGET_RPI_3_32B
          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.
+         This option creates a build targeting the ARMv7/AArch32 ISA.
        select BCM2837_32B
 
 config TARGET_RPI_3
@@ -124,9 +141,60 @@ config TARGET_RPI_3
          duplicated here. The VC FW enhancement is tracked in
          https://github.com/raspberrypi/firmware/issues/579.
 
-         This option creates a build targetting the ARMv8/AArch64 ISA.
+         This option creates a build targeting the ARMv8/AArch64 ISA.
        select BCM2837_64B
 
+config TARGET_RPI_4_32B
+       bool "Raspberry Pi 4 32-bit build"
+       help
+         Support for all BCM2711-based Raspberry Pi variants, such as
+         the RPi 4 model B, in AArch32 (32-bit) mode.
+
+         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 4. 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.
+
+         Due to hardware incompatibilities, this can't be used with
+         BCM283/5/6/7.
+
+         This option creates a build targeting the ARMv7/AArch32 ISA.
+       select BCM2711_32B
+
+config TARGET_RPI_4
+       bool "Raspberry Pi 4 64-bit build"
+       help
+         Support for all BCM2711-based Raspberry Pi variants, such as
+         the RPi 4 model B, in AArch64 (64-bit) mode.
+
+         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 4. 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.
+
+         Due to hardware incompatibilities, this can't be used with
+         BCM283/5/6/7.
+
+         Also, due to a bug in firmware, switching to 64bit mode doesn't
+         happen automatically based on the kernel's image filename. See
+         https://github.com/raspberrypi/firmware/issues/1193 for more details.
+         Until that is resolved, the configuration (config.txt) needs to
+         explicitly set: arm_64bit=1.
+
+         This option creates a build targeting the ARMv8/AArch64 ISA.
+       select BCM2711_64B
+
+config TARGET_RPI_ARM64
+       bool "Raspberry Pi one binary 64-bit build"
+       help
+         Support for all armv8 based Raspberry Pi variants, such as
+         the RPi 4 model B, in AArch64 (64-bit) mode.
+       select ARM64
+
 endchoice
 
 config SYS_BOARD