fdt: Enable OF_HAS_PRIOR_STAGE for most boards with OF_BOARD

Use this new Kconfig instead of OF_BOARD, so we know for sure which boards
obtain their devicetree from a prior stage. Leave sandbox alone since it
does not. Also don't touch xilinx_versal_virt since it does not have a
specific TARGET Kconfig.

This option implies OF_BOARD for now, but with future work standard
passage may be used instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Add rpi_4_32b and rpi_arm64 to the list of boards converted]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index eed27af..85c964b 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -635,6 +635,7 @@ config ARCH_BCMSTB
        select GPIO_EXTRA_HEADER
        select OF_CONTROL
        imply CMD_DM
        select GPIO_EXTRA_HEADER
        select OF_CONTROL
        imply CMD_DM

+       imply OF_HAS_PRIOR_STAGE

        help
          This enables support for Broadcom ARM-based set-top box
          chipsets, including the 7445 family of chips.
        help
          This enables support for Broadcom ARM-based set-top box
          chipsets, including the 7445 family of chips.


@@ -707,12 +708,12 @@ config ARCH_HIGHBANK
        select DM
        select DM_SERIAL
        select OF_CONTROL
        select DM
        select DM_SERIAL
        select OF_CONTROL

-       select OF_BOARD

        select CLK
        select CLK_CCF
        select AHCI
        select DM_ETH
        select PHYS_64BIT
        select CLK
        select CLK_CCF
        select AHCI
        select DM_ETH
        select PHYS_64BIT

+       imply OF_HAS_PRIOR_STAGE

 
 config ARCH_INTEGRATOR
        bool "ARM Ltd. Integrator family"
 
 config ARCH_INTEGRATOR
        bool "ARM Ltd. Integrator family"


@@ -935,13 +936,13 @@ config ARCH_APPLE
        select IOMMU
        select LINUX_KERNEL_IMAGE_HEADER
        select OF_CONTROL
        select IOMMU
        select LINUX_KERNEL_IMAGE_HEADER
        select OF_CONTROL

-       select OF_BOARD

        select PINCTRL
        select POSITION_INDEPENDENT
        select USB
        imply CMD_DM
        imply CMD_GPT
        imply DISTRO_DEFAULTS
        select PINCTRL
        select POSITION_INDEPENDENT
        select USB
        imply CMD_DM
        imply CMD_GPT
        imply DISTRO_DEFAULTS

+       imply OF_HAS_PRIOR_STAGE

 
 config ARCH_OWL
        bool "Actions Semi OWL SoCs"
 
 config ARCH_OWL
        bool "Actions Semi OWL SoCs"


@@ -966,6 +967,7 @@ config ARCH_QEMU
        imply DM_RNG
        imply DM_RTC
        imply RTC_PL031
        imply DM_RNG
        imply DM_RTC
        imply RTC_PL031

+       imply OF_HAS_PRIOR_STAGE

 
 config ARCH_RMOBILE
        bool "Renesas ARM SoCs"
 
 config ARCH_RMOBILE
        bool "Renesas ARM SoCs"


@@ -1243,7 +1245,6 @@ config TARGET_VEXPRESS64_JUNO
        select PL01X_SERIAL
        select DM
        select OF_CONTROL
        select PL01X_SERIAL
        select DM
        select OF_CONTROL

-       select OF_BOARD

        select CLK
        select DM_SERIAL
        select ARM_PSCI_FW
        select CLK
        select DM_SERIAL
        select ARM_PSCI_FW


@@ -1251,6 +1252,7 @@ config TARGET_VEXPRESS64_JUNO
        select DM_ETH
        select BLK
        select USB
        select DM_ETH
        select BLK
        select USB

+       imply OF_HAS_PRIOR_STAGE

 
 config TARGET_TOTAL_COMPUTE
        bool "Support Total Compute Platform"
 
 config TARGET_TOTAL_COMPUTE
        bool "Support Total Compute Platform"


@@ -1907,6 +1909,7 @@ config ARCH_OCTEONTX
        select OF_LIVE
        select BOARD_LATE_INIT
        select SYS_CACHE_SHIFT_7
        select OF_LIVE
        select BOARD_LATE_INIT
        select SYS_CACHE_SHIFT_7

+       imply OF_HAS_PRIOR_STAGE

 
 config ARCH_OCTEONTX2
        bool "Support OcteonTX2 SoCs"
 
 config ARCH_OCTEONTX2
        bool "Support OcteonTX2 SoCs"


@@ -1918,6 +1921,7 @@ config ARCH_OCTEONTX2
        select OF_LIVE
        select BOARD_LATE_INIT
        select SYS_CACHE_SHIFT_7
        select OF_LIVE
        select BOARD_LATE_INIT
        select SYS_CACHE_SHIFT_7

+       imply OF_HAS_PRIOR_STAGE

 
 config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"
 
 config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"


@@ -1954,6 +1958,8 @@ config TARGET_XENGUEST_ARM64
        select LINUX_KERNEL_IMAGE_HEADER
        select XEN_SERIAL
        select SSCANF
        select LINUX_KERNEL_IMAGE_HEADER
        select XEN_SERIAL
        select SSCANF

+       imply OF_HAS_PRIOR_STAGE
+

 endchoice
 
 config SUPPORT_PASSING_ATAGS
 endchoice
 
 config SUPPORT_PASSING_ATAGS

diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
index b3287ce..6ce278c 100644 (file)
--- a/arch/arm/mach-bcm283x/Kconfig
+++ b/arch/arm/mach-bcm283x/Kconfig
@@ -163,6 +163,7 @@ config TARGET_RPI_4_32B
 
          This option creates a build targeting the ARMv7/AArch32 ISA.
        select BCM2711_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"
 
 config TARGET_RPI_4
        bool "Raspberry Pi 4 64-bit build"


@@ -188,6 +189,7 @@ config TARGET_RPI_4
 
          This option creates a build targeting the ARMv8/AArch64 ISA.
        select BCM2711_64B
 
          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"
 
 config TARGET_RPI_ARM64
        bool "Raspberry Pi one binary 64-bit build"


@@ -195,6 +197,7 @@ 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
          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
 
 
 endchoice
 

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 836aedd..d71ca86 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -109,6 +109,7 @@ config TARGET_QEMU_PPCE500
        bool "Support qemu-ppce500"
        select ARCH_QEMU_E500
        select PHYS_64BIT
        bool "Support qemu-ppce500"
        select ARCH_QEMU_E500
        select PHYS_64BIT

+       imply OF_HAS_PRIOR_STAGE

 
 config TARGET_T1024RDB
        bool "Support T1024RDB"
 
 config TARGET_T1024RDB
        bool "Support T1024RDB"

diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig
index 1bbf1bc..a380db6 100644 (file)
--- a/board/emulation/qemu-riscv/Kconfig
+++ b/board/emulation/qemu-riscv/Kconfig
@@ -65,5 +65,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        imply VIRTIO_BLK
        imply MTD_NOR_FLASH
        imply CFI_FLASH
        imply VIRTIO_BLK
        imply MTD_NOR_FLASH
        imply CFI_FLASH

+       imply OF_HAS_PRIOR_STAGE

 
 endif
 
 endif

diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig
index fe18a1c..f65f58c 100644 (file)
--- a/configs/ae350_rv32_defconfig
+++ b/configs/ae350_rv32_defconfig
@@ -17,7 +17,6 @@ CONFIG_CMD_SF_TEST=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig
index 9287544..9324ed1 100644 (file)
--- a/configs/ae350_rv32_spl_defconfig
+++ b/configs/ae350_rv32_spl_defconfig
@@ -21,7 +21,6 @@ CONFIG_CMD_SF_TEST=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTP_SEND_HOSTNAME=y

diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig
index 18d114e..bd06c8e 100644 (file)
--- a/configs/ae350_rv32_spl_xip_defconfig
+++ b/configs/ae350_rv32_spl_xip_defconfig
@@ -23,7 +23,6 @@ CONFIG_CMD_SF_TEST=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTP_SEND_HOSTNAME=y

diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig
index 01016c2..479c1de 100644 (file)
--- a/configs/ae350_rv64_defconfig
+++ b/configs/ae350_rv64_defconfig
@@ -18,7 +18,6 @@ CONFIG_CMD_SF_TEST=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y

diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig
index 42b93f5..1ec993c 100644 (file)
--- a/configs/ae350_rv64_spl_defconfig
+++ b/configs/ae350_rv64_spl_defconfig
@@ -22,7 +22,6 @@ CONFIG_CMD_SF_TEST=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTP_SEND_HOSTNAME=y

diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig
index 9071b7c..b6a97f2 100644 (file)
--- a/configs/ae350_rv64_spl_xip_defconfig
+++ b/configs/ae350_rv64_spl_xip_defconfig
@@ -24,7 +24,6 @@ CONFIG_CMD_SF_TEST=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTP_SEND_HOSTNAME=y

diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig
index 2b527b6..d430dea 100644 (file)
--- a/configs/bcm7260_defconfig
+++ b/configs/bcm7260_defconfig
@@ -27,7 +27,6 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_DOS_PARTITION=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=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 3ae678b..de64161 100644 (file)
--- a/configs/bcm7445_defconfig
+++ b/configs/bcm7445_defconfig
@@ -28,7 +28,6 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_DOS_PARTITION=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y

diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index af40f71..3e8bfcf 100644 (file)
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -22,7 +22,6 @@ CONFIG_AUTOBOOT_KEYED_CTRLC=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 # CONFIG_CMD_SETEXPR is not set

-CONFIG_OF_BOARD=y

 CONFIG_ENV_IS_IN_NVRAM=y
 CONFIG_ENV_ADDR=0xFFF88000
 CONFIG_SCSI_AHCI=y
 CONFIG_ENV_IS_IN_NVRAM=y
 CONFIG_ENV_ADDR=0xFFF88000
 CONFIG_SCSI_AHCI=y

diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig
index e3df390..0dbb954 100644 (file)
--- a/configs/octeontx2_95xx_defconfig
+++ b/configs/octeontx2_95xx_defconfig
@@ -64,7 +64,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y

diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig
index 0478b30..65fb847 100644 (file)
--- a/configs/octeontx2_96xx_defconfig
+++ b/configs/octeontx2_96xx_defconfig
@@ -65,7 +65,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y

diff --git a/configs/octeontx_81xx_defconfig b/configs/octeontx_81xx_defconfig
index d871be8..ea62be3 100644 (file)
--- a/configs/octeontx_81xx_defconfig
+++ b/configs/octeontx_81xx_defconfig
@@ -66,7 +66,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y

diff --git a/configs/octeontx_83xx_defconfig b/configs/octeontx_83xx_defconfig
index 94b072b..47ddc50 100644 (file)
--- a/configs/octeontx_83xx_defconfig
+++ b/configs/octeontx_83xx_defconfig
@@ -63,7 +63,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_PARTITION_TYPE_GUID=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y

diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig
index 81d12d5..894203d 100644 (file)
--- a/configs/qemu-ppce500_defconfig
+++ b/configs/qemu-ppce500_defconfig
@@ -27,7 +27,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_OF_CONTROL=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/qemu-riscv32_defconfig b/configs/qemu-riscv32_defconfig
index 4c0f51b..b892fd6 100644 (file)
--- a/configs/qemu-riscv32_defconfig
+++ b/configs/qemu-riscv32_defconfig
@@ -12,6 +12,5 @@ CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set

-CONFIG_OF_BOARD=y

 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y

diff --git a/configs/qemu-riscv32_smode_defconfig b/configs/qemu-riscv32_smode_defconfig
index 1940608..b4856fd 100644 (file)
--- a/configs/qemu-riscv32_smode_defconfig
+++ b/configs/qemu-riscv32_smode_defconfig
@@ -13,7 +13,6 @@ CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set

-CONFIG_OF_BOARD=y

 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
 CONFIG_SYSRESET_SBI=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
 CONFIG_SYSRESET_SBI=y

diff --git a/configs/qemu-riscv32_spl_defconfig b/configs/qemu-riscv32_spl_defconfig
index 8889b02..efe8d39 100644 (file)
--- a/configs/qemu-riscv32_spl_defconfig
+++ b/configs/qemu-riscv32_spl_defconfig
@@ -15,7 +15,6 @@ CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_CMD_SBI=y
 # CONFIG_CMD_MII is not set
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_CMD_SBI=y
 # CONFIG_CMD_MII is not set

-CONFIG_OF_BOARD=y

 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
 CONFIG_SYSRESET_SBI=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
 CONFIG_SYSRESET_SBI=y

diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig
index cba975d..036484c 100644 (file)
--- a/configs/qemu-riscv64_defconfig
+++ b/configs/qemu-riscv64_defconfig
@@ -13,6 +13,5 @@ CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set

-CONFIG_OF_BOARD=y

 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y

diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
index 6b77714..e519bb6 100644 (file)
--- a/configs/qemu-riscv64_smode_defconfig
+++ b/configs/qemu-riscv64_smode_defconfig
@@ -16,7 +16,6 @@ CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set

-CONFIG_OF_BOARD=y

 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
 CONFIG_SYSRESET_SBI=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
 CONFIG_SYSRESET_SBI=y

diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig
index 8f87594..8b51237 100644 (file)
--- a/configs/qemu-riscv64_spl_defconfig
+++ b/configs/qemu-riscv64_spl_defconfig
@@ -15,7 +15,6 @@ CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_CMD_SBI=y
 # CONFIG_CMD_MII is not set
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_CMD_SBI=y
 # CONFIG_CMD_MII is not set

-CONFIG_OF_BOARD=y

 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
 CONFIG_SYSRESET_SBI=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
 CONFIG_SYSRESET_SBI=y

diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig
index 7d03eb7..5e41ea9 100644 (file)
--- a/configs/qemu_arm64_defconfig
+++ b/configs/qemu_arm64_defconfig
@@ -29,7 +29,6 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_MTDPARTS=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x4000000
 CONFIG_SCSI_AHCI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x4000000
 CONFIG_SCSI_AHCI=y

diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig
index 6bec0ae..4197cb0 100644 (file)
--- a/configs/qemu_arm_defconfig
+++ b/configs/qemu_arm_defconfig
@@ -31,7 +31,6 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_MTDPARTS=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x4000000
 CONFIG_SCSI_AHCI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x4000000
 CONFIG_SCSI_AHCI=y

diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
index 0d534b8..8f87a43 100644 (file)
--- a/configs/rpi_4_32b_defconfig
+++ b/configs/rpi_4_32b_defconfig
@@ -21,7 +21,6 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=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_4_defconfig b/configs/rpi_4_defconfig
index 0b3cada..461a765 100644 (file)
--- a/configs/rpi_4_defconfig
+++ b/configs/rpi_4_defconfig
@@ -21,7 +21,6 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=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_arm64_defconfig b/configs/rpi_arm64_defconfig
index 0b5f766..351d247 100644 (file)
--- a/configs/rpi_arm64_defconfig
+++ b/configs/rpi_arm64_defconfig
@@ -20,7 +20,6 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_TFTP_TSIZE=y

diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index 0ccd990..ffadfc0 100644 (file)
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -33,7 +33,6 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_CMD_UBI=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_CMD_UBI=y

-CONFIG_OF_BOARD=y

 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0xBFC0000
 CONFIG_SATA_SIL=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0xBFC0000
 CONFIG_SATA_SIL=y

diff --git a/configs/xenguest_arm64_defconfig b/configs/xenguest_arm64_defconfig
index edce343..223bb78 100644 (file)
--- a/configs/xenguest_arm64_defconfig
+++ b/configs/xenguest_arm64_defconfig
@@ -33,7 +33,6 @@ CONFIG_CMD_PVBLOCK=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 # CONFIG_CMD_SLEEP is not set
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y

-CONFIG_OF_BOARD=y

 CONFIG_DM=y
 # CONFIG_MMC is not set
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_DM=y
 # CONFIG_MMC is not set
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set