diff options
| author | angelo@sysam.it <angelo@sysam.it> | 2015-02-12 01:40:17 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-05 20:13:21 -0500 |
| commit | e310b93ec1f7db77c1bb91841f7b73d47f43b561 (patch) | |
| tree | 800a993df416ea579cd8dbb944da7d56f0557ae0 /common/board_r.c | |
| parent | e77e65dfc2f803e7dd78f5bb2bc6b3750635cedd (diff) | |
| download | u-boot-imx-e310b93ec1f7db77c1bb91841f7b73d47f43b561.zip u-boot-imx-e310b93ec1f7db77c1bb91841f7b73d47f43b561.tar.gz u-boot-imx-e310b93ec1f7db77c1bb91841f7b73d47f43b561.tar.bz2 | |
m68k: add generic-board support
Add generic-board support for the m68k architecture.
Signed-off-by: Angelo Dureghello <angelo@sysam.it>
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/common/board_r.c b/common/board_r.c index 4fcd4f6..826b94e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -167,14 +167,17 @@ static int initr_serial(void) return 0; } -#ifdef CONFIG_PPC +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) static int initr_trap(void) { /* * Setup trap handlers */ +#if defined(CONFIG_PPC) trap_init(gd->relocaddr); - +#else + trap_init(CONFIG_SYS_SDRAM_BASE); +#endif return 0; } #endif @@ -268,14 +271,6 @@ static int initr_malloc(void) return 0; } -#ifdef CONFIG_SYS_NONCACHED_MEMORY -static int initr_noncached(void) -{ - noncached_init(); - return 0; -} -#endif - #ifdef CONFIG_DM static int initr_dm(void) { @@ -703,9 +698,6 @@ init_fnc_t init_sequence_r[] = { #endif initr_barrier, initr_malloc, -#ifdef CONFIG_SYS_NONCACHED_MEMORY - initr_noncached, -#endif bootstage_relocate, #ifdef CONFIG_DM initr_dm, @@ -729,7 +721,7 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_NEEDS_MANUAL_RELOC initr_manual_reloc_cmdtable, #endif -#ifdef CONFIG_PPC +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) initr_trap, #endif #ifdef CONFIG_ADDR_MAP @@ -831,7 +823,8 @@ init_fnc_t init_sequence_r[] = { #if defined(CONFIG_ARM) || defined(CONFIG_AVR32) initr_enable_interrupts, #endif -#if defined(CONFIG_X86) || defined(CONFIG_MICROBLAZE) || defined(CONFIG_AVR32) +#if defined(CONFIG_X86) || defined(CONFIG_MICROBLAZE) || defined(CONFIG_AVR32) \ + || defined(CONFIG_M68K) timer_init, /* initialize timer */ #endif #if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT) |