projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.denx.de/u-boot-coldfire
[platform/kernel/u-boot.git]
/
lib_m68k
/
board.c
diff --git
a/lib_m68k/board.c
b/lib_m68k/board.c
index
6aaf609
..
483c9b6
100644
(file)
--- a/
lib_m68k/board.c
+++ b/
lib_m68k/board.c
@@
-28,29
+28,28
@@
#include <watchdog.h>
#include <command.h>
#include <malloc.h>
#include <watchdog.h>
#include <command.h>
#include <malloc.h>
-#include <
devices
.h>
+#include <
stdio_dev
.h>
-#ifdef CONFIG_M5272
-#include <asm/immap_5272.h>
-#endif
+#include <asm/immap.h>
-#if
(CONFIG_COMMANDS & CF
G_CMD_IDE)
+#if
defined(CONFI
G_CMD_IDE)
#include <ide.h>
#endif
#include <ide.h>
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_SCSI)
+#if
defined(CONFI
G_CMD_SCSI)
#include <scsi.h>
#endif
#include <scsi.h>
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
#include <kgdb.h>
#endif
#ifdef CONFIG_STATUS_LED
#include <status_led.h>
#endif
#include <net.h>
#include <kgdb.h>
#endif
#ifdef CONFIG_STATUS_LED
#include <status_led.h>
#endif
#include <net.h>
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG)
+#include <serial.h>
+#if defined(CONFIG_CMD_BEDBUG)
#include <cmd_bedbug.h>
#endif
#include <cmd_bedbug.h>
#endif
-#ifdef C
FG
_ALLOC_DPRAM
+#ifdef C
ONFIG_SYS
_ALLOC_DPRAM
#include <commproc.h>
#endif
#include <version.h>
#include <commproc.h>
#endif
#include <version.h>
@@
-60,6
+59,12
@@
#include <i2c.h>
#endif
#include <i2c.h>
#endif
+#ifdef CONFIG_CMD_SPI
+#include <spi.h>
+#endif
+
+#include <nand.h>
+
DECLARE_GLOBAL_DATA_PTR;
static char *failed = "*** failed ***\n";
DECLARE_GLOBAL_DATA_PTR;
static char *failed = "*** failed ***\n";
@@
-70,12
+75,12
@@
extern flash_info_t flash_info[];
#include <environment.h>
#include <environment.h>
-#if ( ((C
FG_ENV_ADDR+CFG_ENV_SIZE) < CFG
_MONITOR_BASE) || \
- (C
FG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG
_MONITOR_LEN)) ) || \
- defined(C
F
G_ENV_IS_IN_NVRAM)
-#define TOTAL_MALLOC_LEN (C
FG_MALLOC_LEN + CF
G_ENV_SIZE)
+#if ( ((C
ONFIG_ENV_ADDR+CONFIG_ENV_SIZE) < CONFIG_SYS
_MONITOR_BASE) || \
+ (C
ONFIG_ENV_ADDR >= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS
_MONITOR_LEN)) ) || \
+ defined(C
ONFI
G_ENV_IS_IN_NVRAM)
+#define TOTAL_MALLOC_LEN (C
ONFIG_SYS_MALLOC_LEN + CONFI
G_ENV_SIZE)
#else
#else
-#define TOTAL_MALLOC_LEN C
FG
_MALLOC_LEN
+#define TOTAL_MALLOC_LEN C
ONFIG_SYS
_MALLOC_LEN
#endif
extern ulong __init_end;
#endif
extern ulong __init_end;
@@
-113,7
+118,7
@@
static ulong mem_malloc_brk = 0;
*/
static void mem_malloc_init (void)
{
*/
static void mem_malloc_init (void)
{
- ulong dest_addr = C
FG
_MONITOR_BASE + gd->reloc_off;
+ ulong dest_addr = C
ONFIG_SYS
_MONITOR_BASE + gd->reloc_off;
mem_malloc_end = dest_addr;
mem_malloc_start = dest_addr - TOTAL_MALLOC_LEN;
mem_malloc_end = dest_addr;
mem_malloc_start = dest_addr - TOTAL_MALLOC_LEN;
@@
-137,23
+142,6
@@
void *sbrk (ptrdiff_t increment)
return ((void *)old);
}
return ((void *)old);
}
-char *strmhz(char *buf, long hz)
-{
- long l, n;
- long m;
-
- n = hz / 1000000L;
-
- l = sprintf (buf, "%ld", n);
-
- m = (hz % 1000000L) / 1000L;
-
- if (m != 0)
- sprintf (buf+l, ".%03ld", m);
-
- return (buf);
-}
-
/*
* All attempts to come up with a "common" initialization sequence
* that works for all boards and architectures failed: some of the
/*
* All attempts to come up with a "common" initialization sequence
* that works for all boards and architectures failed: some of the
@@
-169,7
+157,7
@@
char *strmhz(char *buf, long hz)
typedef int (init_fnc_t) (void);
/************************************************************************
typedef int (init_fnc_t) (void);
/************************************************************************
- * Init Utilities
*
+ * Init Utilities
************************************************************************
* Some of this code should be moved into the core functions,
* but let's get it working (again) first...
************************************************************************
* Some of this code should be moved into the core functions,
* but let's get it working (again) first...
@@
-177,7
+165,7
@@
typedef int (init_fnc_t) (void);
static int init_baudrate (void)
{
static int init_baudrate (void)
{
-
uchar tmp[64];
/* long enough for environment variables */
+
char tmp[64];
/* long enough for environment variables */
int i = getenv_r ("baudrate", tmp, sizeof (tmp));
gd->baudrate = (i > 0)
int i = getenv_r ("baudrate", tmp, sizeof (tmp));
gd->baudrate = (i > 0)
@@
-207,7
+195,17
@@
static int init_func_ram (void)
static int init_func_i2c (void)
{
puts ("I2C: ");
static int init_func_i2c (void)
{
puts ("I2C: ");
- i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
+ i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+ puts ("ready\n");
+ return (0);
+}
+#endif
+
+#if defined(CONFIG_HARD_SPI)
+static int init_func_spi (void)
+{
+ puts ("SPI: ");
+ spi_init ();
puts ("ready\n");
return (0);
}
puts ("ready\n");
return (0);
}
@@
-221,6
+219,7
@@
static int init_func_i2c (void)
*/
init_fnc_t *init_sequence[] = {
*/
init_fnc_t *init_sequence[] = {
+ get_clocks,
env_init,
init_baudrate,
serial_init,
env_init,
init_baudrate,
serial_init,
@@
-231,10
+230,13
@@
init_fnc_t *init_sequence[] = {
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
init_func_i2c,
#endif
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
init_func_i2c,
#endif
+#if defined(CONFIG_HARD_SPI)
+ init_func_spi,
+#endif
init_func_ram,
init_func_ram,
-#if defined(C
FG
_DRAM_TEST)
+#if defined(C
ONFIG_SYS
_DRAM_TEST)
testdram,
testdram,
-#endif /* C
FG
_DRAM_TEST */
+#endif /* C
ONFIG_SYS
_DRAM_TEST */
INIT_FUNC_WATCHDOG_INIT
NULL, /* Terminate this list */
};
INIT_FUNC_WATCHDOG_INIT
NULL, /* Terminate this list */
};
@@
-267,11
+269,11
@@
board_init_f (ulong bootflag)
#ifdef CONFIG_PRAM
int i;
ulong reg;
#ifdef CONFIG_PRAM
int i;
ulong reg;
-
uchar tmp[64];
/* long enough for environment variables */
+
char tmp[64];
/* long enough for environment variables */
#endif
/* Pointer is writable since we allocated a register for it */
#endif
/* Pointer is writable since we allocated a register for it */
- gd = (gd_t *) (C
FG_INIT_RAM_ADDR + CFG
_GBL_DATA_OFFSET);
+ gd = (gd_t *) (C
ONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS
_GBL_DATA_OFFSET);
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory");
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory");
@@
-294,9
+296,9
@@
board_init_f (ulong bootflag)
* - monitor code
* - board info struct
*/
* - monitor code
* - board info struct
*/
- len = (ulong)&_end - C
FG
_MONITOR_BASE;
+ len = (ulong)&_end - C
ONFIG_SYS
_MONITOR_BASE;
- addr = C
FG
_SDRAM_BASE + gd->ram_size;
+ addr = C
ONFIG_SYS
_SDRAM_BASE + gd->ram_size;
#ifdef CONFIG_LOGBUFFER
/* reserve kernel log buffer */
#ifdef CONFIG_LOGBUFFER
/* reserve kernel log buffer */
@@
-314,6
+316,16
@@
board_init_f (ulong bootflag)
debug ("Reserving %ldk for protected RAM at %08lx\n", reg, addr);
#endif /* CONFIG_PRAM */
debug ("Reserving %ldk for protected RAM at %08lx\n", reg, addr);
#endif /* CONFIG_PRAM */
+ /* round down to next 4 kB limit */
+ addr &= ~(4096 - 1);
+ debug ("Top of RAM usable for U-Boot at: %08lx\n", addr);
+
+#ifdef CONFIG_LCD
+ /* reserve memory for LCD display (always full pages) */
+ addr = lcd_setmem (addr);
+ gd->fb_base = addr;
+#endif /* CONFIG_LCD */
+
/*
* reserve memory for U-Boot code, data & bss
* round down to next 4 kB limit
/*
* reserve memory for U-Boot code, data & bss
* round down to next 4 kB limit
@@
-337,18
+349,18
@@
board_init_f (ulong bootflag)
addr_sp -= sizeof (bd_t);
bd = (bd_t *) addr_sp;
gd->bd = bd;
addr_sp -= sizeof (bd_t);
bd = (bd_t *) addr_sp;
gd->bd = bd;
- debug ("Reserving %
d
Bytes for Board Info at: %08lx\n",
+ debug ("Reserving %
zu
Bytes for Board Info at: %08lx\n",
sizeof (bd_t), addr_sp);
addr_sp -= sizeof (gd_t);
id = (gd_t *) addr_sp;
sizeof (bd_t), addr_sp);
addr_sp -= sizeof (gd_t);
id = (gd_t *) addr_sp;
- debug ("Reserving %
d
Bytes for Global Data at: %08lx\n",
+ debug ("Reserving %
zu
Bytes for Global Data at: %08lx\n",
sizeof (gd_t), addr_sp);
sizeof (gd_t), addr_sp);
- /* Reserve memory for boot params. */
- addr_sp -= C
FG
_BOOTPARAMS_LEN;
+ /* Reserve memory for boot params. */
+ addr_sp -= C
ONFIG_SYS
_BOOTPARAMS_LEN;
bd->bi_boot_params = addr_sp;
debug ("Reserving %dk for boot parameters at: %08lx\n",
bd->bi_boot_params = addr_sp;
debug ("Reserving %dk for boot parameters at: %08lx\n",
- C
FG
_BOOTPARAMS_LEN >> 10, addr_sp);
+ C
ONFIG_SYS
_BOOTPARAMS_LEN >> 10, addr_sp);
/*
* Finally, we set up a new (bigger) stack.
/*
* Finally, we set up a new (bigger) stack.
@@
-369,18
+381,30
@@
board_init_f (ulong bootflag)
/*
* Save local variables to board info struct
*/
/*
* Save local variables to board info struct
*/
- bd->bi_memstart = C
FG_SDRAM_BASE;
/* start of DRAM memory */
+ bd->bi_memstart = C
ONFIG_SYS_SDRAM_BASE;
/* start of DRAM memory */
bd->bi_memsize = gd->ram_size; /* size of DRAM memory in bytes */
bd->bi_memsize = gd->ram_size; /* size of DRAM memory in bytes */
- bd->bi_mbar_base = CFG_MBAR; /* base of internal registers */
+#ifdef CONFIG_SYS_INIT_RAM_ADDR
+ bd->bi_sramstart = CONFIG_SYS_INIT_RAM_ADDR; /* start of SRAM memory */
+ bd->bi_sramsize = CONFIG_SYS_INIT_RAM_END; /* size of SRAM memory */
+#endif
+ bd->bi_mbar_base = CONFIG_SYS_MBAR; /* base of internal registers */
bd->bi_bootflags = bootflag; /* boot / reboot flag (for LynxOS) */
WATCHDOG_RESET ();
bd->bi_intfreq = gd->cpu_clk; /* Internal Freq, in Hz */
bd->bi_busfreq = gd->bus_clk; /* Bus Freq, in Hz */
bd->bi_bootflags = bootflag; /* boot / reboot flag (for LynxOS) */
WATCHDOG_RESET ();
bd->bi_intfreq = gd->cpu_clk; /* Internal Freq, in Hz */
bd->bi_busfreq = gd->bus_clk; /* Bus Freq, in Hz */
+#ifdef CONFIG_PCI
+ bd->bi_pcifreq = gd->pci_clk; /* PCI Freq in Hz */
+#endif
+#ifdef CONFIG_EXTRA_CLOCK
+ bd->bi_inpfreq = gd->inp_clk; /* input Freq in Hz */
+ bd->bi_vcofreq = gd->vco_clk; /* vco Freq in Hz */
+ bd->bi_flbfreq = gd->flb_clk; /* flexbus Freq in Hz */
+#endif
bd->bi_baudrate = gd->baudrate; /* Console Baudrate */
bd->bi_baudrate = gd->baudrate; /* Console Baudrate */
-#ifdef C
FG
_EXTBDINFO
+#ifdef C
ONFIG_SYS
_EXTBDINFO
strncpy (bd->bi_s_version, "1.2", sizeof (bd->bi_s_version));
strncpy (bd->bi_r_version, U_BOOT_VERSION, sizeof (bd->bi_r_version));
#endif
strncpy (bd->bi_s_version, "1.2", sizeof (bd->bi_s_version));
strncpy (bd->bi_r_version, U_BOOT_VERSION, sizeof (bd->bi_r_version));
#endif
@@
-396,7
+420,7
@@
board_init_f (ulong bootflag)
memcpy (id, (void *)gd, sizeof (gd_t));
memcpy (id, (void *)gd, sizeof (gd_t));
- debug ("Start relocate of code from %08x to %08lx\n", C
FG
_MONITOR_BASE, addr);
+ debug ("Start relocate of code from %08x to %08lx\n", C
ONFIG_SYS
_MONITOR_BASE, addr);
relocate_code (addr_sp, id, addr);
/* NOTREACHED - jump_to_ram() does not return */
relocate_code (addr_sp, id, addr);
/* NOTREACHED - jump_to_ram() does not return */
@@
-414,15
+438,14
@@
board_init_f (ulong bootflag)
void board_init_r (gd_t *id, ulong dest_addr)
{
cmd_tbl_t *cmdtp;
void board_init_r (gd_t *id, ulong dest_addr)
{
cmd_tbl_t *cmdtp;
- char *s
, *e
;
+ char *s;
bd_t *bd;
bd_t *bd;
- int i;
extern void malloc_bin_reloc (void);
extern void malloc_bin_reloc (void);
-#ifndef C
F
G_ENV_IS_NOWHERE
+#ifndef C
ONFI
G_ENV_IS_NOWHERE
extern char * env_name_spec;
#endif
extern char * env_name_spec;
#endif
-#ifndef C
FG
_NO_FLASH
+#ifndef C
ONFIG_SYS
_NO_FLASH
ulong flash_size;
#endif
gd = id; /* initialize RAM version of global data */
ulong flash_size;
#endif
gd = id; /* initialize RAM version of global data */
@@
-430,11
+453,15
@@
void board_init_r (gd_t *id, ulong dest_addr)
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
+#ifdef CONFIG_SERIAL_MULTI
+ serial_initialize();
+#endif
+
debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr);
WATCHDOG_RESET ();
debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr);
WATCHDOG_RESET ();
- gd->reloc_off = dest_addr - C
FG
_MONITOR_BASE;
+ gd->reloc_off = dest_addr - C
ONFIG_SYS
_MONITOR_BASE;
monitor_flash_len = (ulong)&__init_end - dest_addr;
monitor_flash_len = (ulong)&__init_end - dest_addr;
@@
-458,7
+485,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
addr = (ulong)(cmdtp->usage) + gd->reloc_off;
cmdtp->usage = (char *)addr;
}
addr = (ulong)(cmdtp->usage) + gd->reloc_off;
cmdtp->usage = (char *)addr;
}
-#ifdef C
FG
_LONGHELP
+#ifdef C
ONFIG_SYS
_LONGHELP
if (cmdtp->help) {
addr = (ulong)(cmdtp->help) + gd->reloc_off;
cmdtp->help = (char *)addr;
if (cmdtp->help) {
addr = (ulong)(cmdtp->help) + gd->reloc_off;
cmdtp->help = (char *)addr;
@@
-466,7
+493,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
#endif
}
/* there are some other pointer constants we must deal with */
#endif
}
/* there are some other pointer constants we must deal with */
-#ifndef C
F
G_ENV_IS_NOWHERE
+#ifndef C
ONFI
G_ENV_IS_NOWHERE
env_name_spec += gd->reloc_off;
#endif
env_name_spec += gd->reloc_off;
#endif
@@
-489,13
+516,17
@@
void board_init_r (gd_t *id, ulong dest_addr)
/*
* Setup trap handlers
*/
/*
* Setup trap handlers
*/
- trap_init (0);
+ trap_init (CONFIG_SYS_SDRAM_BASE);
+
+ /* initialize malloc() area */
+ mem_malloc_init ();
+ malloc_bin_reloc ();
-#if !defined(C
FG
_NO_FLASH)
+#if !defined(C
ONFIG_SYS
_NO_FLASH)
puts ("FLASH: ");
if ((flash_size = flash_init ()) > 0) {
puts ("FLASH: ");
if ((flash_size = flash_init ()) > 0) {
-# ifdef C
FG
_FLASH_CHECKSUM
+# ifdef C
ONFIG_SYS
_FLASH_CHECKSUM
print_size (flash_size, "");
/*
* Compute and print flash CRC if flashchecksum is set to 'y'
print_size (flash_size, "");
/*
* Compute and print flash CRC if flashchecksum is set to 'y'
@@
-504,29
+535,29
@@
void board_init_r (gd_t *id, ulong dest_addr)
*/
s = getenv ("flashchecksum");
if (s && (*s == 'y')) {
*/
s = getenv ("flashchecksum");
if (s && (*s == 'y')) {
- printf (" CRC: %08
l
X",
+ printf (" CRC: %08X",
crc32 (0,
crc32 (0,
- (const unsigned char *) C
FG
_FLASH_BASE,
+ (const unsigned char *) C
ONFIG_SYS
_FLASH_BASE,
flash_size)
);
}
putc ('\n');
flash_size)
);
}
putc ('\n');
-# else /* !C
FG
_FLASH_CHECKSUM */
+# else /* !C
ONFIG_SYS
_FLASH_CHECKSUM */
print_size (flash_size, "\n");
print_size (flash_size, "\n");
-# endif /* C
FG
_FLASH_CHECKSUM */
+# endif /* C
ONFIG_SYS
_FLASH_CHECKSUM */
} else {
puts (failed);
hang ();
}
} else {
puts (failed);
hang ();
}
- bd->bi_flashstart = C
FG_FLASH_BASE;
/* update start of FLASH memory */
+ bd->bi_flashstart = C
ONFIG_SYS_FLASH_BASE;
/* update start of FLASH memory */
bd->bi_flashsize = flash_size; /* size of FLASH memory (final value) */
bd->bi_flashoffset = 0;
bd->bi_flashsize = flash_size; /* size of FLASH memory (final value) */
bd->bi_flashoffset = 0;
-#else /* C
FG
_NO_FLASH */
+#else /* C
ONFIG_SYS
_NO_FLASH */
bd->bi_flashsize = 0;
bd->bi_flashstart = 0;
bd->bi_flashoffset = 0;
bd->bi_flashsize = 0;
bd->bi_flashstart = 0;
bd->bi_flashoffset = 0;
-#endif /* !C
FG
_NO_FLASH */
+#endif /* !C
ONFIG_SYS
_NO_FLASH */
WATCHDOG_RESET ();
WATCHDOG_RESET ();
@@
-535,12
+566,8
@@
void board_init_r (gd_t *id, ulong dest_addr)
WATCHDOG_RESET ();
WATCHDOG_RESET ();
- /* initialize malloc() area */
- mem_malloc_init ();
- malloc_bin_reloc ();
-
#ifdef CONFIG_SPI
#ifdef CONFIG_SPI
-# if !defined(C
F
G_ENV_IS_IN_EEPROM)
+# if !defined(C
ONFI
G_ENV_IS_IN_EEPROM)
spi_init_f ();
# endif
spi_init_r ();
spi_init_f ();
# endif
spi_init_r ();
@@
-556,22
+583,20
@@
void board_init_r (gd_t *id, ulong dest_addr)
* where had to use getenv_r(), which can be pretty slow when
* the environment is in EEPROM.
*/
* where had to use getenv_r(), which can be pretty slow when
* the environment is in EEPROM.
*/
- s = getenv ("ethaddr");
- for (i = 0; i < 6; ++i) {
- bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
- if (s)
- s = (*e) ? e + 1 : e;
- }
-
- /* IP Address */
bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
WATCHDOG_RESET ();
bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
WATCHDOG_RESET ();
+#if defined(CONFIG_PCI)
+ /*
+ * Do pci configuration
+ */
+ pci_init ();
+#endif
/** leave this here (after malloc(), environment and PCI are working) **/
/** leave this here (after malloc(), environment and PCI are working) **/
- /* Initialize devices */
-
devices
_init ();
+ /* Initialize
stdio
devices */
+
stdio
_init ();
/* Initialize the jump table for applications */
jumptable_init ();
/* Initialize the jump table for applications */
jumptable_init ();
@@
-584,7
+609,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
misc_init_r ();
#endif
misc_init_r ();
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
WATCHDOG_RESET ();
puts ("KGDB: ");
kgdb_init ();
WATCHDOG_RESET ();
puts ("KGDB: ");
kgdb_init ();
@@
-620,35
+645,54
@@
void board_init_r (gd_t *id, ulong dest_addr)
if ((s = getenv ("loadaddr")) != NULL) {
load_addr = simple_strtoul (s, NULL, 16);
}
if ((s = getenv ("loadaddr")) != NULL) {
load_addr = simple_strtoul (s, NULL, 16);
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if
defined(CONFI
G_CMD_NET)
if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile));
}
if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile));
}
-#endif
/* CFG_CMD_NET */
+#endif
WATCHDOG_RESET ();
WATCHDOG_RESET ();
-#if
(CONFIG_COMMANDS & CF
G_CMD_DOC)
+#if
defined(CONFI
G_CMD_DOC)
WATCHDOG_RESET ();
puts ("DOC: ");
doc_init ();
#endif
WATCHDOG_RESET ();
puts ("DOC: ");
doc_init ();
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
WATCHDOG_RESET ();
puts ("NAND: ");
nand_init(); /* go init the NAND */
#endif
WATCHDOG_RESET ();
puts ("NAND: ");
nand_init(); /* go init the NAND */
#endif
-#if
(CONFIG_COMMANDS & CFG_CMD_NET) && defined(FEC_E
NET)
+#if
defined(CONFIG_CMD_
NET)
WATCHDOG_RESET();
WATCHDOG_RESET();
+#if defined(FEC_ENET)
eth_init(bd);
#endif
eth_init(bd);
#endif
+#if defined(CONFIG_NET_MULTI)
+ puts ("Net: ");
+ eth_initialize (bd);
+#endif
+#endif
#ifdef CONFIG_POST
post_run (NULL, POST_RAM | post_bootmode_get(0));
#endif
#ifdef CONFIG_POST
post_run (NULL, POST_RAM | post_bootmode_get(0));
#endif
+#if defined(CONFIG_CMD_PCMCIA) \
+ && !defined(CONFIG_CMD_IDE)
+ WATCHDOG_RESET ();
+ puts ("PCMCIA:");
+ pcmcia_init ();
+#endif
+
+#if defined(CONFIG_CMD_IDE)
+ WATCHDOG_RESET ();
+ puts ("IDE: ");
+ ide_init ();
+#endif
+
#ifdef CONFIG_LAST_STAGE_INIT
WATCHDOG_RESET ();
/*
#ifdef CONFIG_LAST_STAGE_INIT
WATCHDOG_RESET ();
/*
@@
-659,7
+703,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
last_stage_init ();
#endif
last_stage_init ();
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_BEDBUG)
+#if
defined(CONFI
G_CMD_BEDBUG)
WATCHDOG_RESET ();
bedbug_init ();
#endif
WATCHDOG_RESET ();
bedbug_init ();
#endif
@@
-671,7
+715,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
*/
{
ulong pram;
*/
{
ulong pram;
-
u
char memsz[32];
+ char memsz[32];
#ifdef CONFIG_PRAM
char *s;
#ifdef CONFIG_PRAM
char *s;