Merge branch 'master' of /home/wd/git/u-boot/custodians

[platform/kernel/u-boot.git] / include / configs / SX1.h

diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index 05cef87..ff4e1a0 100644 (file)
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -46,7 +46,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 */
 
 /*
@@ -172,7 +172,7 @@
 #define PHYS_FLASH_SIZE                (16 << 10) /* 16 MB */
 #define PHYS_FLASH_SECT_SIZE   (128*1024) /* Size of a sector (128kB) */
 #define CFG_MAX_FLASH_SECT     (128)   /* max number of sectors on one chip */
-#define CFG_ENV_ADDR   (CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE) /* addr of environment */
+#define CONFIG_ENV_ADDR        (CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE) /* addr of environment */
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE  /* Monitor at beginning of flash */
 #define CFG_MONITOR_LEN                PHYS_FLASH_SECT_SIZE    /* Reserve 1 sector */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE }
@@ -181,7 +181,7 @@
  * FLASH driver setup
  */
 #define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use drivers/cfi_flash.c */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use drivers/mtd/cfi_flash.c */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* Use buffered writes (~10x faster) */
 #define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */
 
@@ -189,13 +189,13 @@
 #define CFG_FLASH_ERASE_TOUT   (20*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (20*CFG_HZ) /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_SECT_SIZE      PHYS_FLASH_SECT_SIZE
-#define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE /* Total Size of Environment Sector */
-#define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_SECT_SIZE   PHYS_FLASH_SECT_SIZE
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE /* Total Size of Environment Sector */
+#define CONFIG_ENV_OFFSET      ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
 
 /* Address and size of Redundant Environment Sector    */
-#define CFG_ENV_SIZE_REDUND    0x20000
-#define CFG_ENV_OFFSET_REDUND  0x40000
+#define CONFIG_ENV_SIZE_REDUND 0x20000
+#define CONFIG_ENV_OFFSET_REDUND       0x40000
 
 #endif /* __CONFIG_H */