rpi: Switch to OF_HAS_PRIOR_STAGE by default

On all Raspberry Pi platforms, we're loaded by a prior stage firmware
that has assembled and passed on a device tree binary for us to use.
Switch to using this tree by default.

Cc: Matthias Brugger <mbrugger@suse.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: François Ozog <francois.ozog@linaro.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Tested-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 93e12d8d533febaf682f213ee4d70ef7797f377f..38fc757c1f0044cb8be6aa632f8e88d7290eaa65 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -653,6 +653,7 @@ config ARCH_BCM283X
        select SERIAL_SEARCH_ALL
        imply CMD_DM
        imply FAT_WRITE
+       imply OF_HAS_PRIOR_STAGE
 
 config ARCH_BCMSTB
        bool "Broadcom BCM7XXX family"

diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
index 6ce278c6d29678c7062f406530ffc8fb26bd4fa7..b3287ce8bcea9d6cf5af272ba08bc7dd44e559b1 100644 (file)
--- a/arch/arm/mach-bcm283x/Kconfig
+++ b/arch/arm/mach-bcm283x/Kconfig
@@ -163,7 +163,6 @@ config TARGET_RPI_4_32B
 
          This option creates a build targeting the ARMv7/AArch32 ISA.
        select BCM2711_32B
-       imply OF_HAS_PRIOR_STAGE
 
 config TARGET_RPI_4
        bool "Raspberry Pi 4 64-bit build"
@@ -189,7 +188,6 @@ config TARGET_RPI_4
 
          This option creates a build targeting the ARMv8/AArch64 ISA.
        select BCM2711_64B
-       imply OF_HAS_PRIOR_STAGE
 
 config TARGET_RPI_ARM64
        bool "Raspberry Pi one binary 64-bit build"
@@ -197,7 +195,6 @@ config TARGET_RPI_ARM64
          Support for all armv8 based Raspberry Pi variants, such as
          the RPi 4 model B, in AArch64 (64-bit) mode.
        select ARM64
-       imply OF_HAS_PRIOR_STAGE
 
 endchoice
 

diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
index bed143d64d6d0c22a8d3a9a1b00ac150cd53a8ef..98f8904c9180f8791c82448831d15ffe59277fcb 100644 (file)
--- a/configs/rpi_0_w_defconfig
+++ b/configs/rpi_0_w_defconfig
@@ -24,7 +24,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index e4e4843e8cd58d59ede57395afa9c0e251b792a4..1b8676e1d10533f180cc4fe68c6f99c76d69f99b 100644 (file)
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -25,7 +25,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index 215396599e417d3770c2e622f46f448d94f2f32e..abc10a79adaed4d84b2037d0d8bcc312f9fa0fb4 100644 (file)
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -24,7 +24,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
index d1ec55e558aa0d23e20563bed7ebf1944731db24..3c8f8fc1bb75f6e193eaefca947db3b7a43c636b 100644 (file)
--- a/configs/rpi_3_b_plus_defconfig
+++ b/configs/rpi_3_b_plus_defconfig
@@ -23,7 +23,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index 8e9c35b3ceff1b63efc4fe6e11b30f7d675cfaa9..9853c448809ad90ae3771d69eb1aabfb12639dca 100644 (file)
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -23,7 +23,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 89d6372c1de010b51ab55e6e01624f56bac8bbd7..060a8809506a1c7fd52c1ca7be732fd0c3a097bb 100644 (file)
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -24,7 +24,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
-CONFIG_OF_EMBED=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y