diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 6 | ||||
| -rw-r--r-- | common/board_r.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/board_f.c b/common/board_f.c index d5e7622..11aa555 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -270,7 +270,7 @@ static int setup_mon_len(void) gd->mon_len = (ulong)&__bss_end - (ulong)_start; #elif defined(CONFIG_SANDBOX) gd->mon_len = (ulong)&_end - (ulong)_init; -#elif defined(CONFIG_BLACKFIN) +#elif defined(CONFIG_BLACKFIN) || defined(CONFIG_NIOS2) gd->mon_len = CONFIG_SYS_MONITOR_LEN; #else /* TODO: use (ulong)&__bss_end - (ulong)&__text_start; ? */ @@ -945,7 +945,7 @@ static init_fnc_t init_sequence_f[] = { * - board info struct */ setup_dest_addr, -#if defined(CONFIG_BLACKFIN) +#if defined(CONFIG_BLACKFIN) || defined(CONFIG_NIOS2) /* Blackfin u-boot monitor should be on top of the ram */ reserve_uboot, #endif @@ -970,7 +970,7 @@ static init_fnc_t init_sequence_f[] = { !defined(CONFIG_BLACKFIN) reserve_video, #endif -#if !defined(CONFIG_BLACKFIN) +#if !defined(CONFIG_BLACKFIN) && !defined(CONFIG_NIOS2) reserve_uboot, #endif #ifndef CONFIG_SPL_BUILD diff --git a/common/board_r.c b/common/board_r.c index ba9a68d..f9647e1 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -133,7 +133,7 @@ static int initr_reloc_global_data(void) { #ifdef __ARM__ monitor_flash_len = _end - __image_copy_start; -#elif !defined(CONFIG_SANDBOX) +#elif !defined(CONFIG_SANDBOX) && !defined(CONFIG_NIOS2) monitor_flash_len = (ulong)&__init_end - gd->relocaddr; #endif #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) |