X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2FGENIETV.h;h=f6d6ae0ce5bb823f12ef89ddb900402e96daaf0e;hb=776488eb88d0915945eeecfc1ad3e318979f9548;hp=ef2cb3a85423da5f7768525a725fe4378ab1b5f8;hpb=682011ff6968198da14b89e40d9f55b00f6d91f7;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h
index ef2cb3a..f6d6ae0 100644
--- a/include/configs/GENIETV.h
+++ b/include/configs/GENIETV.h
@@ -80,10 +80,10 @@
 #undef	CONFIG_8xx_CONS_NONE
 #define CONFIG_BAUDRATE		9600
 
-#define MPC8XX_FACT	12 			/* Multiply by 12	*/
-#define MPC8XX_XIN	5000000			/* 4 MHz clock 		*/
+#define MPC8XX_FACT	12			/* Multiply by 12	*/
+#define MPC8XX_XIN	5000000			/* 4 MHz clock		*/
 
-#define MPC8XX_HZ 	((MPC8XX_XIN) * (MPC8XX_FACT))
+#define MPC8XX_HZ	((MPC8XX_XIN) * (MPC8XX_FACT))
 #define CFG_PLPRCR_MF	((MPC8XX_FACT-1) << 20)
 #define CONFIG_8xx_GCLK_FREQ	MPC8XX_HZ	/* Force it - dont measure it */
 
@@ -95,9 +95,9 @@
 #define CONFIG_BOOTARGS		""
 #define CONFIG_BOOTCOMMAND							\
 "bootp; tftp; "									\
-"setenv bootargs console=tty0 console=ttyS0 " 					\
-"root=/dev/nfs nfsroot=$(serverip):$(rootpath) " 				\
-"ip=$(ipaddr):$(serverip):$(gatewayip):$(subnetmask):$(hostname):eth0:off ;" 	\
+"setenv bootargs console=tty0 console=ttyS0 "					\
+"root=/dev/nfs nfsroot=${serverip}:${rootpath} "				\
+"ip=${ipaddr}:${serverip}:${gatewayip}:${subnetmask}:${hostname}:eth0:off ;"	\
 "bootm "
 #else
 #define CONFIG_BOOTDELAY	0	/* autoboot disabled		*/
@@ -105,15 +105,28 @@
 
 #undef	CONFIG_WATCHDOG			/* watchdog disabled		*/
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
 
 /*
  * Miscellaneous configurable options
  */
 #define	CFG_LONGHELP				/* undef to save memory		*/
 #define	CFG_PROMPT		":>"		/* Monitor Command Prompt	*/
-#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	*/
@@ -184,7 +197,7 @@
 #define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/
 
 #define	CFG_ENV_IS_IN_FLASH	1
-#define CFG_ENV_OFFSET		0x10000	/* Offset of Environment Sector 	*/
+#define CFG_ENV_OFFSET		0x10000	/* Offset of Environment Sector		*/
 #define	CFG_ENV_SIZE		0x10000	/* Total Size of Environment Sector (64k)*/
 
 /* values according to the manual */
@@ -193,7 +206,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
 
@@ -278,15 +291,15 @@
 
 #define FLASH_BASE0_PRELIM	0x02800000	/* FLASH bank #0		*/
 
-#define CFG_REMAP_OR_AM		0x80000000	/* OR addr mask 	*/
+#define CFG_REMAP_OR_AM		0x80000000	/* OR addr mask		*/
 #define CFG_PRELIM_OR_AM	0xFF800000	/* OR addr mask (512Kb) */
 
 /* FLASH timing */
-#define CFG_OR_TIMING_FLASH 	(OR_CSNT_SAM  | OR_ACS_DIV2 | OR_BI | \
+#define CFG_OR_TIMING_FLASH	(OR_CSNT_SAM  | OR_ACS_DIV2 | OR_BI | \
 				OR_SCY_15_CLK | OR_TRLX )
 
 /*#define CFG_OR0_REMAP	(CFG_REMAP_OR_AM  | CFG_OR_TIMING_FLASH) */
-#define CFG_OR0_PRELIM	(CFG_PRELIM_OR_AM | CFG_OR_TIMING_FLASH) 		/* 0xfff80ff4 */
+#define CFG_OR0_PRELIM	(CFG_PRELIM_OR_AM | CFG_OR_TIMING_FLASH)		/* 0xfff80ff4 */
 #define CFG_BR0_PRELIM	((FLASH_BASE0_PRELIM & BR_BA_MSK) | BR_V | BR_PS_8)	/* 0x02800401 */
 
 /*
@@ -335,10 +348,6 @@
 */
 #define NR_8259_INTS	0
 
-/* Machine type
-*/
-#define _MACH_8xx (_MACH_fads)
-
 /*
  * MPC8xx CPM Options
  */