diff mbox series

[v2,116/169] Correct SPL use of OF_EMBED

Message ID	20230205224118.233425-117-sjg@chromium.org
State	Accepted
Commit	bc2dba9603af5adb9b33e8e10dc95e9ef95a38f8
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org> Subject: [PATCH v2 116/169] Correct SPL use of OF_EMBED Date: Sun, 5 Feb 2023 15:40:25 -0700 Message-Id: <20230205224118.233425-117-sjg@chromium.org> In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	Kconfig: More cleanup of CONFIG options \| expand [v2,000/169] Kconfig: More cleanup of CONFIG options [v2,001/169] moveconfig: Update to detect / correct missing SPL Kconfigs [v2,002/169] x86: Correct Chrromebook typo [v2,003/169] boot: Add a Kconfig for SPL_FIT_CIPHER [v2,004/169] boot: Add a Kconfig for SPL_BOOTSTD_FULL [v2,005/169] boot: Add Kconfigs for BOOTMETH_VBE_REQUEST [v2,006/169] boot: Add a Kconfig for SPL_BOOTDEV_SPI_FLASH [v2,007/169] boot: Add a Kconfig for SPL_BOOTDEV_ETH [v2,008/169] dm: Add a Kconfig for SPL_DEVRES [v2,009/169] dm: Add a Kconfig for SPL_DM_HWSPINLOCK [v2,010/169] boot: Add a Kconfig for SPL_OF_LIVE [v2,011/169] cmd: Add a Kconfig for SPL_CRC32_VERIFY [v2,012/169] console: Add a Kconfig for SPL_CONSOLE_MUX et al [v2,013/169] button: Add a Kconfig for SPL_BUTTON [v2,014/169] lib: Add a Kconfig for SPL_ERRNO_STR [v2,015/169] iommu: Add a Kconfig for SPL_IOMMU [v2,016/169] pinctrl: Add a Kconfig for SPL_PINCTRL_ARMADA_38X [v2,017/169] virtio: Add a Kconfig for SPL_VIRTIO [v2,018/169] lib: Add a Kconfig for SPL_BZIP2 [v2,019/169] acpi: Add a Kconfig for SPL_ACPIGEN [v2,020/169] rockchip: Add a Kconfig for SPL_RESET_ROCKCHIP [v2,021/169] mediatek: Add a Kconfig for SPL_RESET_MEDIATEK [v2,022/169] Correct SPL use of A003399_NOR_WORKAROUND [v2,023/169] Correct SPL use of AHCI [v2,024/169] Correct SPL uses of ALLEYCAT_5 [v2,025/169] Correct SPL uses of ARCH_MVEBU [v2,027/169] Correct SPL use of ARCH_ZYNQ [v2,028/169] Correct SPL use of ARM64 [v2,029/169] Correct SPL uses of ARMADA_3700 [v2,030/169] Correct SPL uses of ARMADA_8K [v2,031/169] Correct SPL use of ATMEL_PIO4 [v2,032/169] Correct SPL use of BNXT_ETH [v2,033/169] Correct SPL use of BOOTSTAGE_FDT [v2,034/169] Correct SPL uses of BOOTSTAGE_REPORT [v2,035/169] Correct SPL use of CMD_BCB [v2,037/169] Correct SPL use of CMD_BOOTI [v2,038/169] Correct SPL uses of CMD_BOOTM_PRE_LOAD [v2,039/169] Correct SPL use of CMD_BOOTZ [v2,040/169] Correct SPL uses of CMD_CLK [v2,041/169] Correct SPL uses of CMD_DHCP [v2,042/169] Correct SPL uses of CMD_EFICONFIG [v2,043/169] Correct SPL use of CMD_ERASEENV [v2,044/169] Correct SPL uses of CMD_FDT [v2,045/169] Correct SPL use of CMD_FRU [v2,046/169] Correct SPL use of CMD_HASH [v2,047/169] Correct SPL use of CMD_MBR [v2,048/169] Correct SPL uses of CMD_MMC [v2,049/169] Correct SPL use of CMD_NET [v2,050/169] Correct SPL use of CMD_NVEDIT_EFI [v2,051/169] Correct SPL uses of CMD_NVME [v2,052/169] Correct SPL use of CMD_PSTORE [v2,053/169] Correct SPL uses of CMD_PXE [v2,054/169] Correct SPL uses of CMD_SCSI [v2,055/169] Correct SPL uses of CMD_SF [v2,056/169] Correct SPL use of CMD_SHA1SUM [v2,057/169] Correct SPL use of CMD_STBOARD [v2,058/169] Correct SPL use of CMD_STM32PROG [v2,059/169] Correct SPL uses of CMD_TFTPPUT [v2,060/169] Correct SPL uses of CMD_USB [v2,061/169] Correct SPL use of CMD_VIRTIO [v2,062/169] Correct SPL uses of CPU_MICROBLAZE [v2,063/169] Correct SPL use of DEBUG_UART_ZYNQ [v2,064/169] Correct SPL uses of DFU_VIRT [v2,067/169] Correct SPL use of DISPLAY_CPUINFO [v2,068/169] Correct SPL use of DM_RNG [v2,069/169] Correct SPL uses of DTB_RESELECT [v2,070/169] Correct SPL uses of DWC_ETH_QOS [v2,071/169] Correct SPL use of EFI_APP [v2,072/169] Correct SPL use of EFI_DEVICE_PATH_UTIL [v2,073/169] Correct SPL uses of EFI_HAVE_CAPSULE_SUPPORT [v2,074/169] Correct SPL use of EFI_LOADER_HII [v2,076/169] Correct SPL use of EFI_SECURE_BOOT [v2,077/169] Correct SPL use of EFI_TCG2_PROTOCOL [v2,078/169] Correct SPL use of EFI_UNICODE_COLLATION_PROTOCOL2 [v2,079/169] Correct SPL uses of ENV_IS_IN_UBI [v2,080/169] Correct SPL uses of ENV_VARS_UBOOT_RUNTIME_CONFIG [v2,081/169] Correct SPL use of ENV_WRITEABLE_LIST [v2,082/169] Correct SPL use of EXYNOS7420 [v2,084/169] Correct SPL uses of FASTBOOT_FLASH [v2,087/169] Correct SPL use of FASTBOOT_MMC_USER_SUPPORT [v2,088/169] Correct SPL use of FDT_SIMPLEFB [v2,090/169] Correct SPL use of FSL_CAAM [v2,091/169] Correct SPL uses of FSL_ISBC_KEY_EXT [v2,092/169] Correct SPL use of FSL_MC_ENET [v2,093/169] Correct SPL use of FSP_VERSION2 [v2,094/169] Correct SPL use of FS_EROFS [v2,095/169] Correct SPL use of GENERATE_SMBIOS_TABLE [v2,096/169] Correct SPL uses of GMAC_ROCKCHIP [v2,097/169] Correct SPL use of HUSH_PARSER [v2,098/169] Correct SPL uses of HW_WATCHDOG [v2,099/169] Correct SPL uses of I8259_PIC [v2,100/169] Correct SPL uses of IMX8M [v2,101/169] Correct SPL use of IMX8MN_BEACON_2GB_LPDDR [v2,102/169] Correct SPL uses of IMX_MODULE_FUSE [v2,103/169] Correct SPL uses of IMX_RDC [v2,104/169] Correct SPL uses of LMB [v2,105/169] Correct SPL uses of MICROBLAZE [v2,106/169] Correct SPL use of MIPS_CM [v2,107/169] Correct SPL use of MMC_QUIRKS [v2,108/169] Correct SPL uses of MTD [v2,109/169] Correct SPL uses of MULTIPLEXER [v2,110/169] Correct SPL uses of NEEDS_MANUAL_RELOC [v2,111/169] Correct SPL use of NETDEVICES [v2,112/169] Correct SPL uses of NXP_FSPI [v2,113/169] Correct SPL use of OCTEON_SERIAL_BOOTCMD [v2,114/169] Correct SPL use of OCTEON_SERIAL_PCIE_CONSOLE [v2,116/169] Correct SPL use of OF_EMBED [v2,118/169] Correct SPL use of PARTITION_TYPE_GUID [v2,119/169] Correct SPL use of PCI_PNP [v2,120/169] Correct SPL uses of PG_WCOM_UBOOT_BOOTPACKAGE [v2,121/169] Correct SPL uses of PG_WCOM_UBOOT_UPDATE [v2,124/169] Correct SPL use of PHY_CADENCE_TORRENT [v2,126/169] Correct SPL uses of PMIC_STPMIC1 [v2,127/169] Correct SPL use of QFW_PIO [v2,128/169] Correct SPL use of REGEX [v2,129/169] Correct SPL use of RENESAS_SDHI [v2,130/169] Correct SPL use of RESV_RAM [v2,131/169] Correct SPL uses of ROCKCHIP_EFUSE [v2,133/169] Correct SPL use of SANDBOX [v2,134/169] Correct SPL uses of SANDBOX_CLK_CCF [v2,135/169] Correct SPL uses of SAVE_PREV_BL_FDT_ADDR [v2,138/169] Correct SPL uses of SIFIVE_OTP [v2,139/169] Correct SPL use of SL28CPLD [v2,140/169] Correct SPL use of SL28_SPL_LOADS_OPTEE_BL32 [v2,144/169] Correct SPL use of STM32MP15X_STM32IMAGE [v2,145/169] Correct SPL use of SUPPORT_EMMC_RPMB [v2,146/169] Correct SPL use of SYS_FSL_ERRATUM_A010539 [v2,147/169] Correct SPL uses of SYS_LONGHELP [v2,148/169] Correct SPL use of SYS_MEM_RSVD_FOR_MMU [v2,150/169] Correct SPL use of TARGET_MX6UL_9X9_EVK [v2,151/169] Correct SPL use of TARGET_PG_WCOM_EXPU1 [v2,152/169] Correct SPL use of TARGET_PG_WCOM_SELI8 [v2,153/169] Correct SPL use of TEE [v2,155/169] Correct SPL use of TPM_RNG [v2,156/169] Correct SPL use of UDP_FUNCTION_FASTBOOT [v2,157/169] Correct SPL use of USB_DWC3_MESON_G12A [v2,158/169] Correct SPL uses of USB_DWC3_MESON_GXL [v2,159/169] Correct SPL use of USB_FUNCTION_FASTBOOT [v2,160/169] Correct SPL uses of USB_GADGET_DWC2_OTG [v2,162/169] Correct SPL uses of USB_MUSB_HOST [v2,163/169] Correct SPL uses of VIDEO [v2,164/169] Correct SPL use of VIDEO_ANSI [v2,166/169] Correct SPL use of VIDEO_BPP32 [v2,167/169] Correct SPL use of WATCHDOG_AUTOSTART [v2,168/169] Correct SPL uses of XEN_SERIAL [v2,169/169] Correct SPL uses of ZYNQMP_FIRMWARE

Commit Message

Simon Glass Feb. 5, 2023, 10:40 p.m. UTC

This converts 1 usage of this option to the non-SPL form, since there is
no SPL_OF_EMBED defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 common/board_r.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/common/board_r.c b/common/board_r.c
index fe803615163..90e1219fb96 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -155,7 +155,7 @@  static int initr_reloc_global_data(void)
 	 * The fdt_blob needs to be moved to new relocation address
 	 * incase of FDT blob is embedded with in image
 	 */
-	if (CONFIG_IS_ENABLED(OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
+	if (IS_ENABLED(CONFIG_OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
 		gd->fdt_blob += gd->reloc_off;
 
 #ifdef CONFIG_EFI_LOADER