X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fsmdk6400.h;h=ea65c0ef1e1e3ac78b14a99dd884f80903b36641;hb=225f0eaa745adfae05931848543d99942798756a;hp=6650ad220b1e1ac482faed045c0add07f0c3b175;hpb=11edcfe260f20dcea79284a3e95270989d433854;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index 6650ad2..ea65c0e 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -68,7 +68,7 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 1024 * 1024)
+#define CFG_MALLOC_LEN		(CONFIG_ENV_SIZE + 1024 * 1024)
 #define CFG_GBL_DATA_SIZE	128	/* size in bytes for initial data */
 
 /*
@@ -187,7 +187,7 @@
 #define CONFIG_AMD_LV800
 #define CFG_FLASH_CFI		1	/* Use CFI parameters (needed?) */
 /* Use drivers/cfi_flash.c, even though the flash is not CFI-compliant	*/
-#define CFG_FLASH_CFI_DRIVER	1
+#define CONFIG_FLASH_CFI_DRIVER	1
 #define CFG_FLASH_CFI_WIDTH	FLASH_CFI_16BIT
 #define CONFIG_FLASH_CFI_LEGACY
 #define CFG_FLASH_LEGACY_512Kx16
@@ -196,7 +196,7 @@
 #define CFG_FLASH_ERASE_TOUT	(5 * CFG_HZ) /* Timeout for Flash Erase	*/
 #define CFG_FLASH_WRITE_TOUT	(5 * CFG_HZ) /* Timeout for Flash Write	*/
 
-#define CFG_ENV_SIZE		0x4000	/* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE		0x4000	/* Total Size of Environment Sector */
 
 /*
  * SMDK6400 board specific data
@@ -222,7 +222,7 @@
 /* NAND U-Boot load and start address */
 #define CFG_UBOOT_BASE		(CFG_MAPPED_RAM_BASE + 0x07e00000)
 
-#define CFG_ENV_OFFSET		0x0040000
+#define CONFIG_ENV_OFFSET		0x0040000
 
 /* NAND configuration */
 #define CFG_MAX_NAND_DEVICE	1
@@ -284,9 +284,8 @@
 */
 
 /* Settings as above boot configuration */
-#define CFG_ENV_IS_IN_NAND
+#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_BOOTARGS		"console=ttySAC,115200"
-#define CONFIG_EXTRA_ENV_SETTINGS "bootargs=" CONFIG_BOOTARGS
 
 #if !defined(CONFIG_ENABLE_MMU)
 #define CONFIG_CMD_USB			1