armv8: fsl: Use correct conditional compile for ls1012a

[u-boot] / arch / arm / mach-rockchip / rk3036-board-spl.c

diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c
index 3a1491cab33b7608bd89bbd044c56aa9cf49d066..9458201bd395a9899935e46401a15b662f564539 100644 (file)
--- a/arch/arm/mach-rockchip/rk3036-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
@@ -5,7 +5,9 @@
  */
 
 #include <common.h>
+#include <debug_uart.h>
 #include <asm/io.h>
+#include <asm/arch/bootrom.h>
 #include <asm/arch/grf_rk3036.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sdram_rk3036.h>
@@ -15,15 +17,13 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #define GRF_BASE       0x20008000
-static struct rk3036_grf * const grf = (void *)GRF_BASE;
 
 #define DEBUG_UART_BASE        0x20068000
 
-extern void back_to_bootrom(void);
-
 void board_init_f(ulong dummy)
 {
 #ifdef EARLY_DEBUG
+       struct rk3036_grf * const grf = (void *)GRF_BASE;
        /*
         * NOTE: sd card and debug uart use same iomux in rk3036,
         * so if you enable uart,
@@ -34,7 +34,7 @@ void board_init_f(ulong dummy)
                     GPIO1C2_MASK << GPIO1C2_SHIFT,
                     GPIO1C3_UART2_SOUT << GPIO1C3_SHIFT |
                     GPIO1C2_UART2_SIN << GPIO1C2_SHIFT);
-       rk_uart_init((void *)DEBUG_UART_BASE);
+       debug_uart_init();
 #endif
        rockchip_timer_init();
        sdram_init();