sh: add checking the CONFIG_SYS_NO_FLASH
PATCH 1/1 sh: add checking the CONFIG_SYS_NO_FLASH
Signed-off-by Yoshihiro Shimoda <[email protected]>
--- arch/sh/lib/board.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
arch/sh/lib/board.c +6 -0
@@ -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 ; +#if !defined(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 #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, +#if !defined(CONFIG_SYS_NO_FLASH) sh_flash_init, /* Flash memory(NOR) 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 ; +#if !defined(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 ;
Signature · 1 line
1.7.1
Nobuhiro Iwamatsu
AppliedPATCH 1/1 sh: add checking the CONFIG_SYS_NO_FLASH
arch/sh/lib/board.c
Quoted 9 lines · Yoshihiro Shimoda
Signed-off-by Yoshihiro Shimoda <[email protected]>--- arch/sh/lib/board.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)arch/sh/lib/board.c +0
-0
Applied, thanks.
Nobuhiro