X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fgw8260.h;h=e187764e2e5987ed2727c755228cc42834d4cbff;hb=225f0eaa745adfae05931848543d99942798756a;hp=ff5724082d03daee86fb6494773efb2de2317bb0;hpb=3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index ff57240..e187764 100644
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -51,7 +51,6 @@
 #define __CONFIG_H
 
 /* Enable debug prints */
-#undef DEBUG                  /* General debug */
 #undef DEBUG_BOOTP_EXT        /* Debug received vendor fields */
 
 /* What is the oscillator's (UX2) frequency in Hz? */
@@ -140,7 +139,7 @@
  *                     Monitor Stack Buffer (0x80)
  *     0x00F5 FFB0     Board Info Data
  *     0x00F6 0000     Malloc Arena
- *           :          CFG_ENV_SECT_SIZE, 256k
+ *           :          CONFIG_ENV_SECT_SIZE, 256k
  *           :          CFG_MALLOC_LEN,    128k
  *     0x00FC 0000     RAM Copy of Monitor Code
  *           :              CFG_MONITOR_LEN,   256k
@@ -163,7 +162,7 @@
  *                     Monitor Stack Buffer (0x80)
  *     0x03F5 FFB0     Board Info Data
  *     0x03F6 0000     Malloc Arena
- *           :          CFG_ENV_SECT_SIZE, 256k
+ *           :          CONFIG_ENV_SECT_SIZE, 256k
  *           :          CFG_MALLOC_LEN,    128k
  *     0x03FC 0000     RAM Copy of Monitor Code
  *           :              CFG_MONITOR_LEN,   256k
@@ -259,7 +258,7 @@
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */
-#define CFG_ENV_IN_OWN_SECT
+#define CONFIG_ENV_IN_OWN_SECT
 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -280,7 +279,8 @@
  *     To stop  use: " "
  */
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT  "Autobooting in %d seconds, press \" \" to stop\n"
+#define CONFIG_AUTOBOOT_PROMPT	\
+	"Autobooting in %d seconds, press \" \" to stop\n", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR    " "
 #undef  CONFIG_AUTOBOOT_DELAY_STR
 #define DEBUG_BOOTKEYS      0
@@ -374,7 +374,7 @@
 
 #define CFG_MEM_END_USAGE   ( CFG_MONITOR_LEN \
 			    + CFG_MALLOC_LEN \
-			    + CFG_ENV_SECT_SIZE \
+			    + CONFIG_ENV_SECT_SIZE \
 			    + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END     ( CFG_SDRAM_SIZE * 1024 * 1024 \
@@ -463,16 +463,16 @@
 #define CFG_FLASH_ERASE_TOUT  8000 /* Timeout for Flash Erase (in ms)   */
 #define CFG_FLASH_WRITE_TOUT  1    /* Timeout for Flash Write (in ms)   */
 
-#define CFG_ENV_IS_IN_FLASH   1
+#define CONFIG_ENV_IS_IN_FLASH   1
 
-#ifdef CFG_ENV_IN_OWN_SECT
-#  define CFG_ENV_ADDR        (CFG_MONITOR_BASE +  (256 * 1024))
-#  define CFG_ENV_SECT_SIZE   (256 * 1024)
+#ifdef CONFIG_ENV_IN_OWN_SECT
+#  define CONFIG_ENV_ADDR        (CFG_MONITOR_BASE +  (256 * 1024))
+#  define CONFIG_ENV_SECT_SIZE   (256 * 1024)
 #else
-#  define CFG_ENV_SIZE        (16 * 1024)/* Size of Environment Sector  */
-#  define CFG_ENV_ADD  ((CFG_MONITOR_BASE + CFG_MONITOR_LEN) - CFG_ENV_SIZE)
-#  define CFG_ENV_SECT_SIZE (256 * 1024)/* see README - env sect real size  */
-#endif /* CFG_ENV_IN_OWN_SECT */
+#  define CONFIG_ENV_SIZE        (16 * 1024)/* Size of Environment Sector  */
+#  define CONFIG_ENV_ADD  ((CFG_MONITOR_BASE + CFG_MONITOR_LEN) - CONFIG_ENV_SIZE)
+#  define CONFIG_ENV_SECT_SIZE (256 * 1024)/* see README - env sect real size  */
+#endif /* CONFIG_ENV_IN_OWN_SECT */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration