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 801548109b9b17fce5164ded9d8f143129e47cc0..9458201bd395a9899935e46401a15b662f564539 100644 (file)
--- a/arch/arm/mach-rockchip/rk3036-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
@@ -7,6 +7,7 @@
 #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>
@@ -16,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,
@@ -54,9 +53,3 @@ void board_init_r(gd_t *id, ulong dest_addr)
        while (1)
                ;
 }
-
-void hang(void)
-{
-       while (1)
-               ;
-}