rename CFG_ macros to CONFIG_SYS

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

diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 9a655aa..6c150ae 100644 (file)
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -53,15 +53,15 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128 * 1024)
-#define CFG_GBL_DATA_SIZE      128  /* size in bytes reserved for initial data */
+#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128 * 1024)
+#define CONFIG_SYS_GBL_DATA_SIZE       128  /* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
  */
 
 #define CONFIG_MX31_UART       1
-#define CFG_MX31_UART1         1
+#define CONFIG_SYS_MX31_UART1          1
 
 #define CONFIG_HARD_SPI                1
 #define CONFIG_MXC_SPI         1
@@ -77,7 +77,7 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                115200
-#define CFG_BAUDRATE_TABLE     {9600, 19200, 38400, 57600, 115200}
+#define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
@@ -111,20 +111,20 @@
 /*
  * Miscellaneous configurable options
  */
-#define CFG_LONGHELP           /* undef to save memory */
-#define CFG_PROMPT             "uboot> "
-#define CFG_CBSIZE             256  /* Console I/O Buffer Size */
+#define CONFIG_SYS_LONGHELP            /* undef to save memory */
+#define CONFIG_SYS_PROMPT              "uboot> "
+#define CONFIG_SYS_CBSIZE              256  /* Console I/O Buffer Size */
 /* Print Buffer Size */
-#define CFG_PBSIZE             (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)
-#define CFG_MAXARGS            16          /* max number of command args */
-#define CFG_BARGSIZE           CFG_CBSIZE  /* Boot Argument Buffer Size */
+#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
+#define CONFIG_SYS_MAXARGS             16          /* max number of command args */
+#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE  /* Boot Argument Buffer Size */
 
-#define CFG_MEMTEST_START      0  /* memtest works on */
-#define CFG_MEMTEST_END                0x10000
+#define CONFIG_SYS_MEMTEST_START       0  /* memtest works on */
+#define CONFIG_SYS_MEMTEST_END         0x10000
 
-#define CFG_LOAD_ADDR          0 /* default load address */
+#define CONFIG_SYS_LOAD_ADDR           0 /* default load address */
 
-#define CFG_HZ                 1000
+#define CONFIG_SYS_HZ                  1000
 
 #define CONFIG_CMDLINE_EDITING 1
 
@@ -145,12 +145,12 @@
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CFG_FLASH_BASE         CS0_BASE
-#define CFG_MAX_FLASH_BANKS    1           /* max number of memory banks */
-#define CFG_MAX_FLASH_SECT     128          /* max number of sectors on one chip */
-#define CFG_MONITOR_BASE       CFG_FLASH_BASE /* Monitor at beginning of flash */
+#define CONFIG_SYS_FLASH_BASE          CS0_BASE
+#define CONFIG_SYS_MAX_FLASH_BANKS     1           /* max number of memory banks */
+#define CONFIG_SYS_MAX_FLASH_SECT      128          /* max number of sectors on one chip */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE /* Monitor at beginning of flash */
 
-#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x001f0000)
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + 0x001f0000)
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CONFIG_ENV_SECT_SIZE   (64 * 1024)
 #define CONFIG_ENV_SIZE                (64 * 1024)
@@ -158,14 +158,14 @@
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup
  */
-#define CFG_FLASH_CFI          1       /* Flash memory is CFI compliant */
+#define CONFIG_SYS_FLASH_CFI           1       /* Flash memory is CFI compliant */
 #define CONFIG_FLASH_CFI_DRIVER        1       /* Use drivers/cfi_flash.c */
-#define CFG_FLASH_USE_BUFFER_WRITE 1   /* Use buffered writes (~10x faster) */
-#define CFG_FLASH_PROTECTION   1       /* Use hardware sector protection */
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1    /* Use buffered writes (~10x faster) */
+#define CONFIG_SYS_FLASH_PROTECTION    1       /* Use hardware sector protection */
 
 /* timeout values are in ticks */
-#define CFG_FLASH_ERASE_TOUT   (100*CFG_HZ) /* Timeout for Flash Erase */
-#define CFG_FLASH_WRITE_TOUT   (100*CFG_HZ) /* Timeout for Flash Write */
+#define CONFIG_SYS_FLASH_ERASE_TOUT    (100*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
+#define CONFIG_SYS_FLASH_WRITE_TOUT    (100*CONFIG_SYS_HZ) /* Timeout for Flash Write */
 
 /*
  * JFFS2 partitions