X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fmx1ads.h;h=2eb43bf73d7004b698747c990badbb80fde3a896;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=7f3dfd5c987833b2ed533a11abf46846576d3231;hpb=8aa1a2d115420b1eb126f69f3547b54d275c3228;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 7f3dfd5..2eb43bf 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -57,7 +57,7 @@
  * Size of malloc() pool
  */
 
-#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024)
 
 
 #define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
@@ -78,25 +78,32 @@
 
 #define CONFIG_BAUDRATE		115200
 
-/***********************************************************
- * Command definition
- ***********************************************************/
 
-#define CONFIG_COMMANDS \
-			(CONFIG_CMD_DFL	 | \
-			CFG_CMD_CACHE	 | \
-			CFG_CMD_REGINFO	 | \
-			CFG_CMD_ELF)
+/*
+ * 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>
+
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_ELF
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
 
 #define CONFIG_BOOTDELAY	3
 #define CONFIG_BOOTARGS		"root=/dev/msdk mem=48M"
 #define CONFIG_BOOTFILE		"mx1ads"
 #define CONFIG_BOOTCOMMAND	"tftp; bootm"
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 						/* what's this ? it's not used anywhere */
 #define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
@@ -165,11 +172,11 @@
 #define CONFIG_SYNCFLASH	1
 #define PHYS_FLASH_SIZE		0x01000000
 #define CFG_MAX_FLASH_SECT	(16)
-#define CFG_ENV_ADDR		(CFG_FLASH_BASE+0x00ff8000)
+#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE+0x00ff8000)
 
-#define CFG_ENV_IS_IN_FLASH	1
-#define CFG_ENV_SIZE		0x04000 /* Total Size of Environment Sector */
-#define CFG_ENV_SECT_SIZE	0x100000
+#define CONFIG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_SIZE		0x04000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE	0x100000
 
 /*-----------------------------------------------------------------------
  * Enable passing ATAGS