From e02127f9437cecd2b6c3b77b67822afbc2733e5a Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Tue, 8 May 2018 11:09:20 +0900 Subject: [PATCH] rpi3: fix the spl build error Fix the spl build error. This is a workaround for building a rpi3 spl image. Signed-off-by: Seung-Woo Kim Signed-off-by: Jaehoon Chung --- drivers/gpio/bcm2835_gpio.c | 4 ++++ drivers/serial/serial_bcm283x_mu.c | 2 ++ drivers/serial/serial_bcm283x_pl011.c | 2 ++ include/configs/rpi.h | 1 - 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c index 0dff9ac..bf57820 100644 --- a/drivers/gpio/bcm2835_gpio.c +++ b/drivers/gpio/bcm2835_gpio.c @@ -76,6 +76,7 @@ static int bcm2835_gpio_set_value(struct udevice *dev, unsigned gpio, static int bcm2835_gpio_get_function(struct udevice *dev, unsigned offset) { +#ifndef CONFIG_SPL_BUILD struct bcm2835_gpios *priv = dev_get_priv(dev); int funcid; @@ -89,6 +90,9 @@ static int bcm2835_gpio_get_function(struct udevice *dev, unsigned offset) default: return GPIOF_FUNC; } +#else + return GPIOF_FUNC; +#endif } static const struct dm_gpio_ops gpio_bcm2835_ops = { diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 1be41ff..7dcf8bb 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -144,6 +144,7 @@ static const struct udevice_id bcm283x_mu_serial_id[] = { */ static bool bcm283x_is_serial_muxed(void) { +#ifndef CONFIG_SPL_BUILD int serial_gpio = 15; struct udevice *dev; @@ -152,6 +153,7 @@ static bool bcm283x_is_serial_muxed(void) if (pinctrl_get_gpio_mux(dev, 0, serial_gpio) != BCM2835_GPIO_ALT5) return false; +#endif return true; } diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 923f402..439ddb4 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -21,6 +21,7 @@ */ static bool bcm283x_is_serial_muxed(void) { +#ifndef CONFIG_SPL_BUILD int serial_gpio = 15; struct udevice *dev; @@ -29,6 +30,7 @@ static bool bcm283x_is_serial_muxed(void) if (pinctrl_get_gpio_mux(dev, 0, serial_gpio) != BCM2835_GPIO_ALT0) return false; +#endif return true; } diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 1e571b8..7f611d5 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -135,7 +135,6 @@ /* NFSDOWN */ #define CONFIG_IP_DEFRAG -#define CONFIG_NFS_READ_SIZE 65536 #define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) -- 2.7.4