From: Simon Glass <sjg@chromium.org>
Date: Mon, 16 Jan 2017 14:03:50 +0000 (-0700)
Subject: board_f/r: Use static const for the init sequences
X-Git-Tag: v2017.03-rc2~90
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4acff4524783d860d873e131057602e43b8294f9;p=u-boot

board_f/r: Use static const for the init sequences

These tables should be declared static const. Unfortunately the table in
board_r is updated on machines with manual relocation.

Update them.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/common/board_f.c b/common/board_f.c
index 88ecfe02db..62cdd8cf8f 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -846,7 +846,7 @@ __weak int arch_cpu_init_dm(void)
 	return 0;
 }
 
-static init_fnc_t init_sequence_f[] = {
+static const init_fnc_t init_sequence_f[] = {
 #ifdef CONFIG_SANDBOX
 	setup_ram_buf,
 #endif
@@ -1098,7 +1098,7 @@ void board_init_f(ulong boot_flags)
  * NOTE: At present only x86 uses this route, but it is intended that
  * all archs will move to this when generic relocation is implemented.
  */
-static init_fnc_t init_sequence_f_r[] = {
+static const init_fnc_t init_sequence_f_r[] = {
 #if !CONFIG_IS_ENABLED(X86_64)
 	init_cache_f_r,
 #endif
diff --git a/common/board_r.c b/common/board_r.c
index 48fa4ee524..f739c8afdf 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -737,7 +737,7 @@ static int run_main_loop(void)
  *
  * TODO: perhaps reset the watchdog in the initcall function after each call?
  */
-init_fnc_t init_sequence_r[] = {
+static init_fnc_t init_sequence_r[] = {
 	initr_trace,
 	initr_reloc,
 	/* TODO: could x86/PPC have this also perhaps? */