rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
diff --git a/include/asm-m68k/immap_547x_8x.h b/include/asm-m68k/immap_547x_8x.h
index 54ef40f..c221936 100644
--- a/include/asm-m68k/immap_547x_8x.h
+++ b/include/asm-m68k/immap_547x_8x.h
@@ -26,36 +26,36 @@
#ifndef __IMMAP_547x_8x__
#define __IMMAP_547x_8x__
-#define MMAP_SIU (CFG_MBAR + 0x00000000)
-#define MMAP_SDRAM (CFG_MBAR + 0x00000100)
-#define MMAP_XARB (CFG_MBAR + 0x00000240)
-#define MMAP_FBCS (CFG_MBAR + 0x00000500)
-#define MMAP_INTC0 (CFG_MBAR + 0x00000700)
-#define MMAP_GPTMR (CFG_MBAR + 0x00000800)
-#define MMAP_SLT0 (CFG_MBAR + 0x00000900)
-#define MMAP_SLT1 (CFG_MBAR + 0x00000910)
-#define MMAP_GPIO (CFG_MBAR + 0x00000A00)
-#define MMAP_PCI (CFG_MBAR + 0x00000B00)
-#define MMAP_PCIARB (CFG_MBAR + 0x00000C00)
-#define MMAP_EXTDMA (CFG_MBAR + 0x00000D00)
-#define MMAP_EPORT (CFG_MBAR + 0x00000F00)
-#define MMAP_CTM (CFG_MBAR + 0x00007F00)
-#define MMAP_MCDMA (CFG_MBAR + 0x00008000)
-#define MMAP_SCPCI (CFG_MBAR + 0x00008400)
-#define MMAP_UART0 (CFG_MBAR + 0x00008600)
-#define MMAP_UART1 (CFG_MBAR + 0x00008700)
-#define MMAP_UART2 (CFG_MBAR + 0x00008800)
-#define MMAP_UART3 (CFG_MBAR + 0x00008900)
-#define MMAP_DSPI (CFG_MBAR + 0x00008A00)
-#define MMAP_I2C (CFG_MBAR + 0x00008F00)
-#define MMAP_FEC0 (CFG_MBAR + 0x00009000)
-#define MMAP_FEC1 (CFG_MBAR + 0x00009800)
-#define MMAP_CAN0 (CFG_MBAR + 0x0000A000)
-#define MMAP_CAN1 (CFG_MBAR + 0x0000A800)
-#define MMAP_USBD (CFG_MBAR + 0x0000B000)
-#define MMAP_SRAM (CFG_MBAR + 0x00010000)
-#define MMAP_SRAMCFG (CFG_MBAR + 0x0001FF00)
-#define MMAP_SEC (CFG_MBAR + 0x00020000)
+#define MMAP_SIU (CONFIG_SYS_MBAR + 0x00000000)
+#define MMAP_SDRAM (CONFIG_SYS_MBAR + 0x00000100)
+#define MMAP_XARB (CONFIG_SYS_MBAR + 0x00000240)
+#define MMAP_FBCS (CONFIG_SYS_MBAR + 0x00000500)
+#define MMAP_INTC0 (CONFIG_SYS_MBAR + 0x00000700)
+#define MMAP_GPTMR (CONFIG_SYS_MBAR + 0x00000800)
+#define MMAP_SLT0 (CONFIG_SYS_MBAR + 0x00000900)
+#define MMAP_SLT1 (CONFIG_SYS_MBAR + 0x00000910)
+#define MMAP_GPIO (CONFIG_SYS_MBAR + 0x00000A00)
+#define MMAP_PCI (CONFIG_SYS_MBAR + 0x00000B00)
+#define MMAP_PCIARB (CONFIG_SYS_MBAR + 0x00000C00)
+#define MMAP_EXTDMA (CONFIG_SYS_MBAR + 0x00000D00)
+#define MMAP_EPORT (CONFIG_SYS_MBAR + 0x00000F00)
+#define MMAP_CTM (CONFIG_SYS_MBAR + 0x00007F00)
+#define MMAP_MCDMA (CONFIG_SYS_MBAR + 0x00008000)
+#define MMAP_SCPCI (CONFIG_SYS_MBAR + 0x00008400)
+#define MMAP_UART0 (CONFIG_SYS_MBAR + 0x00008600)
+#define MMAP_UART1 (CONFIG_SYS_MBAR + 0x00008700)
+#define MMAP_UART2 (CONFIG_SYS_MBAR + 0x00008800)
+#define MMAP_UART3 (CONFIG_SYS_MBAR + 0x00008900)
+#define MMAP_DSPI (CONFIG_SYS_MBAR + 0x00008A00)
+#define MMAP_I2C (CONFIG_SYS_MBAR + 0x00008F00)
+#define MMAP_FEC0 (CONFIG_SYS_MBAR + 0x00009000)
+#define MMAP_FEC1 (CONFIG_SYS_MBAR + 0x00009800)
+#define MMAP_CAN0 (CONFIG_SYS_MBAR + 0x0000A000)
+#define MMAP_CAN1 (CONFIG_SYS_MBAR + 0x0000A800)
+#define MMAP_USBD (CONFIG_SYS_MBAR + 0x0000B000)
+#define MMAP_SRAM (CONFIG_SYS_MBAR + 0x00010000)
+#define MMAP_SRAMCFG (CONFIG_SYS_MBAR + 0x0001FF00)
+#define MMAP_SEC (CONFIG_SYS_MBAR + 0x00020000)
#include <asm/coldfire/flexbus.h>