projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: Remove -fno-strict-aliasing
[oweals/u-boot.git]
/
onenand_ipl
/
onenand_boot.c
diff --git
a/onenand_ipl/onenand_boot.c
b/onenand_ipl/onenand_boot.c
index aff62d29bb7d6d23fb36e895775b5c5c42e1c003..63995ce504e40bd289ae19945c6d9c7c19fa1d7c 100644
(file)
--- a/
onenand_ipl/onenand_boot.c
+++ b/
onenand_ipl/onenand_boot.c
@@
-28,46
+28,16
@@
#include "onenand_ipl.h"
#include "onenand_ipl.h"
-#ifdef CONFIG_SYS_PRINTF
-int print_info(void)
-{
- printf(XLOADER_VERSION);
-
- return 0;
-}
-#endif
-
typedef int (init_fnc_t)(void);
typedef int (init_fnc_t)(void);
-init_fnc_t *init_sequence[] = {
- board_init, /* basic board dependent setup */
-#ifdef CONFIG_SYS_PRINTF
- serial_init, /* serial communications setup */
- print_info,
-#endif
- NULL,
-};
-
void start_oneboot(void)
{
void start_oneboot(void)
{
- init_fnc_t **init_fnc_ptr;
uchar *buf;
uchar *buf;
- for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
- if ((*init_fnc_ptr)() != 0)
- hang();
- }
-
buf = (uchar *) CONFIG_SYS_LOAD_ADDR;
buf = (uchar *) CONFIG_SYS_LOAD_ADDR;
- if (!onenand_read_block0(buf))
- buf += ONENAND_BLOCK_SIZE;
-
- if (buf == (uchar *)CONFIG_SYS_LOAD_ADDR)
- hang();
+ onenand_read_block(buf);
- /* go run U-Boot and never return */
- printf("Starting OS Bootloader...\n");
((init_fnc_t *)CONFIG_SYS_LOAD_ADDR)();
/* should never come here */
((init_fnc_t *)CONFIG_SYS_LOAD_ADDR)();
/* should never come here */
@@
-75,7
+45,5
@@
void start_oneboot(void)
void hang(void)
{
void hang(void)
{
- /* if board_hang() returns, hange here */
- printf("X-Loader hangs\n");
- for (;;);
+ for (;;);
}
}