diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /onenand_ipl/onenand_boot.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.gz u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.bz2 | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
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 */ } |