rename CFG_ macros to CONFIG_SYS

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

1 files changed, 105 insertions, 105 deletions

diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index b69ced6623..986590aaaf 100644
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -48,7 +48,7 @@
 #define CONFIG_MPC824X      1
 #define CONFIG_MPC8240      1
 #define CONFIG_MOUSSE       1
-#define CFG_ADDR_MAP_B      1
+#define CONFIG_SYS_ADDR_MAP_B      1
 #define CONFIG_CONS_INDEX   1
 #define CONFIG_BAUDRATE     9600
 #if 1
@@ -88,75 +88,75 @@
 /*
  * Miscellaneous configurable options
  */
-#undef CFG_LONGHELP                /* undef to save memory     */
-#define CFG_PROMPT      "=>"  /* Monitor Command Prompt   */
-#define CFG_CBSIZE      256        /* Console I/O Buffer Size  */
-#define CFG_PBSIZE      (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
-#define CFG_MAXARGS     8           /* Max number of command args   */
+#undef CONFIG_SYS_LONGHELP                /* undef to save memory     */
+#define CONFIG_SYS_PROMPT      "=>"  /* Monitor Command Prompt   */
+#define CONFIG_SYS_CBSIZE      256        /* Console I/O Buffer Size  */
+#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_MAXARGS     8           /* Max number of command args   */
 
-#define CFG_BARGSIZE    CFG_CBSIZE  /* Boot Argument Buffer Size    */
-#define CFG_LOAD_ADDR   0x00100000  /* Default load address         */
+#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE  /* Boot Argument Buffer Size    */
+#define CONFIG_SYS_LOAD_ADDR   0x00100000  /* Default load address         */
 
 /*-----------------------------------------------------------------------
  * 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 CONFIG_SYS_SDRAM_BASE      0x00000000
 
 #ifdef DEBUG
-#define CFG_MONITOR_BASE    CFG_SDRAM_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_SDRAM_BASE
 #else
-#define CFG_MONITOR_BASE    CFG_FLASH_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_FLASH_BASE
 #endif
 
 #ifdef DEBUG
-#define CFG_MONITOR_LEN     (4 << 20)	/* lots of mem ... */
+#define CONFIG_SYS_MONITOR_LEN     (4 << 20)	/* lots of mem ... */
 #else
-#define CFG_MONITOR_LEN     (512 << 10)	/* 512K PLCC bootrom */
+#define CONFIG_SYS_MONITOR_LEN     (512 << 10)	/* 512K PLCC bootrom */
 #endif
-#define CFG_MALLOC_LEN      (2*(4096 << 10))    /* 2*4096kB for malloc()  */
+#define CONFIG_SYS_MALLOC_LEN      (2*(4096 << 10))    /* 2*4096kB for malloc()  */
 
-#define CFG_MEMTEST_START   0x00004000	/* memtest works on      */
-#define CFG_MEMTEST_END     0x02000000	/* 0 ... 32 MB in DRAM   */
+#define CONFIG_SYS_MEMTEST_START   0x00004000	/* memtest works on      */
+#define CONFIG_SYS_MEMTEST_END     0x02000000	/* 0 ... 32 MB in DRAM   */
 
 
-#define CFG_EUMB_ADDR       0xFC000000
+#define CONFIG_SYS_EUMB_ADDR       0xFC000000
 
-#define CFG_ISA_MEM         0xFD000000
-#define CFG_ISA_IO          0xFE000000
+#define CONFIG_SYS_ISA_MEM         0xFD000000
+#define CONFIG_SYS_ISA_IO          0xFE000000
 
-#define CFG_FLASH_BASE      0xFFF00000
-#define CFG_FLASH_SIZE      ((uint)(512 * 1024))
-#define CFG_RESET_ADDRESS   0xFFF00100
+#define CONFIG_SYS_FLASH_BASE      0xFFF00000
+#define CONFIG_SYS_FLASH_SIZE      ((uint)(512 * 1024))
+#define CONFIG_SYS_RESET_ADDRESS   0xFFF00100
 #define FLASH_BASE0_PRELIM  0xFFF00000  /* 512K PLCC FLASH/AM29F040*/
 #define FLASH_BASE0_SIZE    0x80000     /* 512K */
 #define FLASH_BASE1_PRELIM  0xFFE10000  /* AMD 29LV160DB
 					   1MB - 64K FLASH0 SEG =960K
 					   (size=0xf0000)*/
 
-#define CFG_BAUDRATE_TABLE  { 9600, 19200, 38400, 57600, 115200 }
+#define CONFIG_SYS_BAUDRATE_TABLE  { 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * NS16550 Configuration
  */
-#define CFG_NS16550
-#define CFG_NS16550_SERIAL
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
 
-#define CFG_NS16550_REG_SIZE	1
+#define CONFIG_SYS_NS16550_REG_SIZE	1
 
-#define CFG_NS16550_CLK		18432000
+#define CONFIG_SYS_NS16550_CLK		18432000
 
-#define CFG_NS16550_COM1	0xFFE08080
+#define CONFIG_SYS_NS16550_COM1	0xFFE08080
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
-#define CFG_INIT_RAM_ADDR CFG_SDRAM_BASE + CFG_MONITOR_LEN
-#define CFG_INIT_RAM_END   0x2F00  /* End of used area in DPRAM  */
-#define CFG_GBL_DATA_SIZE  64  /* size in bytes reserved for initial data */
-#define CFG_GBL_DATA_OFFSET  (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
-#define CFG_INIT_SP_OFFSET  CFG_GBL_DATA_OFFSET
+#define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_MONITOR_LEN
+#define CONFIG_SYS_INIT_RAM_END   0x2F00  /* End of used area in DPRAM  */
+#define CONFIG_SYS_GBL_DATA_SIZE  64  /* size in bytes reserved for initial data */
+#define CONFIG_SYS_GBL_DATA_OFFSET  (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_OFFSET  CONFIG_SYS_GBL_DATA_OFFSET
 
 /*
  * Low Level Configuration Settings
@@ -167,24 +167,24 @@
 
 #define CONFIG_SYS_CLK_FREQ  33000000	/* external frequency to pll */
 #define CONFIG_PLL_PCI_TO_MEM_MULTIPLIER  2
-#define CFG_HZ               1000
+#define CONFIG_SYS_HZ               1000
 
-#define CFG_ETH_DEV_FN       0x00
-#define CFG_ETH_IOBASE       0x00104000
+#define CONFIG_SYS_ETH_DEV_FN       0x00
+#define CONFIG_SYS_ETH_IOBASE       0x00104000
 
 
 	/* Bit-field values for MCCR1.
 	 */
-#define CFG_ROMNAL          8
-#define CFG_ROMFAL          8
+#define CONFIG_SYS_ROMNAL          8
+#define CONFIG_SYS_ROMFAL          8
 
 	/* Bit-field values for MCCR2.
 	 */
-#define CFG_REFINT          0xf5     /* Refresh interval               */
+#define CONFIG_SYS_REFINT          0xf5     /* Refresh interval               */
 
 	/* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4.
 	 */
-#define CFG_BSTOPRE         0x79
+#define CONFIG_SYS_BSTOPRE         0x79
 
 #ifdef INCLUDE_ECC
 #define USE_ECC				1
@@ -195,18 +195,18 @@
 
 	/* Bit-field values for MCCR3.
 	 */
-#define CFG_REFREC          8       /* Refresh to activate interval   */
-#define CFG_RDLAT           (4+USE_ECC)   /* Data latancy from read command */
+#define CONFIG_SYS_REFREC          8       /* Refresh to activate interval   */
+#define CONFIG_SYS_RDLAT           (4+USE_ECC)   /* Data latancy from read command */
 
 	/* Bit-field values for MCCR4.
 	 */
-#define CFG_PRETOACT        3       /* Precharge to activate interval */
-#define CFG_ACTTOPRE        5       /* Activate to Precharge interval */
-#define CFG_SDMODE_CAS_LAT  3       /* SDMODE CAS latancy             */
-#define CFG_SDMODE_WRAP     0       /* SDMODE wrap type               */
-#define CFG_SDMODE_BURSTLEN 2       /* SDMODE Burst length            */
-#define CFG_ACTORW          2
-#define CFG_REGISTERD_TYPE_BUFFER (1-USE_ECC)
+#define CONFIG_SYS_PRETOACT        3       /* Precharge to activate interval */
+#define CONFIG_SYS_ACTTOPRE        5       /* Activate to Precharge interval */
+#define CONFIG_SYS_SDMODE_CAS_LAT  3       /* SDMODE CAS latancy             */
+#define CONFIG_SYS_SDMODE_WRAP     0       /* SDMODE wrap type               */
+#define CONFIG_SYS_SDMODE_BURSTLEN 2       /* SDMODE Burst length            */
+#define CONFIG_SYS_ACTORW          2
+#define CONFIG_SYS_REGISTERD_TYPE_BUFFER (1-USE_ECC)
 
 /* Memory bank settings.
  * Only bits 20-29 are actually used from these vales to set the
@@ -214,71 +214,71 @@
  * 20 bits will be 0x00000 for a start address, or 0xfffff for an end
  * address. Refer to the MPC8240 book.
  */
-#define CFG_RAM_SIZE        0x04000000  /* 64MB */
-
-
-#define CFG_BANK0_START     0x00000000
-#define CFG_BANK0_END       (CFG_RAM_SIZE - 1)
-#define CFG_BANK0_ENABLE    1
-#define CFG_BANK1_START     0x3ff00000
-#define CFG_BANK1_END       0x3fffffff
-#define CFG_BANK1_ENABLE    0
-#define CFG_BANK2_START     0x3ff00000
-#define CFG_BANK2_END       0x3fffffff
-#define CFG_BANK2_ENABLE    0
-#define CFG_BANK3_START     0x3ff00000
-#define CFG_BANK3_END       0x3fffffff
-#define CFG_BANK3_ENABLE    0
-#define CFG_BANK4_START     0x3ff00000
-#define CFG_BANK4_END       0x3fffffff
-#define CFG_BANK4_ENABLE    0
-#define CFG_BANK5_START     0x3ff00000
-#define CFG_BANK5_END       0x3fffffff
-#define CFG_BANK5_ENABLE    0
-#define CFG_BANK6_START     0x3ff00000
-#define CFG_BANK6_END       0x3fffffff
-#define CFG_BANK6_ENABLE    0
-#define CFG_BANK7_START     0x3ff00000
-#define CFG_BANK7_END       0x3fffffff
-#define CFG_BANK7_ENABLE    0
-
-#define CFG_ODCR            0x7f
-
-
-#define CFG_PGMAX           0x32 /* how long the 8240 reatins the currently accessed page in memory
+#define CONFIG_SYS_RAM_SIZE        0x04000000  /* 64MB */
+
+
+#define CONFIG_SYS_BANK0_START     0x00000000
+#define CONFIG_SYS_BANK0_END       (CONFIG_SYS_RAM_SIZE - 1)
+#define CONFIG_SYS_BANK0_ENABLE    1
+#define CONFIG_SYS_BANK1_START     0x3ff00000
+#define CONFIG_SYS_BANK1_END       0x3fffffff
+#define CONFIG_SYS_BANK1_ENABLE    0
+#define CONFIG_SYS_BANK2_START     0x3ff00000
+#define CONFIG_SYS_BANK2_END       0x3fffffff
+#define CONFIG_SYS_BANK2_ENABLE    0
+#define CONFIG_SYS_BANK3_START     0x3ff00000
+#define CONFIG_SYS_BANK3_END       0x3fffffff
+#define CONFIG_SYS_BANK3_ENABLE    0
+#define CONFIG_SYS_BANK4_START     0x3ff00000
+#define CONFIG_SYS_BANK4_END       0x3fffffff
+#define CONFIG_SYS_BANK4_ENABLE    0
+#define CONFIG_SYS_BANK5_START     0x3ff00000
+#define CONFIG_SYS_BANK5_END       0x3fffffff
+#define CONFIG_SYS_BANK5_ENABLE    0
+#define CONFIG_SYS_BANK6_START     0x3ff00000
+#define CONFIG_SYS_BANK6_END       0x3fffffff
+#define CONFIG_SYS_BANK6_ENABLE    0
+#define CONFIG_SYS_BANK7_START     0x3ff00000
+#define CONFIG_SYS_BANK7_END       0x3fffffff
+#define CONFIG_SYS_BANK7_ENABLE    0
+
+#define CONFIG_SYS_ODCR            0x7f
+
+
+#define CONFIG_SYS_PGMAX           0x32 /* how long the 8240 reatins the currently accessed page in memory
 				    see 8240 book for details*/
 #define PCI_MEM_SPACE1_START	0x80000000
 #define PCI_MEM_SPACE2_START	0xfd000000
 
 /* IBAT/DBAT Configuration */
 /* Ram: 64MB, starts at address-0, r/w instruction/data */
-#define CFG_IBAT0U      (CFG_SDRAM_BASE | BATU_BL_64M | BATU_VS | BATU_VP)
-#define CFG_IBAT0L      (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE)
-#define CFG_DBAT0U      CFG_IBAT0U
-#define CFG_DBAT0L      CFG_IBAT0L
+#define CONFIG_SYS_IBAT0U      (CONFIG_SYS_SDRAM_BASE | BATU_BL_64M | BATU_VS | BATU_VP)
+#define CONFIG_SYS_IBAT0L      (CONFIG_SYS_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE)
+#define CONFIG_SYS_DBAT0U      CONFIG_SYS_IBAT0U
+#define CONFIG_SYS_DBAT0L      CONFIG_SYS_IBAT0L
 
 /* MPLD/Port-X I/O Space : data and instruction read/write,  cache-inhibit */
-#define CFG_IBAT1U      (PORTX_DEV_BASE | BATU_BL_128M | BATU_VS | BATU_VP)
+#define CONFIG_SYS_IBAT1U      (PORTX_DEV_BASE | BATU_BL_128M | BATU_VS | BATU_VP)
 #if 0
-#define CFG_IBAT1L      (PORTX_DEV_BASE | BATL_PP_10  | BATL_MEMCOHERENCE |\
+#define CONFIG_SYS_IBAT1L      (PORTX_DEV_BASE | BATL_PP_10  | BATL_MEMCOHERENCE |\
 			 BATL_WRITETHROUGH | BATL_CACHEINHIBIT)
 #else
-#define CFG_IBAT1L      (PORTX_DEV_BASE | BATL_PP_10 |BATL_CACHEINHIBIT)
+#define CONFIG_SYS_IBAT1L      (PORTX_DEV_BASE | BATL_PP_10 |BATL_CACHEINHIBIT)
 #endif
-#define CFG_DBAT1U	CFG_IBAT1U
-#define CFG_DBAT1L	CFG_IBAT1L
+#define CONFIG_SYS_DBAT1U	CONFIG_SYS_IBAT1U
+#define CONFIG_SYS_DBAT1L	CONFIG_SYS_IBAT1L
 
 /* PCI Memory region 1: 0x8XXX_XXXX PCI Mem space: EUMBAR, etc - 16MB */
-#define CFG_IBAT2U	(PCI_MEM_SPACE1_START|BATU_BL_16M | BATU_VS | BATU_VP)
-#define CFG_IBAT2L	(PCI_MEM_SPACE1_START|BATL_PP_10 | BATL_GUARDEDSTORAGE|BATL_CACHEINHIBIT)
-#define CFG_DBAT2U      CFG_IBAT2U
-#define CFG_DBAT2L      CFG_IBAT2L
+#define CONFIG_SYS_IBAT2U	(PCI_MEM_SPACE1_START|BATU_BL_16M | BATU_VS | BATU_VP)
+#define CONFIG_SYS_IBAT2L	(PCI_MEM_SPACE1_START|BATL_PP_10 | BATL_GUARDEDSTORAGE|BATL_CACHEINHIBIT)
+#define CONFIG_SYS_DBAT2U      CONFIG_SYS_IBAT2U
+#define CONFIG_SYS_DBAT2L      CONFIG_SYS_IBAT2L
 
 /* PCI Memory region 2: PCI Devices in 0xFD space */
-#define CFG_IBAT3U	(PCI_MEM_SPACE2_START|BATU_BL_16M | BATU_VS | BATU_VP)
-#define CFG_IBAT3L	(PCI_MEM_SPACE2_START|BATL_PP_10 | BATL_GUARDEDSTORAGE | BATL_CACHEINHIBIT)
-#define CFG_DBAT3U      CFG_IBAT3U
-#define CFG_DBAT3L      CFG_IBAT3L
+#define CONFIG_SYS_IBAT3U	(PCI_MEM_SPACE2_START|BATU_BL_16M | BATU_VS | BATU_VP)
+#define CONFIG_SYS_IBAT3L	(PCI_MEM_SPACE2_START|BATL_PP_10 | BATL_GUARDEDSTORAGE | BATL_CACHEINHIBIT)
+#define CONFIG_SYS_DBAT3U      CONFIG_SYS_IBAT3U
+#define CONFIG_SYS_DBAT3L      CONFIG_SYS_IBAT3L
 
 
 /*
@@ -286,16 +286,16 @@
  * 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       (8 << 20)   /* Initial Memory map for Linux */
+#define CONFIG_SYS_BOOTMAPSZ       (8 << 20)   /* Initial Memory map for Linux */
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
-#define CFG_MAX_FLASH_BANKS     3       /* Max number of flash banks         */
-#define CFG_MAX_FLASH_SECT      64      /* Max number of sectors in one bank */
+#define CONFIG_SYS_MAX_FLASH_BANKS     3       /* Max number of flash banks         */
+#define CONFIG_SYS_MAX_FLASH_SECT      64      /* Max number of sectors in one bank */
 
-#define CFG_FLASH_ERASE_TOUT    120000  /* Timeout for Flash Erase (in ms)   */
-#define CFG_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write (in ms)   */
+#define CONFIG_SYS_FLASH_ERASE_TOUT    120000  /* Timeout for Flash Erase (in ms)   */
+#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write (in ms)   */
 
 #if 0
 #define	CONFIG_ENV_IS_IN_FLASH	    1
@@ -310,7 +310,7 @@
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
-#define CFG_CACHELINE_SIZE  16
+#define CONFIG_SYS_CACHELINE_SIZE  16
 
 
 /*