at91sam9260ek: move board id setup to config header

[karo-tx-uboot.git] / include / configs / trizepsiv.h

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index c2744b5eba501e6fe73c131384e047f81cc3b91f..c1bfe31e46233cf32e6e1123e9291e4461bff172 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -40,12 +40,14 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_PXA27X          1       /* This is an PXA27x CPU    */
+#define CONFIG_CPU_PXA27X              1       /* This is an PXA27x CPU    */
 
 #define CONFIG_MMC             1
-#define BOARD_LATE_INIT                1
+#define CONFIG_BOARD_LATE_INIT
+#define        CONFIG_SYS_TEXT_BASE    0x0
 
-#undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff */
+/* we will never enable dcache, because we have to setup MMU first */
+#define CONFIG_SYS_DCACHE_OFF
 
 #define RTC
 
@@ -53,7 +55,6 @@
  * Size of malloc() pool
  */
 #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
@@ -62,10 +63,11 @@
 /*
  * select serial console configuration
  */
-#define CONFIG_SERIAL_MULTI
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART         1       /* we use FFUART on Conxs */
 #define CONFIG_BTUART         1       /* we use BTUART on Conxs */
 #define CONFIG_STUART         1       /* we use STUART on Conxs */
+#define CONFIG_CONS_INDEX      3
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -146,7 +148,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_HUSH_PARSER         1
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 #define CONFIG_SYS_LONGHELP                            /* undef to save memory         */
 #ifdef CONFIG_SYS_HUSH_PARSER
@@ -168,26 +169,13 @@
 #define CONFIG_SYS_HZ                  1000
 #define CONFIG_SYS_CPUSPEED            0x207           /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */
 
-                                               /* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 #ifdef CONFIG_MMC
-#define CONFIG_PXA_MMC
+#define        CONFIG_GENERIC_MMC
+#define        CONFIG_PXA_MMC_GENERIC
 #define CONFIG_CMD_MMC
 #define CONFIG_SYS_MMC_BASE            0xF0000000
 #endif
 
-/*
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE       (128*1024)      /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ   (4*1024)        /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ   (4*1024)        /* FIQ stack */
-#endif
-
 /*
  * Physical Memory Map
  */
@@ -208,6 +196,9 @@
 
 #define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
 
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define        CONFIG_SYS_INIT_SP_ADDR         (GENERATED_GBL_DATA_SIZE + PHYS_SDRAM_1)
+
 /*
  * GPIO settings
  */
@@ -235,11 +226,17 @@
 #define CONFIG_SYS_GRER1_VAL           0x00000000
 #define CONFIG_SYS_GRER2_VAL           0x00000000
 #define CONFIG_SYS_GRER3_VAL           0x00000000
-#define CONFIG_SYS_GFER0_VAL           0x00000000
+
 #define CONFIG_SYS_GFER1_VAL           0x00000000
-#define CONFIG_SYS_GFER2_VAL           0x00000000
 #define CONFIG_SYS_GFER3_VAL           0x00000020
 
+#if CONFIG_POLARIS
+#define CONFIG_SYS_GFER0_VAL           0x00000001
+#define CONFIG_SYS_GFER2_VAL           0x00200000
+#else
+#define CONFIG_SYS_GFER0_VAL           0x00000000
+#define CONFIG_SYS_GFER2_VAL           0x00000000
+#endif
 
 #define CONFIG_SYS_PSSR_VAL            0x20    /* CHECK */
 
@@ -255,7 +252,11 @@
 
 #define CONFIG_SYS_MSC0_VAL            0x4df84df0
 #define CONFIG_SYS_MSC1_VAL            0x7ff87ff4
+#if CONFIG_POLARIS
+#define CONFIG_SYS_MSC2_VAL            0xa2697ff8
+#else
 #define CONFIG_SYS_MSC2_VAL            0xa26936d4
+#endif
 #define CONFIG_SYS_MDCNFG_VAL          0x880009C9
 #define CONFIG_SYS_MDREFR_VAL          0x20ca201e
 #define CONFIG_SYS_MDMRS_VAL           0x00220022
@@ -275,7 +276,13 @@
 #define CONFIG_SYS_MCIO1_VAL           0x0000c108
 
 #define CONFIG_DRIVER_DM9000           1
-#define CONFIG_DM9000_BASE     0x08000000
+
+#if CONFIG_POLARIS
+#define CONFIG_DM9000_BASE             0x0C800000
+#else
+#define CONFIG_DM9000_BASE             0x08000000
+#endif
+
 #define DM9000_IO                      CONFIG_DM9000_BASE
 #define DM9000_DATA                    (CONFIG_DM9000_BASE+0x8004)
 
@@ -307,6 +314,9 @@
 /* write flash less slowly */
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1
 
+/* Unlock to be used with Intel chips */
+#define CONFIG_SYS_FLASH_PROTECTION    1
+
 /* Flash environment locations */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + CONFIG_SYS_MONITOR_LEN) /* Addr of Environment Sector   */