rename CFG_ macros to CONFIG_SYS

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

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index b4368ef..555cb7f 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -31,7 +31,7 @@
 #define AT91_CPU_NAME          "AT91SAM9263"
 #define AT91_MAIN_CLOCK                199919000       /* from 16.367 MHz crystal */
 #define AT91_MASTER_CLOCK      99959500        /* peripheral = main / 2 */
-#define CFG_HZ                 1000000         /* 1us resolution */
+#define CONFIG_SYS_HZ                  1000000         /* 1us resolution */
 
 #define AT91_SLOW_CLOCK                32768   /* slow clock */
 
@@ -63,10 +63,10 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO                        1
 #define CONFIG_LCD_INFO_BELOW_LOGO     1
-#define CFG_WHITE_ON_BLACK             1
+#define CONFIG_SYS_WHITE_ON_BLACK              1
 #define CONFIG_ATMEL_LCD               1
 #define CONFIG_ATMEL_LCD_BGR555                1
-#define CFG_CONSOLE_IS_IN_ENV          1
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV           1
 
 #define CONFIG_BOOTDELAY       3
 
@@ -101,30 +101,30 @@
 
 /* DataFlash */
 #define CONFIG_HAS_DATAFLASH           1
-#define CFG_SPI_WRITE_TOUT             (5*CFG_HZ)
-#define CFG_MAX_DATAFLASH_BANKS                1
-#define CFG_DATAFLASH_LOGIC_ADDR_CS0   0xC0000000      /* CS0 */
+#define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
+#define CONFIG_SYS_MAX_DATAFLASH_BANKS         1
+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0    0xC0000000      /* CS0 */
 #define AT91_SPI_CLK                   15000000
 #define DATAFLASH_TCSS                 (0x1a << 16)
 #define DATAFLASH_TCHS                 (0x1 << 24)
 
 /* NOR flash, if populated */
 #if 1
-#define CFG_NO_FLASH                   1
+#define CONFIG_SYS_NO_FLASH                    1
 #else
-#define CFG_FLASH_CFI                  1
+#define CONFIG_SYS_FLASH_CFI                   1
 #define CONFIG_FLASH_CFI_DRIVER                1
 #define PHYS_FLASH_1                   0x10000000
-#define CFG_FLASH_BASE                 PHYS_FLASH_1
-#define CFG_MAX_FLASH_SECT             256
-#define CFG_MAX_FLASH_BANKS            1
+#define CONFIG_SYS_FLASH_BASE                  PHYS_FLASH_1
+#define CONFIG_SYS_MAX_FLASH_SECT              256
+#define CONFIG_SYS_MAX_FLASH_BANKS             1
 #endif
 
 /* NAND flash */
 #define NAND_MAX_CHIPS                 1
-#define CFG_MAX_NAND_DEVICE            1
-#define CFG_NAND_BASE                  0x40000000
-#define CFG_NAND_DBW_8                 1
+#define CONFIG_SYS_MAX_NAND_DEVICE             1
+#define CONFIG_SYS_NAND_BASE                   0x40000000
+#define CONFIG_SYS_NAND_DBW_8                  1
 
 /* Ethernet */
 #define CONFIG_MACB                    1
@@ -137,27 +137,27 @@
 #define CONFIG_USB_OHCI_NEW            1
 #define LITTLEENDIAN                   1
 #define CONFIG_DOS_PARTITION           1
-#define CFG_USB_OHCI_CPU_INIT          1
-#define CFG_USB_OHCI_REGS_BASE         0x00a00000      /* AT91SAM9263_UHP_BASE */
-#define CFG_USB_OHCI_SLOT_NAME         "at91sam9263"
-#define CFG_USB_OHCI_MAX_ROOT_PORTS    2
+#define CONFIG_SYS_USB_OHCI_CPU_INIT           1
+#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00a00000      /* AT91SAM9263_UHP_BASE */
+#define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9263"
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
 #define CONFIG_USB_STORAGE             1
 
-#define CFG_LOAD_ADDR                  0x22000000      /* load address */
+#define CONFIG_SYS_LOAD_ADDR                   0x22000000      /* load address */
 
-#define CFG_MEMTEST_START              PHYS_SDRAM
-#define CFG_MEMTEST_END                        0x23e00000
+#define CONFIG_SYS_MEMTEST_START               PHYS_SDRAM
+#define CONFIG_SYS_MEMTEST_END                 0x23e00000
 
-#define CFG_USE_DATAFLASH              1
-#undef CFG_USE_NANDFLASH
+#define CONFIG_SYS_USE_DATAFLASH               1
+#undef CONFIG_SYS_USE_NANDFLASH
 
-#ifdef CFG_USE_DATAFLASH
+#ifdef CONFIG_SYS_USE_DATAFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_ENV_IS_IN_DATAFLASH     1
-#define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+#define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CONFIG_ENV_OFFSET              0x4200
-#define CONFIG_ENV_ADDR                (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
 #define CONFIG_ENV_SIZE                0x4200
 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
@@ -165,7 +165,7 @@
                                "mtdparts=at91_nand:-(root) "\
                                "rw rootfstype=jffs2"
 
-#else /* CFG_USE_NANDFLASH */
+#else /* CONFIG_SYS_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND  1
@@ -181,21 +181,21 @@
 #endif
 
 #define CONFIG_BAUDRATE                115200
-#define CFG_BAUDRATE_TABLE     {115200 , 19200, 38400, 57600, 9600 }
+#define CONFIG_SYS_BAUDRATE_TABLE      {115200 , 19200, 38400, 57600, 9600 }
 
-#define CFG_PROMPT             "U-Boot> "
-#define CFG_CBSIZE             256
-#define CFG_MAXARGS            16
-#define CFG_PBSIZE             (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
-#define CFG_LONGHELP           1
+#define CONFIG_SYS_PROMPT              "U-Boot> "
+#define CONFIG_SYS_CBSIZE              256
+#define CONFIG_SYS_MAXARGS             16
+#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
 #define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
-#define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
+#define CONFIG_SYS_MALLOC_LEN          ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
+#define CONFIG_SYS_GBL_DATA_SIZE       128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */