Merge branch 'master' of /home/stefan/git/u-boot/u-boot

1 files changed, 40 insertions, 40 deletions

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index bf06f62..1b59059 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -67,60 +67,60 @@
 #define SH7785LCR_FLASH_BANK_SIZE	(64 * 1024 * 1024)
 #define SH7785LCR_USB_BASE		(0xb4000000)
 
-#define CFG_LONGHELP
-#define CFG_PROMPT		"=> "
-#define CFG_CBSIZE		256
-#define CFG_PBSIZE		256
-#define CFG_MAXARGS		16
-#define CFG_BARGSIZE		512
-#define CFG_BAUDRATE_TABLE	{ 115200 }
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_PROMPT		"=> "
+#define CONFIG_SYS_CBSIZE		256
+#define CONFIG_SYS_PBSIZE		256
+#define CONFIG_SYS_MAXARGS		16
+#define CONFIG_SYS_BARGSIZE		512
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF1	1
 #define CONFIG_SCIF_EXT_CLOCK	1
-#undef	CFG_CONSOLE_INFO_QUIET
-#undef	CFG_CONSOLE_OVERWRITE_ROUTINE
-#undef	CFG_CONSOLE_ENV_OVERWRITE
+#undef	CONFIG_SYS_CONSOLE_INFO_QUIET
+#undef	CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
+#undef	CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 
-#define CFG_MEMTEST_START	(SH7785LCR_SDRAM_BASE)
-#define CFG_MEMTEST_END		(CFG_MEMTEST_START + \
+#define CONFIG_SYS_MEMTEST_START	(SH7785LCR_SDRAM_BASE)
+#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \
 					(SH7785LCR_SDRAM_SIZE) - \
 					 4 * 1024 * 1024)
-#undef	CFG_ALT_MEMTEST
-#undef	CFG_MEMTEST_SCRATCH
-#undef	CFG_LOADS_BAUD_CHANGE
+#undef	CONFIG_SYS_ALT_MEMTEST
+#undef	CONFIG_SYS_MEMTEST_SCRATCH
+#undef	CONFIG_SYS_LOADS_BAUD_CHANGE
 
-#define CFG_SDRAM_BASE	(SH7785LCR_SDRAM_BASE)
-#define CFG_SDRAM_SIZE	(SH7785LCR_SDRAM_SIZE)
-#define CFG_LOAD_ADDR	(CFG_SDRAM_BASE + 16 * 1024 * 1024)
+#define CONFIG_SYS_SDRAM_BASE	(SH7785LCR_SDRAM_BASE)
+#define CONFIG_SYS_SDRAM_SIZE	(SH7785LCR_SDRAM_SIZE)
+#define CONFIG_SYS_LOAD_ADDR	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 * 1024)
 
-#define CFG_MONITOR_BASE	(SH7785LCR_FLASH_BASE_1)
-#define CFG_MONITOR_LEN		(512 * 1024)
-#define CFG_MALLOC_LEN		(512 * 1024)
-#define CFG_GBL_DATA_SIZE	(256)
-#define CFG_BOOTMAPSZ		(8 * 1024 * 1024)
+#define CONFIG_SYS_MONITOR_BASE	(SH7785LCR_FLASH_BASE_1)
+#define CONFIG_SYS_MONITOR_LEN		(512 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(512 * 1024)
+#define CONFIG_SYS_GBL_DATA_SIZE	(256)
+#define CONFIG_SYS_BOOTMAPSZ		(8 * 1024 * 1024)
 
 /* FLASH */
 #define CONFIG_FLASH_CFI_DRIVER
-#define CFG_FLASH_CFI
-#undef	CFG_FLASH_QUIET_TEST
-#define CFG_FLASH_EMPTY_INFO
-#define CFG_FLASH_BASE		(SH7785LCR_FLASH_BASE_1)
-#define CFG_MAX_FLASH_SECT	512
-
-#define CFG_MAX_FLASH_BANKS	1
-#define CFG_FLASH_BANKS_LIST	{ CFG_FLASH_BASE + \
+#define CONFIG_SYS_FLASH_CFI
+#undef	CONFIG_SYS_FLASH_QUIET_TEST
+#define CONFIG_SYS_FLASH_EMPTY_INFO
+#define CONFIG_SYS_FLASH_BASE		(SH7785LCR_FLASH_BASE_1)
+#define CONFIG_SYS_MAX_FLASH_SECT	512
+
+#define CONFIG_SYS_MAX_FLASH_BANKS	1
+#define CONFIG_SYS_FLASH_BANKS_LIST	{ CONFIG_SYS_FLASH_BASE + \
 				 (0 * SH7785LCR_FLASH_BANK_SIZE) }
 
-#define CFG_FLASH_ERASE_TOUT	(3 * 1000)
-#define CFG_FLASH_WRITE_TOUT	(3 * 1000)
-#define CFG_FLASH_LOCK_TOUT	(3 * 1000)
-#define CFG_FLASH_UNLOCK_TOUT	(3 * 1000)
+#define CONFIG_SYS_FLASH_ERASE_TOUT	(3 * 1000)
+#define CONFIG_SYS_FLASH_WRITE_TOUT	(3 * 1000)
+#define CONFIG_SYS_FLASH_LOCK_TOUT	(3 * 1000)
+#define CONFIG_SYS_FLASH_UNLOCK_TOUT	(3 * 1000)
 
-#undef	CFG_FLASH_PROTECTION
-#undef	CFG_DIRECT_FLASH_TFTP
+#undef	CONFIG_SYS_FLASH_PROTECTION
+#undef	CONFIG_SYS_DIRECT_FLASH_TFTP
 
 /* R8A66597 */
 #define LITTLEENDIAN			/* for include/usb.h */
@@ -154,14 +154,14 @@
 #define CONFIG_ENV_OVERWRITE	1
 #define CONFIG_ENV_SECT_SIZE	(256 * 1024)
 #define CONFIG_ENV_SIZE		(CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + CFG_MONITOR_LEN)
-#define CONFIG_ENV_OFFSET		(CONFIG_ENV_ADDR - CFG_FLASH_BASE)
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
+#define CONFIG_ENV_OFFSET		(CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
 #define CONFIG_ENV_SIZE_REDUND	(CONFIG_ENV_SECT_SIZE)
 
 /* Board Clock */
 /* The SCIF used external clock. system clock only used timer. */
 #define CONFIG_SYS_CLK_FREQ	50000000
 #define TMU_CLK_DIVIDER		4
-#define CFG_HZ			(CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
+#define CONFIG_SYS_HZ			(CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
 
 #endif	/* __SH7785LCR_H */