aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/lib
diff options
context:
space:
mode:
authorDaniel Schwierzeck <daniel.schwierzeck@googlemail.com>2012-04-02 02:57:54 +0000
committerMarek Vasut <marex@denx.de>2012-04-02 15:54:52 +0200
commit71919cf15337c62b9ab389875a6a0855f0ed4461 (patch)
tree079f6666f55350b06824223c03d9fd66bc031127 /arch/mips/lib
parentc008b6f6dd6b8965e9a7654ffbce75bb9ff7a3b5 (diff)
downloadu-boot-linaro-stable-71919cf15337c62b9ab389875a6a0855f0ed4461.tar.gz
MIPS: board.c: fix init of flash data in bd_info
Boards with CONFIG_SYS_NO_FLASH should not forced to define CONFIG_SYS_FLASH_BASE. In this case the flash data in bd_info should be initialized with 0 like the other archs do. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Diffstat (limited to 'arch/mips/lib')
-rw-r--r--arch/mips/lib/board.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index d998f0e74..38e6e77a3 100644
--- a/arch/mips/lib/board.c
+++ b/arch/mips/lib/board.c
@@ -294,15 +294,19 @@ void board_init_r(gd_t *id, ulong dest_addr)
/* configure available FLASH banks */
size = flash_init();
display_flash_config(size);
+ bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
bd->bi_flashsize = size;
-#endif
- bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
#if CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE
bd->bi_flashoffset = monitor_flash_len; /* reserved area for U-Boot */
#else
bd->bi_flashoffset = 0;
#endif
+#else
+ bd->bi_flashstart = 0;
+ bd->bi_flashsize = 0;
+ bd->bi_flashoffset = 0;
+#endif
#ifdef CONFIG_CMD_NAND
puts("NAND: ");