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>
This commit is contained in:
Tom Rini 2021-12-24 11:57:04 -05:00 committed by Peter Robinson
parent 52835266d3
commit 713c9d3f94
8 changed files with 1 additions and 9 deletions

View file

@ -653,6 +653,7 @@ config ARCH_BCM283X
select SERIAL_SEARCH_ALL select SERIAL_SEARCH_ALL
imply CMD_DM imply CMD_DM
imply FAT_WRITE imply FAT_WRITE
imply OF_HAS_PRIOR_STAGE
config ARCH_BCMSTB config ARCH_BCMSTB
bool "Broadcom BCM7XXX family" bool "Broadcom BCM7XXX family"

View file

@ -163,7 +163,6 @@ config TARGET_RPI_4_32B
This option creates a build targeting the ARMv7/AArch32 ISA. This option creates a build targeting the ARMv7/AArch32 ISA.
select BCM2711_32B select BCM2711_32B
imply OF_HAS_PRIOR_STAGE
config TARGET_RPI_4 config TARGET_RPI_4
bool "Raspberry Pi 4 64-bit build" 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. This option creates a build targeting the ARMv8/AArch64 ISA.
select BCM2711_64B select BCM2711_64B
imply OF_HAS_PRIOR_STAGE
config TARGET_RPI_ARM64 config TARGET_RPI_ARM64
bool "Raspberry Pi one binary 64-bit build" 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 Support for all armv8 based Raspberry Pi variants, such as
the RPi 4 model B, in AArch64 (64-bit) mode. the RPi 4 model B, in AArch64 (64-bit) mode.
select ARM64 select ARM64
imply OF_HAS_PRIOR_STAGE
endchoice endchoice

View file

@ -24,7 +24,6 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_FS_UUID=y CONFIG_CMD_FS_UUID=y
CONFIG_OF_EMBED=y
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

View file

@ -25,7 +25,6 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_FS_UUID=y CONFIG_CMD_FS_UUID=y
CONFIG_OF_EMBED=y
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

View file

@ -24,7 +24,6 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_FS_UUID=y CONFIG_CMD_FS_UUID=y
CONFIG_OF_EMBED=y
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

View file

@ -23,7 +23,6 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_FS_UUID=y CONFIG_CMD_FS_UUID=y
CONFIG_OF_EMBED=y
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

View file

@ -23,7 +23,6 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_FS_UUID=y CONFIG_CMD_FS_UUID=y
CONFIG_OF_EMBED=y
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

View file

@ -24,7 +24,6 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_FS_UUID=y CONFIG_CMD_FS_UUID=y
CONFIG_OF_EMBED=y
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y