rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index d28f7d8..b4368ef 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -28,6 +28,7 @@
 #define __CONFIG_H
 
 /* ARM asynchronous clock */
+#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 */
@@ -55,9 +56,19 @@
 #undef CONFIG_USART2
 #define CONFIG_USART3          1       /* USART 3 is DBGU */
 
-#define CONFIG_BOOTDELAY       3
+/* LCD */
+#define CONFIG_LCD                     1
+#define LCD_BPP                                LCD_COLOR8
+#define CONFIG_LCD_LOGO                        1
+#undef LCD_TEST_PATTERN
+#define CONFIG_LCD_INFO                        1
+#define CONFIG_LCD_INFO_BELOW_LOGO     1
+#define CFG_WHITE_ON_BLACK             1
+#define CONFIG_ATMEL_LCD               1
+#define CONFIG_ATMEL_LCD_BGR555                1
+#define CFG_CONSOLE_IS_IN_ENV          1
 
-/* #define CONFIG_ENV_OVERWRITE        1 */
+#define CONFIG_BOOTDELAY       3
 
 /*
  * BOOTP options
@@ -102,7 +113,7 @@
 #define CFG_NO_FLASH                   1
 #else
 #define CFG_FLASH_CFI                  1
-#define CFG_FLASH_CFI_DRIVER           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
@@ -143,11 +154,11 @@
 #ifdef CFG_USE_DATAFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CFG_ENV_IS_IN_DATAFLASH        1
+#define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
-#define CFG_ENV_OFFSET         0x4200
-#define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x4200
+#define CONFIG_ENV_OFFSET              0x4200
+#define CONFIG_ENV_ADDR                (CFG_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 " \
                                "root=/dev/mtdblock0 " \
@@ -157,10 +168,10 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND     1
-#define CFG_ENV_OFFSET         0x60000
-#define CFG_ENV_OFFSET_REDUND  0x80000
-#define CFG_ENV_SIZE           0x20000         /* 1 sector = 128 kB */
+#define CONFIG_ENV_IS_IN_NAND  1
+#define CONFIG_ENV_OFFSET              0x60000
+#define CONFIG_ENV_OFFSET_REDUND       0x80000
+#define CONFIG_ENV_SIZE                0x20000         /* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
                                "root=/dev/mtdblock5 " \
@@ -183,7 +194,7 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000)
+#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_STACKSIZE       (32*1024)       /* regular stack */