Merge 'next' branch

Conflicts:

	board/freescale/mpc8536ds/mpc8536ds.c
	include/configs/mgcoge.h

Signed-off-by: Wolfgang Denk <wd@denx.de>

1 files changed, 41 insertions, 41 deletions

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index f308460..520bac0 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -52,75 +52,75 @@
 #define MS7720SE_FLASH_BASE_1		0xA0000000
 #define MS7720SE_FLASH_BANK_SIZE	(8 * 1024 * 1024)
 
-#define CFG_LONGHELP		/* undef to save memory	*/
-#define CFG_PROMPT	"=> "	/* Monitor Command Prompt */
-#define CFG_CBSIZE	256	/* Buffer size for input from the Console */
-#define CFG_PBSIZE	256	/* Buffer size for Console output */
-#define CFG_MAXARGS	16	/* max args accepted for monitor commands */
+#define CONFIG_SYS_LONGHELP		/* undef to save memory	*/
+#define CONFIG_SYS_PROMPT	"=> "	/* Monitor Command Prompt */
+#define CONFIG_SYS_CBSIZE	256	/* Buffer size for input from the Console */
+#define CONFIG_SYS_PBSIZE	256	/* Buffer size for Console output */
+#define CONFIG_SYS_MAXARGS	16	/* max args accepted for monitor commands */
 /* Buffer size for Boot Arguments passed to kernel */
-#define CFG_BARGSIZE	512
+#define CONFIG_SYS_BARGSIZE	512
 /* List of legal baudrate settings for this board */
-#define CFG_BAUDRATE_TABLE	{ 115200 }
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1
 
-#define CFG_MEMTEST_START	MS7720SE_SDRAM_BASE
-#define CFG_MEMTEST_END		(CFG_MEMTEST_START + (60 * 1024 * 1024))
+#define CONFIG_SYS_MEMTEST_START	MS7720SE_SDRAM_BASE
+#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
 
-#define CFG_SDRAM_BASE		MS7720SE_SDRAM_BASE
-#define CFG_SDRAM_SIZE		(64 * 1024 * 1024)
+#define CONFIG_SYS_SDRAM_BASE		MS7720SE_SDRAM_BASE
+#define CONFIG_SYS_SDRAM_SIZE		(64 * 1024 * 1024)
 
-#define CFG_LOAD_ADDR		(CFG_SDRAM_BASE + 32 * 1024 * 1024)
-#define CFG_MONITOR_BASE	MS7720SE_FLASH_BASE_1
-#define CFG_MONITOR_LEN		(128 * 1024)
-#define CFG_MALLOC_LEN		(256 * 1024)
-#define CFG_GBL_DATA_SIZE	256
-#define CFG_BOOTMAPSZ		(8 * 1024 * 1024)
+#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024)
+#define CONFIG_SYS_MONITOR_BASE	MS7720SE_FLASH_BASE_1
+#define CONFIG_SYS_MONITOR_LEN		(128 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(256 * 1024)
+#define CONFIG_SYS_GBL_DATA_SIZE	256
+#define CONFIG_SYS_BOOTMAPSZ		(8 * 1024 * 1024)
 
 
 /* FLASH */
-#define CFG_FLASH_CFI
+#define CONFIG_SYS_FLASH_CFI
 #define CONFIG_FLASH_CFI_DRIVER
-#undef  CFG_FLASH_QUIET_TEST
-#define CFG_FLASH_EMPTY_INFO	/* print 'E' for empty sector on flinfo */
+#undef  CONFIG_SYS_FLASH_QUIET_TEST
+#define CONFIG_SYS_FLASH_EMPTY_INFO	/* print 'E' for empty sector on flinfo */
 
-#define CFG_FLASH_BASE		MS7720SE_FLASH_BASE_1
+#define CONFIG_SYS_FLASH_BASE		MS7720SE_FLASH_BASE_1
 
-#define CFG_MAX_FLASH_SECT	150
-#define CFG_MAX_FLASH_BANKS	1
-#define CFG_FLASH_BANKS_LIST	{ CFG_FLASH_BASE }
+#define CONFIG_SYS_MAX_FLASH_SECT	150
+#define CONFIG_SYS_MAX_FLASH_BANKS	1
+#define CONFIG_SYS_FLASH_BANKS_LIST	{ CONFIG_SYS_FLASH_BASE }
 
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE	(64 * 1024)
 #define CONFIG_ENV_SIZE		CONFIG_ENV_SECT_SIZE
-#define CONFIG_ENV_ADDR		(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#define CFG_FLASH_ERASE_TOUT	120000
-#define CFG_FLASH_WRITE_TOUT	500
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
+#define CONFIG_SYS_FLASH_ERASE_TOUT	120000
+#define CONFIG_SYS_FLASH_WRITE_TOUT	500
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ	33333333
 #define TMU_CLK_DIVIDER		4	/* 4 (default), 16, 64, 256 or 1024 */
-#define CFG_HZ			(CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
+#define CONFIG_SYS_HZ			(CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
 
 /* PCMCIA */
 #define CONFIG_IDE_PCMCIA	1
 #define CONFIG_MARUBUN_PCCARD	1
 #define CONFIG_PCMCIA_SLOT_A	1
-#define CFG_IDE_MAXDEVICE	1
-#define CFG_MARUBUN_MRSHPC	0xb83fffe0
-#define CFG_MARUBUN_MW1		0xb8400000
-#define CFG_MARUBUN_MW2		0xb8500000
-#define CFG_MARUBUN_IO		0xb8600000
-
-#define CFG_PIO_MODE		1
-#define CFG_IDE_MAXBUS		1
+#define CONFIG_SYS_IDE_MAXDEVICE	1
+#define CONFIG_SYS_MARUBUN_MRSHPC	0xb83fffe0
+#define CONFIG_SYS_MARUBUN_MW1		0xb8400000
+#define CONFIG_SYS_MARUBUN_MW2		0xb8500000
+#define CONFIG_SYS_MARUBUN_IO		0xb8600000
+
+#define CONFIG_SYS_PIO_MODE		1
+#define CONFIG_SYS_IDE_MAXBUS		1
 #define CONFIG_DOS_PARTITION	1
-#define CFG_ATA_BASE_ADDR	CFG_MARUBUN_IO	/* base address */
-#define CFG_ATA_IDE0_OFFSET	0x01F0		/* ide0 offste */
-#define CFG_ATA_DATA_OFFSET	0		/* data reg offset */
-#define CFG_ATA_REG_OFFSET	0		/* reg offset */
-#define CFG_ATA_ALT_OFFSET	0x200		/* alternate register offset */
+#define CONFIG_SYS_ATA_BASE_ADDR	CONFIG_SYS_MARUBUN_IO	/* base address */
+#define CONFIG_SYS_ATA_IDE0_OFFSET	0x01F0		/* ide0 offste */
+#define CONFIG_SYS_ATA_DATA_OFFSET	0		/* data reg offset */
+#define CONFIG_SYS_ATA_REG_OFFSET	0		/* reg offset */
+#define CONFIG_SYS_ATA_ALT_OFFSET	0x200		/* alternate register offset */
 
 #endif	/* __MS7720SE_H */