arm: socfpga: misc: Add CONFIG_SYS_L2_PL310 switch

[oweals/u-boot.git] / 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 0522d6546742b24056823050d907ffcd9b932849..5ec69f131161f1edc07aa9c14f9b81e1e222458b 100644 (file)
--- a/arch/arm/mach-rockchip/rk3036-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <common.h>
@@ -14,16 +13,14 @@
 #include <asm/arch/timer.h>
 #include <asm/arch/uart.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #define GRF_BASE       0x20008000
-static struct rk3036_grf * const grf = (void *)GRF_BASE;
 
 #define DEBUG_UART_BASE        0x20068000
 
 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,
@@ -40,7 +37,7 @@ void board_init_f(ulong dummy)
        sdram_init();
 
        /* return to maskrom */
-       back_to_bootrom();
+       back_to_bootrom(BROM_BOOT_NEXTSTAGE);
 }
 
 /* Place Holders */
@@ -53,9 +50,3 @@ void board_init_r(gd_t *id, ulong dest_addr)
        while (1)
                ;
 }
-
-void hang(void)
-{
-       while (1)
-               ;
-}