Fix Stelian's email address

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

diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index fd1a3bdd5360a163c3f2a9656e8ca02dca707938..01c2b3d50ce5f6720500dabfe181b412d333962e 100644 (file)
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -47,7 +47,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
@@ -116,7 +115,9 @@
 #include <configs/omap1510.h>
 
 #define CONFIG_BOOTARGS                "mem=16M console=ttyS0,115200n8 root=/dev/mtdblock3 rw"
+#ifdef CONFIG_STDOUT_USBTTY
 #define CONFIG_PREBOOT         "setenv stdout usbtty;setenv stdin usbtty"
+#endif
 
 /*
  * Miscellaneous configurable options
@@ -131,16 +132,14 @@
 #define CONFIG_SYS_MEMTEST_START       0x10000000      /* memtest works on     */
 #define CONFIG_SYS_MEMTEST_END         0x12000000      /* 32 MB in DRAM        */
 
-#undef CONFIG_SYS_CLKS_IN_HZ           /* everything, incl board info, in Hz */
-
 #define CONFIG_SYS_LOAD_ADDR           0x10000000      /* default load address */
 
-/* The 1510 has 3 timers, they can be driven by the RefClk (12Mhz) or by DPLL1.
+/* The 1510 has 3 timers, they can be driven by the RefClk (12MHz) or by DPLL1.
  * This time is further subdivided by a local divisor.
  */
-#define CONFIG_SYS_TIMERBASE   0xFFFEC500          /* use timer 1 */
-#define CONFIG_SYS_PVT         7                   /* 2^(pvt+1), divide by 256 */
-#define CONFIG_SYS_HZ                  ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PVT))
+#define CONFIG_SYS_TIMERBASE   OMAP1510_TIMER1_BASE    /* use timer 1 */
+#define CONFIG_SYS_PTV         2       /* Divisor: 2^(PTV+1) => 8 */
+#define CONFIG_SYS_HZ          1000
 
 /*-----------------------------------------------------------------------
  * Stack sizes
@@ -167,15 +166,19 @@
 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
+ * V1
+ * PHYS_FLASH_SIZE_1                   (16 << 10)      16 MB
+ * PHYS_FLASH_SIZE_2                   (8 << 10)        8 MB
+ * V2 only 1 flash
+ * PHYS_FLASH_SIZE_1                   (32 << 10)      32 MB
  */
 #define CONFIG_SYS_MAX_FLASH_BANKS     2       /* max number of memory banks */
-#define PHYS_FLASH_SIZE                (16 << 10) /* 16 MB */
 #define PHYS_FLASH_SECT_SIZE   (128*1024) /* Size of a sector (128kB) */
-#define CONFIG_SYS_MAX_FLASH_SECT      (128)   /* max number of sectors on one chip */
+#define CONFIG_SYS_MAX_FLASH_SECT      (256)   /* max number of sectors on one chip */
 #define CONFIG_ENV_ADDR        (CONFIG_SYS_FLASH_BASE + PHYS_FLASH_SECT_SIZE) /* addr of environment */
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE   /* Monitor at beginning of flash */
 #define CONFIG_SYS_MONITOR_LEN         PHYS_FLASH_SECT_SIZE    /* Reserve 1 sector */
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE + PHYS_FLASH_SIZE }
+#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE, PHYS_FLASH_2 }
 
 /*-----------------------------------------------------------------------
  * FLASH driver setup