[U-Boot] [PATCH v2 25/37] rockchip: spl: Drop MMC support code when not needed
Simon Glass
sjg at chromium.org
Fri Jan 22 03:45:13 CET 2016
When the board does not use MMC SPL this code is a waste of space. Drop it.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
Changes in v2: None
arch/arm/mach-rockchip/rk3288-board-spl.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c
index f61eeab..9fdd37d 100644
--- a/arch/arm/mach-rockchip/rk3288-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3288-board-spl.c
@@ -111,9 +111,9 @@ static void configure_l2ctlr(void)
write_l2ctlr(l2ctlr);
}
+#ifdef CONFIG_SPL_MMC_SUPPORT
static int configure_emmc(struct udevice *pinctrl)
{
-#ifdef CONFIG_SPL_MMC_SUPPORT
struct gpio_desc desc;
int ret;
@@ -143,10 +143,10 @@ static int configure_emmc(struct udevice *pinctrl)
debug("gpio value ret=%d\n", ret);
return ret;
}
-#endif
return 0;
}
+#endif
void board_init_f(ulong dummy)
{
@@ -244,6 +244,7 @@ void spl_board_init(void)
debug("%s: Cannot find pinctrl device\n", __func__);
goto err;
}
+#ifdef CONFIG_SPL_MMC_SUPPORT
ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
if (ret) {
debug("%s: Failed to set up SD card\n", __func__);
@@ -254,6 +255,7 @@ void spl_board_init(void)
debug("%s: Failed to set up eMMC\n", __func__);
goto err;
}
+#endif
/* Enable debug UART */
ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_UART_DBG);
--
2.7.0.rc3.207.g0ac5344
More information about the U-Boot
mailing list