diff options
| author | Tom Rini <trini@ti.com> | 2014-04-23 11:07:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-04-23 11:07:11 -0400 |
| commit | adcdeacc3eda1e5949e54062aa99c299e12483be (patch) | |
| tree | 47c92351b8d662f46fc317b7467d13db06bb0022 /common | |
| parent | 794d5f55407080aaf5dd7585a98cefe9c6f9a569 (diff) | |
| parent | ed638b6af2e9089bc998500db7e9c655c02c2493 (diff) | |
| download | u-boot-imx-adcdeacc3eda1e5949e54062aa99c299e12483be.zip u-boot-imx-adcdeacc3eda1e5949e54062aa99c299e12483be.tar.gz u-boot-imx-adcdeacc3eda1e5949e54062aa99c299e12483be.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'common')
| -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 |