diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-06 20:57:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-06 20:57:55 -0400 |
| commit | ce2724909b07737030666b2046222f47f2d9feb8 (patch) | |
| tree | ee655d923cfdfd5d4a273f75db4ec3d3f314fe28 /common/board_r.c | |
| parent | 99c69538093143984edf0bcebdadc0a6d767c0a4 (diff) | |
| parent | 276b6c943a9b8166666b808c64d8a1deefdccbb3 (diff) | |
Merge branch '2020-08-06-Kconfig-sram-options'
- Migrate a few SRAM related options to Kconfig, related cleanups.
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/common/board_r.c b/common/board_r.c index d9307f02e06..d48d2bb8a04 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -187,12 +187,6 @@ static int initr_reloc_global_data(void) return 0; } -static int initr_serial(void) -{ - serial_initialize(); - return 0; -} - #if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) static int initr_trap(void) { @@ -714,12 +708,15 @@ static init_fnc_t init_sequence_r[] = { #endif initr_dm_devices, stdio_init_tables, - initr_serial, + serial_initialize, initr_announce, #if CONFIG_IS_ENABLED(WDT) initr_watchdog, #endif INIT_FUNC_WATCHDOG_RESET +#if defined(CONFIG_NEEDS_MANUAL_RELOC) && defined(CONFIG_BLOCK_CACHE) + blkcache_init, +#endif #ifdef CONFIG_NEEDS_MANUAL_RELOC initr_manual_reloc_cmdtable, #endif @@ -854,9 +851,6 @@ static init_fnc_t init_sequence_r[] = { #if defined(CONFIG_PRAM) initr_mem, #endif -#if defined(CONFIG_M68K) && defined(CONFIG_BLOCK_CACHE) - blkcache_init, -#endif run_main_loop, }; |