board: arm: Remove OF_PRIOR_STAGE from the remaining Arm boards

At some point back in 2018 prior_stage_fdt_address and OF_PRIOR_STAGE got
introduced,  in order to support a DTB handed over by an earlier stage boo
loader.  However we have another option in the Kconfig (OF_BOARD) which has
identical semantics.

So let's remove the option in an effort to simplify U-Boot's config and DTB
management,  and use OF_BOARD instead.

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d8c041a87733d636f5385d039c4ccb2a14e28d6f..504abca0b7176673932b037404de46f5222b636f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -636,7 +636,6 @@ config ARCH_BCMSTB
        select DM
        select GPIO_EXTRA_HEADER
        select OF_CONTROL
-       select OF_PRIOR_STAGE
        imply CMD_DM
        help
          This enables support for Broadcom ARM-based set-top box

diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c
index 276e59b3bd222f6bae8bfeec8e8b0aee935352ab..723ebda3bd2105c8aa213d88c69ff3fca415e9c6 100644 (file)
--- a/board/broadcom/bcmstb/bcmstb.c
+++ b/board/broadcom/bcmstb/bcmstb.c
@@ -130,3 +130,9 @@ int board_late_init(void)
 
        return 0;
 }
+
+void *board_fdt_blob_setup(void)
+{
+       /* Stored the DTB address there during our init */
+       return (void *)prior_stage_fdt_address;
+}

diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig
index ec58dd25369318b1bfcbf5e57b2485a4a5c17d56..3afb909f712f121155693b8a738585bfd9e269aa 100644 (file)
--- a/configs/bcm7260_defconfig
+++ b/configs/bcm7260_defconfig
@@ -25,7 +25,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_OF_PRIOR_STAGE=y
+CONFIG_OF_BOARD=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y

diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig
index d5dd4b70102e5a74746f4b82287a42b40a1bca71..3726abd73549aedead3668d9b5488b7365004e52 100644 (file)
--- a/configs/bcm7445_defconfig
+++ b/configs/bcm7445_defconfig
@@ -26,7 +26,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_OF_PRIOR_STAGE=y
+CONFIG_OF_BOARD=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y