diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-05-15 08:27:32 (GMT) |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-05-15 08:27:32 (GMT) |
| commit | e7f9350525d73233d4eaf1793f8fe618e9fd4910 (patch) | |
| tree | 153366c61e17af4ecdd9f10be520f707d525157d /common/board_f.c | |
| parent | 50c8d66d33651d7fca6a082a1eea6e537401a2f4 (diff) | |
| parent | d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 (diff) | |
| download | u-boot-fsl-qoriq-e7f9350525d73233d4eaf1793f8fe618e9fd4910.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/board_f.c b/common/board_f.c index f285bad..cbdf06f 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -173,7 +173,7 @@ static int announce_dram_init(void) return 0; } -#ifdef CONFIG_PPC +#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) static int init_func_ram(void) { #ifdef CONFIG_BOARD_TYPES @@ -819,7 +819,7 @@ static init_fnc_t init_sequence_f[] = { /* TODO: can we rename this to timer_init()? */ init_timebase, #endif -#ifdef CONFIG_ARM +#if defined(CONFIG_ARM) || defined(CONFIG_MIPS) timer_init, /* initialize timer */ #endif #ifdef CONFIG_SYS_ALLOC_DPRAM @@ -889,7 +889,7 @@ static init_fnc_t init_sequence_f[] = { #ifdef CONFIG_ARM dram_init, /* configure available RAM banks */ #endif -#ifdef CONFIG_PPC +#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) init_func_ram, #endif #ifdef CONFIG_POST |