diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /onenand_ipl/onenand_boot.c | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'onenand_ipl/onenand_boot.c')
| -rw-r--r-- | onenand_ipl/onenand_boot.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/onenand_ipl/onenand_boot.c b/onenand_ipl/onenand_boot.c index 35668ac..aff62d2 100644 --- a/onenand_ipl/onenand_boot.c +++ b/onenand_ipl/onenand_boot.c @@ -28,7 +28,7 @@ #include "onenand_ipl.h" -#ifdef CFG_PRINTF +#ifdef CONFIG_SYS_PRINTF int print_info(void) { printf(XLOADER_VERSION); @@ -41,7 +41,7 @@ typedef int (init_fnc_t)(void); init_fnc_t *init_sequence[] = { board_init, /* basic board dependent setup */ -#ifdef CFG_PRINTF +#ifdef CONFIG_SYS_PRINTF serial_init, /* serial communications setup */ print_info, #endif @@ -58,17 +58,17 @@ void start_oneboot(void) hang(); } - buf = (uchar *) CFG_LOAD_ADDR; + buf = (uchar *) CONFIG_SYS_LOAD_ADDR; if (!onenand_read_block0(buf)) buf += ONENAND_BLOCK_SIZE; - if (buf == (uchar *)CFG_LOAD_ADDR) + if (buf == (uchar *)CONFIG_SYS_LOAD_ADDR) hang(); /* go run U-Boot and never return */ printf("Starting OS Bootloader...\n"); - ((init_fnc_t *)CFG_LOAD_ADDR)(); + ((init_fnc_t *)CONFIG_SYS_LOAD_ADDR)(); /* should never come here */ } |