4 files changed, 10 insertions, 10 deletions
diff --git a/onenand_ipl/board/apollon/apollon.c b/onenand_ipl/board/apollon/apollon.c
index acf5c2998..4936e00f1 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 35668ac84..aff62d29b 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 9188b9662..3387998a9 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 669b1ef5f..6d04943ba 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;