diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:01:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:01:23 +0200 |
| commit | abfbbad1eb897c58d2ebc918a8b91cf1ea226c5f (patch) | |
| tree | dd9ea8d7369c4c8e8c04da9725b3eb437980db30 /arch/arm/lib/board.c | |
| parent | 11a0b5a0dd5f092777de41db00f3ffa8a95d698c (diff) | |
| download | barebox-abfbbad1eb897c58d2ebc918a8b91cf1ea226c5f.tar.gz barebox-abfbbad1eb897c58d2ebc918a8b91cf1ea226c5f.tar.xz | |
svn_rev_109
do not know anymore
Diffstat (limited to 'arch/arm/lib/board.c')
| -rw-r--r-- | arch/arm/lib/board.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 5aaa7260af..e930a82608 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -44,6 +44,9 @@ #include <devices.h> #include <version.h> #include <net.h> +#include <cfi_flash.h> + +ulong load_addr = CFG_LOAD_ADDR; /* Default Load Address */ DECLARE_GLOBAL_DATA_PTR; @@ -185,6 +188,8 @@ static void display_flash_config (ulong size) */ typedef int (init_fnc_t) (void); +extern int mem_init(void); + int print_cpuinfo (void); /* test-only */ init_fnc_t *init_sequence[] = { @@ -195,6 +200,12 @@ init_fnc_t *init_sequence[] = { init_baudrate, /* initialze baudrate settings */ serial_init, /* serial communications setup */ console_init_f, /* stage 1 init of console */ +#ifdef CONFIG_DRIVER_CFI + flash_init, +#endif +#ifdef CONFIG_CMD_MEMORY + mem_init, +#endif display_banner, /* say that we are here */ #if defined(CONFIG_DISPLAY_CPUINFO) print_cpuinfo, /* display cpu info (and speed) */ @@ -237,8 +248,7 @@ void start_armboot (void) #ifndef CFG_NO_FLASH /* configure available FLASH banks */ - size = flash_init (); - display_flash_config (size); +// display_flash_config (size); #endif /* CFG_NO_FLASH */ #ifdef CONFIG_VFD @@ -283,12 +293,8 @@ void start_armboot (void) drv_vfd_init(); #endif /* CONFIG_VFD */ - devices_init (); /* get the devices list going. */ - jumptable_init (); - console_init_r (); /* fully init console as a device */ - #if defined(CONFIG_MISC_INIT_R) /* miscellaneous platform dependent initialisations */ misc_init_r (); |