[U-Boot] [PATCH] Kconfig: CONFIG_OF_PLATDATA doesn't really exist

Tom Rini trini at konsulko.com
Sat Jan 14 18:21:39 CET 2017


There is no CONFIG_OF_PLATDATA, only CONFIG_SPL_OF_PLATDATA, so rename
the two references to CONFIG_OF_PLATDATA to CONFIG_SPL_OF_PLATDATA.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 common/spl/spl.c             | 2 +-
 drivers/serial/Kconfig       | 2 +-
 scripts/config_whitelist.txt | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c
index a76ea3a60342..e512ee03effa 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -248,7 +248,7 @@ int spl_init(void)
 		}
 	}
 	if (IS_ENABLED(CONFIG_SPL_DM)) {
-		/* With CONFIG_OF_PLATDATA, bring in all devices */
+		/* With CONFIG_SPL_OF_PLATDATA, bring in all devices */
 		ret = dm_init_and_scan(!CONFIG_IS_ENABLED(OF_PLATDATA));
 		if (ret) {
 			debug("dm_init_and_scan() returned error %d\n", ret);
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index b26ada38adaf..b11f3ff89eb6 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -352,7 +352,7 @@ config ROCKCHIP_SERIAL
 	depends on DM_SERIAL && SPL_OF_PLATDATA
 	help
 	  Select this to enable a debug UART for Rockchip devices when using
-	  CONFIG_OF_PLATDATA (i.e. a compiled-in device tree replacemenmt).
+	  CONFIG_SPL_OF_PLATDATA (i.e. a compiled-in device tree replacemenmt).
 	  This uses the ns16550 driver, converting the platdata from of-platdata
 	  to the ns16550 format.
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1ad9f7e9e7ab..d7244c56ad8e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2229,7 +2229,6 @@ CONFIG_ODROID_REV_AIN
 CONFIG_OFF_PADCONF
 CONFIG_OF_
 CONFIG_OF_IDE_FIXUP
-CONFIG_OF_PLATDATA
 CONFIG_OF_SPI
 CONFIG_OF_SPI_FLASH
 CONFIG_OF_STDOUT_PATH
-- 
1.9.1



More information about the U-Boot mailing list