mpc83xx: don't disable autoboot

[oweals/u-boot.git] / include / configs / at91cap9adk.h

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index c891fa80ed4721473840766dd1f1b1be5e8602bf..fd06245f4cd9b93a250e1742e9f7ab8a8a792b3c 100644 (file)
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -28,6 +28,7 @@
 #define __CONFIG_H
 
 /* ARM asynchronous clock */
+#define AT91_CPU_NAME          "AT91CAP9"
 #define AT91_MAIN_CLOCK                200000000       /* from 12 MHz crystal */
 #define AT91_MASTER_CLOCK      100000000       /* peripheral = main / 2 */
 #define CFG_HZ                 1000000         /* 1us resolution */
@@ -55,11 +56,19 @@
 #undef CONFIG_USART2
 #define CONFIG_USART3          1       /* USART 3 is DBGU */
 
-#define CONFIG_BOOTDELAY       3
-#define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
-                               "root=/dev/mtdblock1 rw rootfstype=jffs2"
+/* 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
@@ -94,13 +103,13 @@
 #define CFG_SPI_WRITE_TOUT             (5*CFG_HZ)
 #define CFG_MAX_DATAFLASH_BANKS                1
 #define CFG_DATAFLASH_LOGIC_ADDR_CS0   0xC0000000      /* CS0 */
-#define AT91_SPI_CLK                   20000000
-#define DATAFLASH_TCSS                 (0xFA << 16)
-#define DATAFLASH_TCHS                 (0x8 << 24)
+#define AT91_SPI_CLK                   15000000
+#define DATAFLASH_TCSS                 (0x1a << 16)
+#define DATAFLASH_TCHS                 (0x1 << 24)
 
 /* NOR flash */
 #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
@@ -110,6 +119,7 @@
 #define NAND_MAX_CHIPS                 1
 #define CFG_MAX_NAND_DEVICE            1
 #define CFG_NAND_BASE                  0x40000000
+#define CFG_NAND_DBW_8                 1
 
 /* Ethernet */
 #define CONFIG_MACB                    1
@@ -138,22 +148,33 @@
 #ifdef CFG_USE_DATAFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash */
-#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_BOOTCOMMAND     "cp.b 0xC003DE00 0x72000000 0x200040; bootm"
+#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 0x72000000 0x210000; bootm"
+#define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
+                               "root=/dev/mtdblock1 "                  \
+                               "mtdparts=physmap-flash.0:-(nor);"      \
+                               "at91_nand:-(root) "                    \
+                               "rw rootfstype=jffs2"
 
 #else
 
 /* bootstrap + u-boot + env + linux in norflash */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_MONITOR_BASE       (PHYS_FLASH_1 + 0x8000)
-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x4000
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x4000
 #define CONFIG_BOOTCOMMAND     "cp.b 0x10040000 0x72000000 0x200000; bootm"
+#define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
+                               "root=/dev/mtdblock4 "                  \
+                               "mtdparts=physmap-flash.0:16k(bootstrap)ro,"\
+                               "16k(env),224k(uboot)ro,-(linux);"      \
+                               "at91_nand:-(root) "                    \
+                               "rw rootfstype=jffs2"
 
 #endif
 
@@ -171,7 +192,7 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         ROUND(CFG_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN         ROUND(CONFIG_ENV_SIZE + 128*1024, 0x1000)
 #define CFG_GBL_DATA_SIZE      128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32*1024)       /* regular stack */