rename CFG_ macros to CONFIG_SYS

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

1 files changed, 97 insertions, 97 deletions

diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 482136e..28bf0ad 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -39,9 +39,9 @@
 #define CONFIG_M5485		/* define processor type */
 
 #define CONFIG_MCFUART
-#define CFG_UART_PORT		(0)
+#define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CFG_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
@@ -72,27 +72,27 @@
 #	define CONFIG_MII_INIT		1
 #	define CONFIG_HAS_ETH1
 
-#	define CFG_DMA_USE_INTSRAM	1
-#	define CFG_DISCOVER_PHY
-#	define CFG_RX_ETH_BUFFER	32
-#	define CFG_TX_ETH_BUFFER	48
-#	define CFG_FAULT_ECHO_LINK_DOWN
+#	define CONFIG_SYS_DMA_USE_INTSRAM	1
+#	define CONFIG_SYS_DISCOVER_PHY
+#	define CONFIG_SYS_RX_ETH_BUFFER	32
+#	define CONFIG_SYS_TX_ETH_BUFFER	48
+#	define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 
-#	define CFG_FEC0_PINMUX		0
-#	define CFG_FEC0_MIIBASE		CFG_FEC0_IOBASE
-#	define CFG_FEC1_PINMUX		0
-#	define CFG_FEC1_MIIBASE		CFG_FEC0_IOBASE
+#	define CONFIG_SYS_FEC0_PINMUX		0
+#	define CONFIG_SYS_FEC0_MIIBASE		CONFIG_SYS_FEC0_IOBASE
+#	define CONFIG_SYS_FEC1_PINMUX		0
+#	define CONFIG_SYS_FEC1_MIIBASE		CONFIG_SYS_FEC0_IOBASE
 
 #	define MCFFEC_TOUT_LOOP		50000
-/* If CFG_DISCOVER_PHY is not defined - hardcoded */
-#	ifndef CFG_DISCOVER_PHY
+/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
+#	ifndef CONFIG_SYS_DISCOVER_PHY
 #		define FECDUPLEX	FULL
 #		define FECSPEED		_100BASET
 #	else
-#		ifndef CFG_FAULT_ECHO_LINK_DOWN
-#			define CFG_FAULT_ECHO_LINK_DOWN
+#		ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN
+#			define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 #		endif
-#	endif			/* CFG_DISCOVER_PHY */
+#	endif			/* CONFIG_SYS_DISCOVER_PHY */
 
 #	define CONFIG_ETHADDR	00:e0:0c:bc:e5:60
 #	define CONFIG_ETH1ADDR	00:e0:0c:bc:e5:61
@@ -112,20 +112,20 @@
 #		define CONFIG_CMD_PCI
 #	endif
 /*#	define CONFIG_PCI_OHCI*/
-#	define CFG_USB_OHCI_REGS_BASE		0x80041000
-#	define CFG_USB_OHCI_MAX_ROOT_PORTS	15
-#	define CFG_USB_OHCI_SLOT_NAME		"isp1561"
-#	define CFG_OHCI_SWAP_REG_ACCESS
+#	define CONFIG_SYS_USB_OHCI_REGS_BASE		0x80041000
+#	define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15
+#	define CONFIG_SYS_USB_OHCI_SLOT_NAME		"isp1561"
+#	define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 #endif
 
 /* I2C */
 #define CONFIG_FSL_I2C
 #define CONFIG_HARD_I2C		/* I2C with hw support */
 #undef CONFIG_SOFT_I2C		/* I2C bit-banged */
-#define CFG_I2C_SPEED		80000
-#define CFG_I2C_SLAVE		0x7F
-#define CFG_I2C_OFFSET		0x00008F00
-#define CFG_IMMR		CFG_MBAR
+#define CONFIG_SYS_I2C_SPEED		80000
+#define CONFIG_SYS_I2C_SLAVE		0x7F
+#define CONFIG_SYS_I2C_OFFSET		0x00008F00
+#define CONFIG_SYS_IMMR		CONFIG_SYS_MBAR
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
@@ -133,17 +133,17 @@
 #define CONFIG_PCI_PNP		1
 #define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE	1
 
-#define CFG_PCI_MEM_BUS		0x80000000
-#define CFG_PCI_MEM_PHYS	CFG_PCI_MEM_BUS
-#define CFG_PCI_MEM_SIZE	0x10000000
+#define CONFIG_SYS_PCI_MEM_BUS		0x80000000
+#define CONFIG_SYS_PCI_MEM_PHYS	CONFIG_SYS_PCI_MEM_BUS
+#define CONFIG_SYS_PCI_MEM_SIZE	0x10000000
 
-#define CFG_PCI_IO_BUS		0x71000000
-#define CFG_PCI_IO_PHYS		CFG_PCI_IO_BUS
-#define CFG_PCI_IO_SIZE		0x01000000
+#define CONFIG_SYS_PCI_IO_BUS		0x71000000
+#define CONFIG_SYS_PCI_IO_PHYS		CONFIG_SYS_PCI_IO_BUS
+#define CONFIG_SYS_PCI_IO_SIZE		0x01000000
 
-#define CFG_PCI_CFG_BUS		0x70000000
-#define CFG_PCI_CFG_PHYS	CFG_PCI_CFG_BUS
-#define CFG_PCI_CFG_SIZE	0x01000000
+#define CONFIG_SYS_PCI_CFG_BUS		0x70000000
+#define CONFIG_SYS_PCI_CFG_PHYS	CONFIG_SYS_PCI_CFG_BUS
+#define CONFIG_SYS_PCI_CFG_SIZE	0x01000000
 #endif
 
 #define CONFIG_BOOTDELAY	1	/* autoboot after 5 seconds */
@@ -163,29 +163,29 @@
 	""
 
 #define CONFIG_PRAM		512	/* 512 KB */
-#define CFG_PROMPT		"-> "
-#define CFG_LONGHELP		/* undef to save memory */
+#define CONFIG_SYS_PROMPT		"-> "
+#define CONFIG_SYS_LONGHELP		/* undef to save memory */
 
 #ifdef CONFIG_CMD_KGDB
-#	define CFG_CBSIZE	1024	/* Console I/O Buffer Size */
+#	define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
 #else
-#	define CFG_CBSIZE	256	/* Console I/O Buffer Size */
+#	define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 #endif
 
-#define CFG_PBSIZE		(CFG_CBSIZE+sizeof(CFG_PROMPT)+16)	/* Print Buffer Size */
-#define CFG_MAXARGS		16	/* max number of command args */
-#define CFG_BARGSIZE		CFG_CBSIZE	/* Boot Argument Buffer Size    */
-#define CFG_LOAD_ADDR		0x00010000
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)	/* Print Buffer Size */
+#define CONFIG_SYS_MAXARGS		16	/* max number of command args */
+#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size    */
+#define CONFIG_SYS_LOAD_ADDR		0x00010000
 
-#define CFG_HZ			1000
-#define CFG_CLK			CFG_BUSCLK
-#define CFG_CPU_CLK		CFG_CLK * 2
+#define CONFIG_SYS_HZ			1000
+#define CONFIG_SYS_CLK			CONFIG_SYS_BUSCLK
+#define CONFIG_SYS_CPU_CLK		CONFIG_SYS_CLK * 2
 
-#define CFG_MBAR		0xF0000000
-#define CFG_INTSRAM		(CFG_MBAR + 0x10000)
-#define CFG_INTSRAMSZ		0x8000
+#define CONFIG_SYS_MBAR		0xF0000000
+#define CONFIG_SYS_INTSRAM		(CONFIG_SYS_MBAR + 0x10000)
+#define CONFIG_SYS_INTSRAMSZ		0x8000
 
-/*#define CFG_LATCH_ADDR		(CFG_CS1_BASE + 0x80000)*/
+/*#define CONFIG_SYS_LATCH_ADDR		(CONFIG_SYS_CS1_BASE + 0x80000)*/
 
 /*
  * Low Level Configuration Settings
@@ -195,68 +195,68 @@
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CFG_INIT_RAM_ADDR	0xF2000000
-#define CFG_INIT_RAM_END	0x1000	/* End of used area in internal SRAM */
-#define CFG_INIT_RAM_CTRL	0x21
-#define CFG_INIT_RAM1_ADDR	(CFG_INIT_RAM_ADDR + CFG_INIT_RAM_END)
-#define CFG_INIT_RAM1_END	0x1000	/* End of used area in internal SRAM */
-#define CFG_INIT_RAM1_CTRL	0x21
-#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
-#define CFG_GBL_DATA_OFFSET	((CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) - 0x10)
-#define CFG_INIT_SP_OFFSET	CFG_GBL_DATA_OFFSET
+#define CONFIG_SYS_INIT_RAM_ADDR	0xF2000000
+#define CONFIG_SYS_INIT_RAM_END	0x1000	/* End of used area in internal SRAM */
+#define CONFIG_SYS_INIT_RAM_CTRL	0x21
+#define CONFIG_SYS_INIT_RAM1_ADDR	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_END)
+#define CONFIG_SYS_INIT_RAM1_END	0x1000	/* End of used area in internal SRAM */
+#define CONFIG_SYS_INIT_RAM1_CTRL	0x21
+#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
+#define CONFIG_SYS_GBL_DATA_OFFSET	((CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) - 0x10)
+#define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET
 
 /*-----------------------------------------------------------------------
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
- * Please note that CFG_SDRAM_BASE _must_ start at 0
+ * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
-#define CFG_SDRAM_BASE		0x00000000
-#define CFG_SDRAM_CFG1		0x73711630
-#define CFG_SDRAM_CFG2		0x46770000
-#define CFG_SDRAM_CTRL		0xE10B0000
-#define CFG_SDRAM_EMOD		0x40010000
-#define CFG_SDRAM_MODE		0x018D0000
-#define CFG_SDRAM_DRVSTRENGTH	0x000002AA
-#ifdef CFG_DRAMSZ1
-#	define CFG_SDRAM_SIZE	(CFG_DRAMSZ + CFG_DRAMSZ1)
+#define CONFIG_SYS_SDRAM_BASE		0x00000000
+#define CONFIG_SYS_SDRAM_CFG1		0x73711630
+#define CONFIG_SYS_SDRAM_CFG2		0x46770000
+#define CONFIG_SYS_SDRAM_CTRL		0xE10B0000
+#define CONFIG_SYS_SDRAM_EMOD		0x40010000
+#define CONFIG_SYS_SDRAM_MODE		0x018D0000
+#define CONFIG_SYS_SDRAM_DRVSTRENGTH	0x000002AA
+#ifdef CONFIG_SYS_DRAMSZ1
+#	define CONFIG_SYS_SDRAM_SIZE	(CONFIG_SYS_DRAMSZ + CONFIG_SYS_DRAMSZ1)
 #else
-#	define CFG_SDRAM_SIZE	CFG_DRAMSZ
+#	define CONFIG_SYS_SDRAM_SIZE	CONFIG_SYS_DRAMSZ
 #endif
 
-#define CFG_MEMTEST_START	CFG_SDRAM_BASE + 0x400
-#define CFG_MEMTEST_END		((CFG_SDRAM_SIZE - 3) << 20)
+#define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE + 0x400
+#define CONFIG_SYS_MEMTEST_END		((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
 
-#define CFG_MONITOR_BASE	(CFG_FLASH_BASE + 0x400)
-#define CFG_MONITOR_LEN		(256 << 10)	/* Reserve 256 kB for Monitor */
+#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_FLASH_BASE + 0x400)
+#define CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* Reserve 256 kB for Monitor */
 
-#define CFG_BOOTPARAMS_LEN	64*1024
-#define CFG_MALLOC_LEN		(128 << 10)	/* Reserve 128 kB for malloc() */
+#define CONFIG_SYS_BOOTPARAMS_LEN	64*1024
+#define CONFIG_SYS_MALLOC_LEN		(128 << 10)	/* Reserve 128 kB for malloc() */
 
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization ??
  */
-#define CFG_BOOTMAPSZ		(CFG_SDRAM_BASE + (CFG_SDRAM_SIZE << 20))
+#define CONFIG_SYS_BOOTMAPSZ		(CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
-#define CFG_FLASH_CFI
-#ifdef CFG_FLASH_CFI
-#	define CFG_FLASH_BASE		(CFG_CS0_BASE)
+#define CONFIG_SYS_FLASH_CFI
+#ifdef CONFIG_SYS_FLASH_CFI
+#	define CONFIG_SYS_FLASH_BASE		(CONFIG_SYS_CS0_BASE)
 #	define CONFIG_FLASH_CFI_DRIVER	1
-#	define CFG_FLASH_CFI_WIDTH	FLASH_CFI_16BIT
-#	define CFG_MAX_FLASH_SECT	137	/* max number of sectors on one chip */
-#	define CFG_FLASH_PROTECTION	/* "Real" (hardware) sectors protection */
-#	define CFG_FLASH_USE_BUFFER_WRITE
-#ifdef CFG_NOR1SZ
-#	define CFG_MAX_FLASH_BANKS	2	/* max number of memory banks */
-#	define CFG_FLASH_SIZE		((CFG_NOR1SZ + CFG_BOOTSZ) << 20)
-#	define CFG_FLASH_BANKS_LIST	{ CFG_CS0_BASE, CFG_CS1_BASE }
+#	define CONFIG_SYS_FLASH_CFI_WIDTH	FLASH_CFI_16BIT
+#	define CONFIG_SYS_MAX_FLASH_SECT	137	/* max number of sectors on one chip */
+#	define CONFIG_SYS_FLASH_PROTECTION	/* "Real" (hardware) sectors protection */
+#	define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
+#ifdef CONFIG_SYS_NOR1SZ
+#	define CONFIG_SYS_MAX_FLASH_BANKS	2	/* max number of memory banks */
+#	define CONFIG_SYS_FLASH_SIZE		((CONFIG_SYS_NOR1SZ + CONFIG_SYS_BOOTSZ) << 20)
+#	define CONFIG_SYS_FLASH_BANKS_LIST	{ CONFIG_SYS_CS0_BASE, CONFIG_SYS_CS1_BASE }
 #else
-#	define CFG_MAX_FLASH_BANKS	1	/* max number of memory banks */
-#	define CFG_FLASH_SIZE		(CFG_BOOTSZ << 20)
+#	define CONFIG_SYS_MAX_FLASH_BANKS	1	/* max number of memory banks */
+#	define CONFIG_SYS_FLASH_SIZE		(CONFIG_SYS_BOOTSZ << 20)
 #endif
 #endif
 
@@ -271,7 +271,7 @@
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
-#define CFG_CACHELINE_SIZE	16
+#define CONFIG_SYS_CACHELINE_SIZE	16
 
 /*-----------------------------------------------------------------------
  * Chipselect bank definitions
@@ -284,14 +284,14 @@
  * CS4 - Available
  * CS5 - Available
  */
-#define CFG_CS0_BASE		0xFF800000
-#define CFG_CS0_MASK		(((CFG_BOOTSZ << 20) - 1) & 0xFFFF0001)
-#define CFG_CS0_CTRL		0x00101980
-
-#ifdef CFG_NOR1SZ
-#define CFG_CS1_BASE		0xE0000000
-#define CFG_CS1_MASK		(((CFG_NOR1SZ << 20) - 1) & 0xFFFF0001)
-#define CFG_CS1_CTRL		0x00101D80
+#define CONFIG_SYS_CS0_BASE		0xFF800000
+#define CONFIG_SYS_CS0_MASK		(((CONFIG_SYS_BOOTSZ << 20) - 1) & 0xFFFF0001)
+#define CONFIG_SYS_CS0_CTRL		0x00101980
+
+#ifdef CONFIG_SYS_NOR1SZ
+#define CONFIG_SYS_CS1_BASE		0xE0000000
+#define CONFIG_SYS_CS1_MASK		(((CONFIG_SYS_NOR1SZ << 20) - 1) & 0xFFFF0001)
+#define CONFIG_SYS_CS1_CTRL		0x00101D80
 #endif
 
 #endif				/* _M5485EVB_H */