[PATCH 07/10] Convert CONFIG_OF_EMBED to Kconfig
Tom Rini
trini at konsulko.com
Sun Oct 31 04:03:54 CET 2021
This converts the following to Kconfig:
CONFIG_OF_EMBED
Signed-off-by: Tom Rini <trini at konsulko.com>
---
README | 7 -------
configs/adp-ae3xx_defconfig | 1 +
configs/adp-ag101p_defconfig | 1 +
include/configs/adp-ae3xx.h | 1 -
include/configs/adp-ag101p.h | 1 -
include/configs/cgtqmx8.h | 2 --
include/configs/imx8qm_mek.h | 2 --
include/configs/imx8qxp_mek.h | 2 --
8 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/README b/README
index 840b192aae50..420513f1bf14 100644
--- a/README
+++ b/README
@@ -673,13 +673,6 @@ The following options need to be configured:
U-Boot needs to get its device tree from somewhere. This can
be done using one of the three options below:
- CONFIG_OF_EMBED
- If this variable is defined, U-Boot will embed a device tree
- binary in its image. This device tree file should be in the
- board directory and called <soc>-<board>.dts. The binary file
- is then picked up in board_init_f() and made available through
- the global data structure as gd->fdt_blob.
-
CONFIG_OF_SEPARATE
If this variable is defined, U-Boot will build a device tree
binary. It will be called u-boot.dtb. Architecture-specific
diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig
index cf2535ed6f8e..4b81cdc1c21c 100644
--- a/configs/adp-ae3xx_defconfig
+++ b/configs/adp-ae3xx_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y
+CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig
index c1cdb11a7c46..ee87154dadd5 100644
--- a/configs/adp-ag101p_defconfig
+++ b/configs/adp-ag101p_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y
+CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ENV_ADDR=0x80140000
diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h
index b6a78b1370ef..973033d6b4d5 100644
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -24,7 +24,6 @@
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
#ifdef CONFIG_OF_CONTROL
#undef CONFIG_OF_SEPARATE
-#define CONFIG_OF_EMBED
#endif
#endif
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 3e78d5ce1705..f533ada73f47 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -26,7 +26,6 @@
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
#ifdef CONFIG_OF_CONTROL
#undef CONFIG_OF_SEPARATE
-#define CONFIG_OF_EMBED
#endif
#endif
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index df9bd90450ee..11b186a3ab7c 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -30,8 +30,6 @@
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
-#define CONFIG_OF_EMBED
#endif
#define CONFIG_REMAKE_ELF
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 451140ea99dd..d3c3e580acb1 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -30,8 +30,6 @@
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
-#define CONFIG_OF_EMBED
#endif
#define CONFIG_REMAKE_ELF
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index a7ca48f1f6b9..3b1f957364c9 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -28,8 +28,6 @@
#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-
-#define CONFIG_OF_EMBED
#endif
#define CONFIG_REMAKE_ELF
--
2.25.1
More information about the U-Boot
mailing list