diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-03-21 21:38:29 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-03-21 21:38:29 +0100 |
| commit | 9063fda9d6b90169a0c8027b1167d9bd96ab78d5 (patch) | |
| tree | f3754b45894ef9905a9011d732e160a320ddee64 /arch | |
| parent | 7afc45ad7d9493208d89072cbb78a5bfc8034b59 (diff) | |
| parent | b52da2aed8c2c388661f369052a97d5b5c9ed00a (diff) | |
| download | blackbird-obmc-uboot-9063fda9d6b90169a0c8027b1167d9bd96ab78d5.tar.gz blackbird-obmc-uboot-9063fda9d6b90169a0c8027b1167d9bd96ab78d5.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/cpu/sh2/u-boot.lds | 2 | ||||
| -rw-r--r-- | arch/sh/cpu/sh3/u-boot.lds | 2 | ||||
| -rw-r--r-- | arch/sh/cpu/sh4/u-boot.lds | 2 | ||||
| -rw-r--r-- | arch/sh/lib/board.c | 8 |
4 files changed, 10 insertions, 4 deletions
diff --git a/arch/sh/cpu/sh2/u-boot.lds b/arch/sh/cpu/sh2/u-boot.lds index e4e8b60696..7c0a18d62c 100644 --- a/arch/sh/cpu/sh2/u-boot.lds +++ b/arch/sh/cpu/sh2/u-boot.lds @@ -38,7 +38,7 @@ SECTIONS .text : { - arch/sh/cpu/sh2/start.o (.text) + KEEP(arch/sh/cpu/sh2/start.o (.text)) . = ALIGN(8192); common/env_embedded.o (.ppcenv) . = ALIGN(8192); diff --git a/arch/sh/cpu/sh3/u-boot.lds b/arch/sh/cpu/sh3/u-boot.lds index 8afe1603ee..271624636b 100644 --- a/arch/sh/cpu/sh3/u-boot.lds +++ b/arch/sh/cpu/sh3/u-boot.lds @@ -44,7 +44,7 @@ SECTIONS .text : { - arch/sh/cpu/sh3/start.o (.text) + KEEP(arch/sh/cpu/sh3/start.o (.text)) . = ALIGN(8192); common/env_embedded.o (.ppcenv) . = ALIGN(8192); diff --git a/arch/sh/cpu/sh4/u-boot.lds b/arch/sh/cpu/sh4/u-boot.lds index d3719df543..0f42325aff 100644 --- a/arch/sh/cpu/sh4/u-boot.lds +++ b/arch/sh/cpu/sh4/u-boot.lds @@ -41,7 +41,7 @@ SECTIONS .text : { - arch/sh/cpu/sh4/start.o (.text) + KEEP(arch/sh/cpu/sh4/start.o (.text)) . = ALIGN(8192); common/env_embedded.o (.ppcenv) . = ALIGN(8192); diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c index 968566c6f5..ed91643427 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; |
