projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
[oweals/u-boot.git]
/
arch
/
sh
/
lib
/
board.c
diff --git
a/arch/sh/lib/board.c
b/arch/sh/lib/board.c
index a302fc2e65808c858817c288aa0f7c463c682546..d9c0c228e06c5b44c7eba2253414a8357d87381f 100644
(file)
--- a/
arch/sh/lib/board.c
+++ b/
arch/sh/lib/board.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2007,
2008
+ * Copyright (C) 2007,
2008, 2010
* Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
*
* This program is free software; you can redistribute it and/or
* Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
*
* This program is free software; you can redistribute it and/or
@@
-22,7
+22,6
@@
#include <command.h>
#include <malloc.h>
#include <stdio_dev.h>
#include <command.h>
#include <malloc.h>
#include <stdio_dev.h>
-#include <timestamp.h>
#include <version.h>
#include <watchdog.h>
#include <net.h>
#include <version.h>
#include <watchdog.h>
#include <net.h>
@@
-32,24
+31,28
@@
#include <miiphy.h>
#endif
#include <miiphy.h>
#endif
+DECLARE_GLOBAL_DATA_PTR;
+
extern int cpu_init(void);
extern int board_init(void);
extern int dram_init(void);
extern int timer_init(void);
extern int cpu_init(void);
extern int board_init(void);
extern int dram_init(void);
extern int timer_init(void);
-const char version_string[] = U_BOOT_VERSION" ("U_BOOT_DATE" - "U_BOOT_TIME")";
-
unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN;
unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN;
+#ifndef CONFIG_SYS_NO_FLASH
static int sh_flash_init(void)
{
static int sh_flash_init(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
gd->bd->bi_flashsize = flash_init();
gd->bd->bi_flashsize = flash_init();
- printf("FLASH: %ldMB\n", gd->bd->bi_flashsize / (1024*1024));
+
+ if (gd->bd->bi_flashsize >= (1024 * 1024))
+ printf("Flash: %ldMB\n", gd->bd->bi_flashsize / (1024*1024));
+ else
+ printf("Flash: %ldKB\n", gd->bd->bi_flashsize / 1024);
return 0;
}
return 0;
}
+#endif /* CONFIG_SYS_NO_FLASH */
#if defined(CONFIG_CMD_NAND)
# include <nand.h>
#if defined(CONFIG_CMD_NAND)
# include <nand.h>
@@
-89,7
+92,7
@@
static int sh_pci_init(void)
static int sh_mem_env_init(void)
{
static int sh_mem_env_init(void)
{
- mem_malloc_init(CONFIG_SYS_TEXT_BASE -
CONFIG_SYS
_GBL_DATA_SIZE -
+ mem_malloc_init(CONFIG_SYS_TEXT_BASE -
GENERATED
_GBL_DATA_SIZE -
CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
env_relocate();
jumptable_init();
CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
env_relocate();
jumptable_init();
@@
-99,12
+102,20
@@
static int sh_mem_env_init(void)
#if defined(CONFIG_CMD_NET)
static int sh_net_init(void)
{
#if defined(CONFIG_CMD_NET)
static int sh_net_init(void)
{
- DECLARE_GLOBAL_DATA_PTR;
gd->bd->bi_ip_addr = getenv_IPaddr("ipaddr");
return 0;
}
#endif
gd->bd->bi_ip_addr = getenv_IPaddr("ipaddr");
return 0;
}
#endif
+#if defined(CONFIG_CMD_MMC)
+static int sh_mmc_init(void)
+{
+ puts("MMC: ");
+ mmc_initialize(gd->bd);
+ return 0;
+}
+#endif
+
typedef int (init_fnc_t) (void);
init_fnc_t *init_sequence[] =
typedef int (init_fnc_t) (void);
init_fnc_t *init_sequence[] =
@@
-122,29
+133,32
@@
init_fnc_t *init_sequence[] =
dram_init, /* SDRAM init */
timer_init, /* SuperH Timer (TCNT0 only) init */
sh_mem_env_init,
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,
console_init_r,
interrupt_init,
INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */
INIT_FUNC_PCI_INIT /* PCI init */
stdio_init,
console_init_r,
interrupt_init,
-#ifdef BOARD_LATE_INIT
+#ifdef
CONFIG_
BOARD_LATE_INIT
board_late_init,
#endif
#if defined(CONFIG_CMD_NET)
sh_net_init, /* SH specific eth init */
board_late_init,
#endif
#if defined(CONFIG_CMD_NET)
sh_net_init, /* SH specific eth init */
+#endif
+#if defined(CONFIG_CMD_MMC)
+ sh_mmc_init,
#endif
NULL /* Terminate this list */
};
void sh_generic_init(void)
{
#endif
NULL /* Terminate this list */
};
void sh_generic_init(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
bd_t *bd;
init_fnc_t **init_fnc_ptr;
bd_t *bd;
init_fnc_t **init_fnc_ptr;
- memset(gd, 0,
CONFIG_SYS
_GBL_DATA_SIZE);
+ memset(gd, 0,
GENERATED
_GBL_DATA_SIZE);
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
@@
-156,7
+170,9
@@
void sh_generic_init(void)
bd = gd->bd;
bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
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;
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;
#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;