aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-10-30 23:03:54 -0400
committerTom Rini <trini@konsulko.com>2021-11-05 11:23:29 -0400
commit4d7a3f52d03ed6668ca6cc2ed009c1f9bb0007dc (patch)
tree60eb405800b486b2cebf611acf913ed03c6c90b3
parent74337aa4506c76e790ab45ad4f4ab854f25d19da (diff)
downloadu-boot-4d7a3f52d03ed6668ca6cc2ed009c1f9bb0007dc.zip
u-boot-4d7a3f52d03ed6668ca6cc2ed009c1f9bb0007dc.tar.gz
u-boot-4d7a3f52d03ed6668ca6cc2ed009c1f9bb0007dc.tar.bz2
Convert CONFIG_OF_EMBED to Kconfig
This converts the following to Kconfig: CONFIG_OF_EMBED Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Rick Chen <rick@andestech.com>
-rw-r--r--README7
-rw-r--r--configs/adp-ae3xx_defconfig1
-rw-r--r--configs/adp-ag101p_defconfig1
-rw-r--r--include/configs/adp-ae3xx.h1
-rw-r--r--include/configs/adp-ag101p.h1
-rw-r--r--include/configs/cgtqmx8.h2
-rw-r--r--include/configs/imx8qm_mek.h2
-rw-r--r--include/configs/imx8qxp_mek.h2
8 files changed, 2 insertions, 15 deletions
diff --git a/README b/README
index 840b192..420513f 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 2183712..3fa00fb 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 3b2c5ea..cc6541b 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 b6a78b1..973033d 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 3e78d5c..f533ada 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 df9bd90..11b186a 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 451140e..d3c3e58 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 a7ca48f..3b1f957 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