X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2FDU440.h;h=37a7e3ae87e7030f1d242098debfbd17efbfa228;hb=5a1aceb0689e2f731491838970884a673ef7e7d3;hp=0f5f85c22a66cd1351132c4478c9ef08b428e511;hpb=1a247ba7fa5fb09f56892a09a990f03ce564b3e2;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index 0f5f85c..37a7e3a 100644
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -113,13 +113,13 @@
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_EEPROM    1	/* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM    1	/* use FLASH for environment vars */
 
 /*
  * FLASH related
  */
 #define CFG_FLASH_CFI			/* The flash is CFI compatible */
-#define CFG_FLASH_CFI_DRIVER		/* Use common CFI driver       */
+#define CONFIG_FLASH_CFI_DRIVER		/* Use common CFI driver       */
 
 #define CFG_FLASH_BANKS_LIST	{ CFG_FLASH_BASE }
 
@@ -136,7 +136,7 @@
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_QUIET_TEST	1	/* don't warn upon unknown flash      */
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_SECT_SIZE	0x20000 /* size of one complete sector        */
 #define CFG_ENV_ADDR		((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
 #define	CFG_ENV_SIZE		0x2000	/* Total Size of Environment Sector   */
@@ -146,7 +146,7 @@
 #define CFG_ENV_SIZE_REDUND	(CFG_ENV_SIZE)
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET		0	/* environment starts at */
 					/* the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x1000 /* 4096 bytes may be used for env vars */
@@ -345,8 +345,9 @@ int du440_phy_addr(int devnum);
 #define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */
 #define CONFIG_VERSION_VARIABLE 1	/* include version env variable */
 
-#define CONFIG_AUTOBOOT_KEYED 1
-#define CONFIG_AUTOBOOT_PROMPT "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_KEYED	1
+#define CONFIG_AUTOBOOT_PROMPT	\
+	"Press SPACE to abort autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR "d"
 #define CONFIG_AUTOBOOT_STOP_STR " "