summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>2011-03-07 11:21:40 +0900
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>2011-03-16 10:16:34 +0900
commit40c477082f9c31fa7922fb734859ca9fcca63646 (patch)
treefa63564d664e20b3c7717de3063a3f23cd692d48
parent903de461e4519ae073b4c0e967838c220fa5e5b0 (diff)
downloadu-boot-imx-40c477082f9c31fa7922fb734859ca9fcca63646.zip
u-boot-imx-40c477082f9c31fa7922fb734859ca9fcca63646.tar.gz
u-boot-imx-40c477082f9c31fa7922fb734859ca9fcca63646.tar.bz2
sh: Add handling of CONFIG_SYS_NO_FLASH for board.c
Some board of SH does not have flash memoy. This revises it to initialize Flash when CONFIG_SYS_NO_FLASH is not defined. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-rw-r--r--arch/sh/lib/board.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index 968566c..ed91643 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -43,6 +43,7 @@ const char version_string[] = U_BOOT_VERSION" ("U_BOOT_DATE" - "U_BOOT_TIME")";
unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN;
+#ifndef CONFIG_SYS_NO_FLASH
static int sh_flash_init(void)
{
gd->bd->bi_flashsize = flash_init();
@@ -54,6 +55,7 @@ static int sh_flash_init(void)
return 0;
}
+#endif /* CONFIG_SYS_NO_FLASH */
#if defined(CONFIG_CMD_NAND)
# include <nand.h>
@@ -125,7 +127,9 @@ init_fnc_t *init_sequence[] =
dram_init, /* SDRAM init */
timer_init, /* SuperH Timer (TCNT0 only) init */
sh_mem_env_init,
- sh_flash_init, /* Flash memory(NOR) init*/
+#ifndef CONFIG_SYS_NO_FLASH
+ sh_flash_init, /* Flash memory init*/
+#endif
INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */
INIT_FUNC_PCI_INIT /* PCI init */
stdio_init,
@@ -157,7 +161,9 @@ void sh_generic_init(void)
bd = gd->bd;
bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
+#ifndef CONFIG_SYS_NO_FLASH
bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
+#endif
#if defined(CONFIG_SYS_SRAM_BASE) && defined(CONFIG_SYS_SRAM_SIZE)
bd->bi_sramstart = CONFIG_SYS_SRAM_BASE;
bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;