Merge git://git.denx.de/u-boot into x1

Conflicts:

	drivers/usb/usb_ohci.c

1 files changed, 23 insertions, 23 deletions

diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index 3c51417..55cda32 100644
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -52,7 +52,7 @@
 
 #define	CONFIG_SKIP_LOWLEVEL_INIT
 
-#define	CFG_LONGHELP
+#define	CONFIG_SYS_LONGHELP
 
 #ifndef roundup
 #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
@@ -60,8 +60,8 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN	(roundup(CONFIG_ENV_SIZE,4096) + 128*1024)
-#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
+#define CONFIG_SYS_MALLOC_LEN	(roundup(CONFIG_ENV_SIZE,4096) + 128*1024)
+#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE 115200
 
@@ -109,13 +109,13 @@
 #define PHYS_SDRAM 0x20000000
 #define PHYS_SDRAM_SIZE 0x2000000  /* 32 megs */
 
-#define CFG_MEMTEST_START		PHYS_SDRAM
-#define CFG_MEMTEST_END			CFG_MEMTEST_START + PHYS_SDRAM_SIZE - (512*1024)
+#define CONFIG_SYS_MEMTEST_START		PHYS_SDRAM
+#define CONFIG_SYS_MEMTEST_END			CONFIG_SYS_MEMTEST_START + PHYS_SDRAM_SIZE - (512*1024)
 
 #define CONFIG_DRIVER_ETHER
 #define CONFIG_NET_RETRY_COUNT		20
 
-#define CFG_FLASH_BASE			0x10000000
+#define CONFIG_SYS_FLASH_BASE			0x10000000
 
 #ifdef CONFIG_KB9202
 #define PHYS_FLASH_SIZE			0x1000000
@@ -123,8 +123,8 @@
 #define PHYS_FLASH_SIZE			0x200000
 #endif
 
-#define CFG_MAX_FLASH_BANKS		1
-#define CFG_MAX_FLASH_SECT		256
+#define CONFIG_SYS_MAX_FLASH_BANKS		1
+#define CONFIG_SYS_MAX_FLASH_SECT		256
 
 #define	CONFIG_HARD_I2C
 
@@ -137,24 +137,24 @@
 #define CONFIG_ENV_OFFSET			0x1000
 #define CONFIG_ENV_SIZE			0x1000
 #endif
-#define	CFG_I2C_EEPROM_ADDR		0x50
-#define	CFG_EEPROM_PAGE_WRITE_BITS	6
-#define	CFG_I2C_EEPROM_ADDR_LEN		2
-#define	CFG_I2C_SPEED			50000
-#define	CFG_I2C_SLAVE			0 /* not used */
-#define	CFG_EEPROM_PAGE_WRITE_DELAY_MS	10
+#define	CONFIG_SYS_I2C_EEPROM_ADDR		0x50
+#define	CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	6
+#define	CONFIG_SYS_I2C_EEPROM_ADDR_LEN		2
+#define	CONFIG_SYS_I2C_SPEED			50000
+#define	CONFIG_SYS_I2C_SLAVE			0 /* not used */
+#define	CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10
 
-#define CFG_LOAD_ADDR		0x21000000  /* default load address */
+#define CONFIG_SYS_LOAD_ADDR		0x21000000  /* default load address */
 
-#define CFG_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
+#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
-#define CFG_PROMPT		"U-Boot> "	/* Monitor Command Prompt */
-#define CFG_CBSIZE		256		/* Console I/O Buffer Size */
-#define CFG_MAXARGS		16		/* max number of command args */
-#define CFG_PBSIZE		(CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
+#define CONFIG_SYS_PROMPT		"U-Boot> "	/* Monitor Command Prompt */
+#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */
+#define CONFIG_SYS_MAXARGS		16		/* max number of command args */
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 
 #define	CONFIG_FLASH_CFI_DRIVER
-#define	CFG_FLASH_CFI
+#define	CONFIG_SYS_FLASH_CFI
 
 #ifndef __ASSEMBLY__
 /*-----------------------------------------------------------------------
@@ -175,8 +175,8 @@ struct bd_info_ext {
 };
 #endif
 
-#define CFG_HZ 1000
-#define CFG_HZ_CLOCK AT91C_MASTER_CLOCK/2	/* AT91C_TC0_CMR is implicitly set to */
+#define CONFIG_SYS_HZ 1000
+#define CONFIG_SYS_HZ_CLOCK AT91C_MASTER_CLOCK/2	/* AT91C_TC0_CMR is implicitly set to */
 					/* AT91C_TC_TIMER_DIV1_CLOCK */
 
 #define CONFIG_STACKSIZE	(32*1024)	/* regular stack */