Merge 'next' branch

Conflicts:

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

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

1 files changed, 31 insertions, 31 deletions

diff --git a/include/configs/xilinx-ppc440.h b/include/configs/xilinx-ppc440.h
index 6c7abb2..ac78420 100644
--- a/include/configs/xilinx-ppc440.h
+++ b/include/configs/xilinx-ppc440.h
@@ -27,15 +27,15 @@
 #define CONFIG_4xx		1
 
 /*Mem Map*/
-#define CFG_SDRAM_BASE		0x0
-#define CFG_MONITOR_BASE	TEXT_BASE
-#define CFG_MONITOR_LEN		(192 * 1024)
-#define CFG_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
+#define CONFIG_SYS_SDRAM_BASE		0x0
+#define CONFIG_SYS_MONITOR_BASE	TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN		(192 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
 
 /*Uart*/
 #define CONFIG_XILINX_UARTLITE
 #define CONFIG_BAUDRATE		XPAR_UARTLITE_0_BAUDRATE
-#define CFG_BAUDRATE_TABLE	{ XPAR_UARTLITE_0_BAUDRATE }
+#define CONFIG_SYS_BAUDRATE_TABLE	{ XPAR_UARTLITE_0_BAUDRATE }
 #define CONFIG_SERIAL_BASE	XPAR_UARTLITE_0_BASEADDR
 
 /*Cmd*/
@@ -59,48 +59,48 @@
 
 /*Misc*/
 #define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds     */
-#define CFG_LONGHELP			/* undef to save memory         */
+#define CONFIG_SYS_LONGHELP			/* undef to save memory         */
 #if defined(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)
-#define CFG_MAXARGS		16	/* max number of command args   */
-#define CFG_BARGSIZE		CFG_CBSIZE	/* Boot Argument Buffer Size */
-#define CFG_MEMTEST_START	0x00400000	/* memtest works on           */
-#define CFG_MEMTEST_END		0x00C00000	/* 4 ... 12 MB in DRAM        */
-#define CFG_LOAD_ADDR		0x00400000	/* default load address       */
-#define CFG_EXTBDINFO		1	/* Extended board_into (bd_t) */
-#define CFG_HZ			1000	/* decrementer freq: 1 ms ticks */
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_MAXARGS		16	/* max number of command args   */
+#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
+#define CONFIG_SYS_MEMTEST_START	0x00400000	/* memtest works on           */
+#define CONFIG_SYS_MEMTEST_END		0x00C00000	/* 4 ... 12 MB in DRAM        */
+#define CONFIG_SYS_LOAD_ADDR		0x00400000	/* default load address       */
+#define CONFIG_SYS_EXTBDINFO		1	/* Extended board_into (bd_t) */
+#define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 #define CONFIG_CMDLINE_EDITING		/* add command line history     */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 #define CONFIG_LOOPW			/* enable loopw command         */
 #define CONFIG_MX_CYCLIC		/* enable mdc/mwc commands      */
 #define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */
 #define CONFIG_VERSION_VARIABLE		/* include version env variable */
-#define CFG_CONSOLE_INFO_QUIET		/* don't print console @ startup */
-#define CFG_HUSH_PARSER			/* Use the HUSH parser          */
-#define	CFG_PROMPT_HUSH_PS2	"> "
+#define CONFIG_SYS_CONSOLE_INFO_QUIET		/* don't print console @ startup */
+#define CONFIG_SYS_HUSH_PARSER			/* Use the HUSH parser          */
+#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_LOADS_ECHO		/* echo on for serial download  */
-#define CFG_LOADS_BAUD_CHANGE		/* allow baudrate change        */
-#define CFG_BOOTMAPSZ		(8 << 20)/* Initial Memory map for Linux */
+#define CONFIG_SYS_LOADS_BAUD_CHANGE		/* allow baudrate change        */
+#define CONFIG_SYS_BOOTMAPSZ		(8 << 20)/* Initial Memory map for Linux */
 
 /*Stack*/
-#define CFG_INIT_RAM_ADDR	0x800000	/* Initial RAM address    */
-#define CFG_INIT_RAM_END	0x2000		/* End of used area in RAM  */
-#define CFG_GBL_DATA_SIZE	128		/* num bytes 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	0x800000	/* Initial RAM address    */
+#define CONFIG_SYS_INIT_RAM_END	0x2000		/* End of used area in RAM  */
+#define CONFIG_SYS_GBL_DATA_SIZE	128		/* num bytes 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
 /*Speed*/
 #define CONFIG_SYS_CLK_FREQ	XPAR_CORE_CLOCK_FREQ_HZ
 
 /*Flash*/
-#define	CFG_FLASH_BASE		XPAR_FLASH_MEM0_BASEADDR
-#define	CFG_FLASH_CFI		1
+#define	CONFIG_SYS_FLASH_BASE		XPAR_FLASH_MEM0_BASEADDR
+#define	CONFIG_SYS_FLASH_CFI		1
 #define	CONFIG_FLASH_CFI_DRIVER	1
-#define	CFG_FLASH_EMPTY_INFO	1
-#define	CFG_MAX_FLASH_BANKS	1
-#define	CFG_FLASH_PROTECTION
+#define	CONFIG_SYS_FLASH_EMPTY_INFO	1
+#define	CONFIG_SYS_MAX_FLASH_BANKS	1
+#define	CONFIG_SYS_FLASH_PROTECTION
 
 #endif						/* __CONFIG_H */