Kconfig: CONFIG_OF_PLATDATA doesn't really exist

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@konsulko.com>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index a76ea3a603422ea4ad52d90803919e80d98b6433..e512ee03effa7981457ec04bbceba9f7b5693a52 100644 (file)
--- 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 b26ada38adaf8dd470b8cce438a689eb7eb7a402..b11f3ff89eb63824edf7254298a431ae3e767612 100644 (file)
--- 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 1ad9f7e9e7ab7c440ae98ca7710f7f0cfcb992df..d7244c56ad8e8e63ae40207e7187d8f8fb977c0b 100644 (file)
--- 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