rename CFG_ macros to CONFIG_SYS

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

diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 04790fd..1649f1f 100644 (file)
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -50,15 +50,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
@@ -74,7 +74,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
@@ -128,20 +128,20 @@
 /*
  * Miscellaneous configurable options
  */
-#define CFG_LONGHELP           /* undef to save memory */
-#define CFG_PROMPT             "=> "
-#define CFG_CBSIZE             256             /* Console I/O Buffer Size */
+#define CONFIG_SYS_LONGHELP            /* undef to save memory */
+#define CONFIG_SYS_PROMPT              "=> "
+#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          CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
-#define CFG_HZ                 1000
+#define CONFIG_SYS_HZ                  1000
 
 #define CONFIG_CMDLINE_EDITING 1
 
@@ -162,11 +162,11 @@
 /*-----------------------------------------------------------------------
  * 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     262             /* max number of sectors on one chip */
-#define CFG_MONITOR_BASE       CFG_FLASH_BASE  /* Monitor at beginning of flash */
-#define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256KiB */
+#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      262             /* max number of sectors on one chip */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE   /* Monitor at beginning of flash */
+#define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256KiB */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CONFIG_ENV_SECT_SIZE   (32 * 1024)
@@ -180,16 +180,16 @@
  * The rest of 32MiB is in 128KiB big sectors. U-Boot occupies the low 4 sectors,
  * if we put environment next to it, we will have to occupy 128KiB for it.
  * Putting it at the top of flash we use only 32KiB. */
-#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + CONFIG_ENV_SECT_SIZE)
 
 /*-----------------------------------------------------------------------
  * 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 CONFIG_FLASH_SPANSION_S29WS_N  1 /* A non-standard buffered write algorithm */
-#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 */
 
 /*
  * JFFS2 partitions