rockchip: Move bootrom-related declarations to a header
From: Heiko Stuebner <heiko@...> Date: Sat, 11 Feb 2017 01:37:58 +0100
Commit-Message
So far spl-boards have declared the back_to_brom() function as simple extern in the files themself. That doesn't scale well if every boards defines this on its own. Therefore move the declarations to a bootrom header. Signed-off-by: Heiko Stuebner <heiko@...> Tested-by: Kever Yang <kever.yang@...>
Patch-Comment
arch/arm/include/asm/arch-rockchip/bootrom.h | 22 ++++++++++++++++++++++ arch/arm/mach-rockchip/rk3036-board-spl.c | 3 +-- arch/arm/mach-rockchip/rk3288-board-spl.c | 3 ++- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/bootrom.h
Statistics
- 25 lines added
- 3 lines removed
Changes
----------------- arch/arm/include/asm/arch-rockchip/bootrom.h -----------------
new file mode 100644
index 0000000000..79fb1a07ac
@@ -0,0 +1,22 @@
+/*
+ * (C) Copyright 2017 Heiko Stuebner <heiko@sntech.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ */
+
+#ifndef _ASM_ARCH_BOOTROM_H
+#define _ASM_ARCH_BOOTROM_H
+
+/*
+ * Saved Stack pointer address.
+ * Access might be needed in some special cases.
+ */
+extern u32 SAVE_SP_ADDR;
+
+/*
+ * Hand control back to the bootrom to load another
+ * boot stage.
+ */
+extern void back_to_bootrom(void);
+
+#endif
------------------ arch/arm/mach-rockchip/rk3036-board-spl.c -------------------
index 801548109b..0522d65467 100644
@@ -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>
@@ -20,8 +21,6 @@ static struct rk3036_grf * const grf = (void *)GRF_BASE;
#define DEBUG_UART_BASE 0x20068000
void board_init_f(ulong dummy)
{
#ifdef EARLY_DEBUG
------------------ arch/arm/mach-rockchip/rk3288-board-spl.c -------------------
index 930939ad24..e51e19bb2d 100644
@@ -14,6 +14,7 @@
#include <spl.h>
#include <asm/gpio.h>
#include <asm/io.h>
+#include <asm/arch/bootrom.h>
#include <asm/arch/clock.h>
#include <asm/arch/hardware.h>
#include <asm/arch/periph.h>
@@ -155,7 +156,7 @@ static int configure_emmc(struct udevice *pinctrl)
return 0;
}
#endif
+
void board_init_f(ulong dummy)
{
struct udevice *pinctrl;