diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-06 09:21:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-06 09:21:33 -0500 |
| commit | 4ca0c3c993436cca743ed521e7f3d784d7fe31c8 (patch) | |
| tree | 4a14903a7134569b12206d439603d9db04647af7 /common/board_f.c | |
| parent | 250ea267d875ce3ff0e046308d31f51ff8d3b5e8 (diff) | |
| parent | 75199d6f722a0f711628194240ee5bf724e31101 (diff) | |
| download | u-boot-4ca0c3c993436cca743ed521e7f3d784d7fe31c8.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_f.c b/common/board_f.c index a12ac282fa..725eb18427 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -896,7 +896,7 @@ static init_fnc_t init_sequence_f[] = { * - board info struct */ setup_dest_addr, -#if defined(CONFIG_BLACKFIN) || defined(CONFIG_NIOS2) +#if defined(CONFIG_BLACKFIN) /* Blackfin u-boot monitor should be on top of the ram */ reserve_uboot, #endif @@ -921,7 +921,7 @@ static init_fnc_t init_sequence_f[] = { !defined(CONFIG_BLACKFIN) && !defined(CONFIG_M68K) reserve_video, #endif -#if !defined(CONFIG_BLACKFIN) && !defined(CONFIG_NIOS2) +#if !defined(CONFIG_BLACKFIN) reserve_uboot, #endif #ifndef CONFIG_SPL_BUILD |