diff options
| author | Simon Glass <sjg@chromium.org> | 2017-01-16 07:03:50 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2017-02-06 11:38:46 +0800 |
| commit | 4acff4524783d860d873e131057602e43b8294f9 (patch) | |
| tree | 7bca13eee65666129d1a4bb3247cc45690e5eb1b | |
| parent | 530f27eab5df8bcebfb7cb20a342f97e297ec0e8 (diff) | |
| download | u-boot-imx-4acff4524783d860d873e131057602e43b8294f9.zip u-boot-imx-4acff4524783d860d873e131057602e43b8294f9.tar.gz u-boot-imx-4acff4524783d860d873e131057602e43b8294f9.tar.bz2 | |
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>
| -rw-r--r-- | common/board_f.c | 4 | ||||
| -rw-r--r-- | common/board_r.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/board_f.c b/common/board_f.c index 88ecfe0..62cdd8c 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 48fa4ee..f739c8a 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? */ |