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>

diff --git a/README b/README
index 840b192aae509854dda357441ff341f4889d853f..420513f1bf14bd10980bd61b410b0ea7e478dd02 100644 (file)
--- 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 21837123d4df8f33af77b4feffe34c282fb542eb..3fa00fb4cc40faf0e48697edf24265f9290449a4 100644 (file)
--- 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 3b2c5ea3b8ac73062bb9aabe3a3090d69c88abfb..cc6541b1e3b265578964dabd29ac40bc7c5cdd1f 100644 (file)
--- 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 b6a78b1370efd4d714b3a9948f450d4825081da5..973033d6b4d5d8cd1a9fcf0a82afb612dd234a2c 100644 (file)
--- 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 3e78d5ce17053a2ca56a857ce52f00354ed99f30..f533ada73f472d45726330c3c187ce4a213274f3 100644 (file)
--- 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 df9bd90450eeb9caa205e378ce360ae2e185228d..11b186a3ab7c7f698944ff3fe07926957cceb6db 100644 (file)
--- 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 451140ea99dd2071b496608f05442ebc8fdf3cde..d3c3e580acb11b8576fd350c37034e7801d5d1da 100644 (file)
--- 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 a7ca48f1f6b9440d511ef319b6dcebdb69c11e9f..3b1f957364c90eb38590d0e382a6c4a663126f59 100644 (file)
--- 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