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 | |
| 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')
| -rw-r--r-- | onenand_ipl/board/apollon/apollon.c | 4 | ||||
| -rw-r--r-- | onenand_ipl/onenand_boot.c | 10 | ||||
| -rw-r--r-- | onenand_ipl/onenand_ipl.h | 4 | ||||
| -rw-r--r-- | onenand_ipl/onenand_read.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/onenand_ipl/board/apollon/apollon.c b/onenand_ipl/board/apollon/apollon.c index acf5c29..4936e00 100644 --- a/onenand_ipl/board/apollon/apollon.c +++ b/onenand_ipl/board/apollon/apollon.c @@ -37,7 +37,7 @@ int board_init(void) return 0; } -#ifdef CFG_PRINTF +#ifdef CONFIG_SYS_PRINTF /* Pin Muxing registers used for UART1 */ /**************************************** * Routine: muxSetupUART1 (ostboot) @@ -63,7 +63,7 @@ static void muxSetupUART1(void) **********************************************************/ int s_init(int skip) { -#ifdef CFG_PRINTF +#ifdef CONFIG_SYS_PRINTF muxSetupUART1(); #endif return 0; 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 */ } diff --git a/onenand_ipl/onenand_ipl.h b/onenand_ipl/onenand_ipl.h index 9188b96..3387998 100644 --- a/onenand_ipl/onenand_ipl.h +++ b/onenand_ipl/onenand_ipl.h @@ -25,14 +25,14 @@ #define ONENAND_BLOCK_SIZE 2048 -#ifndef CFG_PRINTF +#ifndef CONFIG_SYS_PRINTF #define printf(format, args...) #endif #define onenand_readw(a) readw(a) #define onenand_writew(v, a) writew(v, a) -#define THIS_ONENAND(a) (CFG_ONENAND_BASE + (a)) +#define THIS_ONENAND(a) (CONFIG_SYS_ONENAND_BASE + (a)) #define READ_INTERRUPT() \ onenand_readw(THIS_ONENAND(ONENAND_REG_INTERRUPT)) diff --git a/onenand_ipl/onenand_read.c b/onenand_ipl/onenand_read.c index 669b1ef..6d04943 100644 --- a/onenand_ipl/onenand_read.c +++ b/onenand_ipl/onenand_read.c @@ -67,7 +67,7 @@ static inline int onenand_read_page(ulong block, ulong page, #ifndef __HAVE_ARCH_MEMCPY32 p = (unsigned long *) buf; #endif - base = (unsigned long *) (CFG_ONENAND_BASE + ONENAND_DATARAM); + base = (unsigned long *) (CONFIG_SYS_ONENAND_BASE + ONENAND_DATARAM); while (!(READ_INTERRUPT() & ONENAND_INT_READ)) continue; |