Correct SPL uses of OF_BOARD

This converts 3 usages of this option to the non-SPL form, since there is
no SPL_OF_BOARD defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Matthias Brugger <mbrugger@suse.com>

diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
index 44a310f83deb72f3773b13e8aaee2ff897906bfb..e949cb70900ab2ccd0b6a23822c4ab10fa1457af 100644 (file)
--- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
@@ -153,7 +153,7 @@ U_BOOT_DRIVER(pinctrl_bcm283x) = {
        .priv_auto      = sizeof(struct bcm283x_pinctrl_priv),
        .ops            = &bcm283x_pinctrl_ops,
        .probe          = bcm283x_pinctl_probe,
-#if CONFIG_IS_ENABLED(OF_BOARD)
+#if IS_ENABLED(CONFIG_OF_BOARD)
        .flags          = DM_FLAG_PRE_RELOC,
 #endif
 };

diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 12cbcb9858c21474f65084548d3b4945951e66a6..7585f790d22a758d9aa1dbecee51262d252efd64 100644 (file)
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -197,7 +197,7 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = {
        .plat_auto      = sizeof(struct bcm283x_mu_serial_plat),
        .probe = bcm283x_mu_serial_probe,
        .ops = &bcm283x_mu_serial_ops,
-#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD)
+#if !CONFIG_IS_ENABLED(OF_CONTROL) || IS_ENABLED(CONFIG_OF_BOARD)
        .flags = DM_FLAG_PRE_RELOC,
 #endif
        .priv_auto      = sizeof(struct bcm283x_mu_priv),

diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index 7d172cdac0a50fd66491a26fc120a6a4746ced2e..09a9868a38f14b0abddbfade5e60e0bc0aa9ad37 100644 (file)
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -94,7 +94,7 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = {
        .probe  = bcm283x_pl011_serial_probe,
        .plat_auto      = sizeof(struct pl01x_serial_plat),
        .ops    = &bcm283x_pl011_serial_ops,
-#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD)
+#if !CONFIG_IS_ENABLED(OF_CONTROL) || IS_ENABLED(CONFIG_OF_BOARD)
        .flags  = DM_FLAG_PRE_RELOC,
 #endif
        .priv_auto      = sizeof(struct pl01x_priv),