Merge branch 'master' of git://git.denx.de/u-boot-microblaze

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

diff --git a/include/configs/netstar.h b/include/configs/netstar.h
index 39560de..f0b4207 100644 (file)
--- a/include/configs/netstar.h
+++ b/include/configs/netstar.h
@@ -110,6 +110,8 @@
 #define CONFIG_SYS_NAND_BASE           0x04000000 + (2 << 23)
 #define NAND_ALLOW_ERASE_ALL           1
 
+#define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
+
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED           100000
 #define CONFIG_SYS_I2C_SLAVE           1
@@ -130,6 +132,8 @@
  * partitions (mtdparts command line support)
  */
 #define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
 #define MTDIDS_DEFAULT         "nor0=omapflash.0,nand0=omapnand.0"
 #define MTDPARTS_DEFAULT       "mtdparts=" \
        "omapflash.0:8k@16k(env),8k(r_env),448k@576k(u-boot);" \
@@ -222,12 +226,12 @@
 
 #define CONFIG_SYS_LOAD_ADDR           PHYS_SDRAM_1 + 0x400000 /* 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           OMAP1510_TIMER1_BASE
-#define CONFIG_SYS_PTV                 7               /* 2^(pvt+1), divide by 256 */
-#define CONFIG_SYS_HZ                  ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))
+#define CONFIG_SYS_PTV                 7
+#define CONFIG_SYS_HZ                  1000
 
 #define OMAP5910_DPLL_DIV      1
 #define OMAP5910_DPLL_MUL      ((CONFIG_SYS_CLK_FREQ * \