X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2FTOP860.h;h=b2708321705985faea7905a8654ad935e5bf3890;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=2344b96811b9eaf1f2c4f744e0ab817e3b4623d5;hpb=038ccac511214b062c56f22b9413f784b86bcd87;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index 2344b96..b270832 100644
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -107,30 +107,28 @@
  */
 #define CFG_MATCH_PARTIAL_CMD
 
+
 /*
- * List of available monitor commands.  Use the system default list
- * plus add some of the "non-standard" commands back in.
- * See ./cmd_confdefs.h
- */
-#define CONFIG_COMMANDS	      ( CONFIG_CMD_DFL	| \
-								CFG_CMD_ASKENV	| \
-								CFG_CMD_DHCP	| \
-								CFG_CMD_I2C		| \
-								CFG_CMD_EEPROM	| \
-								CFG_CMD_REGINFO	| \
-								CFG_CMD_IMMAP	| \
-								CFG_CMD_ELF		| \
-								CFG_CMD_DATE	| \
-								CFG_CMD_MII 	| \
-								CFG_CMD_BEDBUG	\
-						      )
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_BEDBUG
+
 
 #define	CONFIG_AUTOSCRIPT		1
 #define	CFG_LOADS_BAUD_CHANGE	1
 #undef	CONFIG_LOADS_ECHO			/* NO echo on for serial download	*/
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
 
 #define CFG_LONGHELP			/* undef to save memory		*/
 #define CFG_PROMPT	"=> "		/* Monitor Command Prompt	*/
@@ -141,7 +139,7 @@
  #define CFG_PROMPT_HUSH_PS2	"> "
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
  #define CFG_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
  #define CFG_CBSIZE	256		/* Console I/O Buffer Size	*/
@@ -162,9 +160,9 @@
  * only the first 6k in EEPROM are available for user. Of that we use 256b
  */
 #define	CONFIG_SOFT_I2C
-#define CFG_ENV_IS_IN_EEPROM	1	/* turn on EEPROM env feature */
-#define CFG_ENV_OFFSET		0x1000
-#define CFG_ENV_SIZE		0x0700
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* turn on EEPROM env feature */
+#define CONFIG_ENV_OFFSET		0x1000
+#define CONFIG_ENV_SIZE		0x0700
 #define CFG_I2C_EEPROM_ADDR 0x57
 #define CFG_FACT_OFFSET		0x1800
 #define CFG_FACT_SIZE		0x0800
@@ -203,10 +201,11 @@
  * defines we need to get FEC running
  */
 #define	CONFIG_NET_MULTI	1	/* the only way to get the FEC in */
-#define CONFIG_FEC_ENET 	1	/* Ethernet only via FEC	*/
-#define	FEC_ENET			1	/* eth.c needs it that way... */
+#define CONFIG_FEC_ENET		1	/* Ethernet only via FEC	*/
+#define	FEC_ENET		1	/* eth.c needs it that way... */
 #define CFG_DISCOVER_PHY	1
-#define CONFIG_MII			1
+#define CONFIG_MII		1
+#define CONFIG_MII_INIT		1
 #define CONFIG_PHY_ADDR		31
 
 /*-----------------------------------------------------------------------
@@ -239,7 +238,7 @@
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE	16	/* For all MPC8xx CPUs			*/
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CACHELINE_SHIFT	4	/* log base 2 of the above value	*/
 #endif
 
@@ -288,7 +287,7 @@
  *-----------------------------------------------------------------------
  * set up SYPCR:
  *	16	SWTC	0xffff		Software watchdog timer count
- *	8	BMT		0xff 		Bus monitor timing
+ *	8	BMT		0xff		Bus monitor timing
  *	1	BME		1			Bus monitor enable
  *	3	0		000
  *	1	SWF		1			Software watchdog freeze
@@ -298,7 +297,7 @@
  */
 #if defined (CONFIG_WATCHDOG)
  #define CFG_SYPCR	(SYPCR_SWTC | SYPCR_BMT | SYPCR_BME | SYPCR_SWF | \
-			 		 SYPCR_SWE  | SYPCR_SWRI| SYPCR_SWP)
+					 SYPCR_SWE  | SYPCR_SWRI| SYPCR_SWP)
 #else
  #define CFG_SYPCR	(SYPCR_SWTC | SYPCR_BMT | SYPCR_BME | SYPCR_SWF)
 #endif
@@ -411,10 +410,11 @@
 /*
  * BOOTP options
  */
-#undef	CONFIG_BOOTP_MASK
-#define CONFIG_BOOTP_MASK				( CONFIG_BOOTP_DEFAULT		| \
-									  	  CONFIG_BOOTP_BOOTFILESIZE   \
-										)
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
 
 
 /*