mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 08:57:58 +00:00
c790b04d23
This patch moves the malloc initialization before calling flash_init(). Upcoming changes to the NOR FLASH common CFI driver with optional MTD infrastructure and MTD concatenation support will call malloc(). And nothing really speaks against enabling malloc just a little earlier in the boot stage. Some architectures already enable malloc before calling flash_init() so they don't need any changes here. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Scott McNutt <smcnutt@psyent.com> Cc: Shinya Kuribayashi <shinya.kuribayashi@necel.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: Daniel Hellstrom <daniel@gaisler.com> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: John Rigby <jcrigby@gmail.com>
233 lines
5.3 KiB
C
233 lines
5.3 KiB
C
/*
|
|
* Copyright (C) 2007,2008
|
|
* Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <malloc.h>
|
|
#include <devices.h>
|
|
#include <timestamp.h>
|
|
#include <version.h>
|
|
#include <watchdog.h>
|
|
#include <net.h>
|
|
#include <environment.h>
|
|
|
|
extern void malloc_bin_reloc (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;
|
|
|
|
static unsigned long mem_malloc_start;
|
|
static unsigned long mem_malloc_end;
|
|
static unsigned long mem_malloc_brk;
|
|
|
|
static void mem_malloc_init(void)
|
|
{
|
|
|
|
mem_malloc_start = (TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN);
|
|
mem_malloc_end = (mem_malloc_start + CONFIG_SYS_MALLOC_LEN - 16);
|
|
mem_malloc_brk = mem_malloc_start;
|
|
memset((void *) mem_malloc_start, 0,
|
|
(mem_malloc_end - mem_malloc_start));
|
|
}
|
|
|
|
void *sbrk(ptrdiff_t increment)
|
|
{
|
|
unsigned long old = mem_malloc_brk;
|
|
unsigned long new = old + increment;
|
|
|
|
if ((new < mem_malloc_start) ||
|
|
(new > mem_malloc_end)) {
|
|
return NULL;
|
|
}
|
|
|
|
mem_malloc_brk = new;
|
|
return (void *) old;
|
|
}
|
|
|
|
static int sh_flash_init(void)
|
|
{
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
gd->bd->bi_flashsize = flash_init();
|
|
printf("FLASH: %ldMB\n", gd->bd->bi_flashsize / (1024*1024));
|
|
|
|
return 0;
|
|
}
|
|
|
|
#if defined(CONFIG_CMD_NAND)
|
|
# include <nand.h>
|
|
# define INIT_FUNC_NAND_INIT nand_init,
|
|
#else
|
|
# define INIT_FUNC_NAND_INIT
|
|
#endif /* CONFIG_CMD_NAND */
|
|
|
|
#if defined(CONFIG_WATCHDOG)
|
|
extern int watchdog_init(void);
|
|
extern int watchdog_disable(void);
|
|
# define INIT_FUNC_WATCHDOG_INIT watchdog_init,
|
|
# define WATCHDOG_DISABLE watchdog_disable
|
|
#else
|
|
# define INIT_FUNC_WATCHDOG_INIT
|
|
# define WATCHDOG_DISABLE
|
|
#endif /* CONFIG_WATCHDOG */
|
|
|
|
#if defined(CONFIG_CMD_IDE)
|
|
# include <ide.h>
|
|
# define INIT_FUNC_IDE_INIT ide_init,
|
|
#else
|
|
# define INIT_FUNC_IDE_INIT
|
|
#endif /* CONFIG_CMD_IDE */
|
|
|
|
#if defined(CONFIG_PCI)
|
|
#include <pci.h>
|
|
static int sh_pci_init(void)
|
|
{
|
|
pci_init();
|
|
return 0;
|
|
}
|
|
# define INIT_FUNC_PCI_INIT sh_pci_init,
|
|
#else
|
|
# define INIT_FUNC_PCI_INIT
|
|
#endif /* CONFIG_PCI */
|
|
|
|
static int sh_mem_env_init(void)
|
|
{
|
|
mem_malloc_init();
|
|
malloc_bin_reloc();
|
|
env_relocate();
|
|
jumptable_init();
|
|
return 0;
|
|
}
|
|
|
|
#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
|
|
|
|
typedef int (init_fnc_t) (void);
|
|
|
|
init_fnc_t *init_sequence[] =
|
|
{
|
|
cpu_init, /* basic cpu dependent setup */
|
|
board_init, /* basic board dependent setup */
|
|
interrupt_init, /* set up exceptions */
|
|
env_init, /* event init */
|
|
serial_init, /* SCIF init */
|
|
INIT_FUNC_WATCHDOG_INIT /* watchdog init */
|
|
console_init_f,
|
|
display_options,
|
|
checkcpu,
|
|
checkboard, /* Check support board */
|
|
dram_init, /* SDRAM init */
|
|
timer_init, /* SuperH Timer (TCNT0 only) init */
|
|
sh_mem_env_init,
|
|
sh_flash_init, /* Flash memory(NOR) init*/
|
|
INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */
|
|
INIT_FUNC_PCI_INIT /* PCI init */
|
|
devices_init,
|
|
console_init_r,
|
|
interrupt_init,
|
|
#ifdef BOARD_LATE_INIT
|
|
board_late_init,
|
|
#endif
|
|
#if defined(CONFIG_CMD_NET)
|
|
sh_net_init, /* SH specific eth init */
|
|
#endif
|
|
NULL /* Terminate this list */
|
|
};
|
|
|
|
void sh_generic_init(void)
|
|
{
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
bd_t *bd;
|
|
init_fnc_t **init_fnc_ptr;
|
|
|
|
memset(gd, 0, CONFIG_SYS_GBL_DATA_SIZE);
|
|
|
|
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
|
|
|
|
gd->bd = (bd_t *)(gd + 1); /* At end of global data */
|
|
gd->baudrate = CONFIG_BAUDRATE;
|
|
|
|
gd->cpu_clk = CONFIG_SYS_CLK_FREQ;
|
|
|
|
bd = gd->bd;
|
|
bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
|
|
bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
|
|
bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
|
|
#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;
|
|
#endif
|
|
bd->bi_baudrate = CONFIG_BAUDRATE;
|
|
|
|
for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
|
|
WATCHDOG_RESET();
|
|
if ((*init_fnc_ptr) () != 0)
|
|
hang();
|
|
}
|
|
|
|
#ifdef CONFIG_WATCHDOG
|
|
/* disable watchdog if environment is set */
|
|
{
|
|
char *s = getenv("watchdog");
|
|
if (s != NULL)
|
|
if (strncmp(s, "off", 3) == 0)
|
|
WATCHDOG_DISABLE();
|
|
}
|
|
#endif /* CONFIG_WATCHDOG*/
|
|
|
|
|
|
#if defined(CONFIG_CMD_NET)
|
|
{
|
|
char *s;
|
|
puts("Net: ");
|
|
eth_initialize(gd->bd);
|
|
|
|
s = getenv("bootfile");
|
|
if (s != NULL)
|
|
copy_filename(BootFile, s, sizeof(BootFile));
|
|
}
|
|
#endif /* CONFIG_CMD_NET */
|
|
|
|
while (1) {
|
|
WATCHDOG_RESET();
|
|
main_loop();
|
|
}
|
|
}
|
|
|
|
/***********************************************************************/
|
|
|
|
void hang(void)
|
|
{
|
|
puts("Board ERROR\n");
|
|
for (;;)
|
|
;
|
|
}
|