commit 03836942b412415379651f656e7d33fe02e408de
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Thu Oct 16 15:01:15 2008 +0200
committer Wolfgang Denk <wd@denx.de> Sat Oct 18 21:54:03 2008 +0200
tree ae13958ffa9c6b58c2ea97aac07a4ad2f04a350f
parent 8aee9358b0c08cfcf6c070318beac1e409b88a73

rename CFG_ macros to CONFIG_SYS

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

onenand_ipl/board/apollon/apollon.c

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 @@
 	return 0;
 }
 
-#ifdef CFG_PRINTF
+#ifdef CONFIG_SYS_PRINTF
 /* Pin Muxing registers used for UART1 */
 /****************************************
  * Routine: muxSetupUART1  (ostboot)
@@ -63,7 +63,7 @@
  **********************************************************/
 int s_init(int skip)
 {
-#ifdef CFG_PRINTF
+#ifdef CONFIG_SYS_PRINTF
 	muxSetupUART1();
 #endif
 	return 0;

onenand_ipl/onenand_boot.c

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 @@
 
 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 @@
 			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 */
 }

onenand_ipl/onenand_ipl.h

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))

onenand_ipl/onenand_read.c

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 @@
 #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;