]> git.sur5r.net Git - u-boot/commitdiff
ARM: exynos: Fix build error if SERIAL is disabled in SPL
authorMarek Vasut <marex@denx.de>
Sat, 30 Apr 2016 22:36:11 +0000 (00:36 +0200)
committerMinkyu Kang <mk7.kang@samsung.com>
Thu, 26 May 2016 03:55:49 +0000 (12:55 +0900)
If CONFIG_SPL_SERIAL_SUPPORT is not defined in include/configs/exynos5-common.h
the following error is produced during the build of the SPL:

arch/arm/mach-exynos/built-in.o: In function `do_lowlevel_init':
...u-boot/arch/arm/mach-exynos/lowlevel_init.c:221: undefined reference to `debug_uart_init'

Add additional condition to check if SPL build is in progress and
in that case check if CONFIG_SPL_SERIAL_SUPPORT is also set before
enabling the debug UART.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
arch/arm/mach-exynos/lowlevel_init.c

index 6c39cb2052f94aabba313f3ec35275388945d4ee..1e090fd63ca1ab90087b97c13f9582d25a0db343 100644 (file)
@@ -216,8 +216,11 @@ int do_lowlevel_init(void)
        if (actions & DO_CLOCKS) {
                system_clock_init();
 #ifdef CONFIG_DEBUG_UART
+#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL_SUPPORT)) || \
+    !defined(CONFIG_SPL_BUILD)
                exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE);
                debug_uart_init();
+#endif
 #endif
                mem_ctrl_init(actions & DO_MEM_RESET);
                tzpc_init();