summaryrefslogtreecommitdiff
path: root/onenand_ipl/board/apollon
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-10-21 11:43:08 +0200
committerStefan Roese <sr@denx.de>2008-10-21 11:43:08 +0200
commitf61f1e150c84f5b9347fca79a4bc5f2286c545d2 (patch)
treeab90f076f18e56b2b3e8c9375b95917daa78c1d9 /onenand_ipl/board/apollon
parentec081c2c190148b374e86a795fb6b1c49caeb549 (diff)
parentf82642e33899766892499b163e60560fbbf87773 (diff)
downloadu-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.zip
u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.gz
u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.bz2
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'onenand_ipl/board/apollon')
-rw-r--r--onenand_ipl/board/apollon/apollon.c4
1 files changed, 2 insertions, 2 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;