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

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

diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h
index 86b6ea1..c33ca2d 100644 (file)
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -35,6 +35,7 @@
  * (easy to change)
  */
 #define CONFIG_CPU_MONAHANS    1       /* Intel Monahan CPU    */
+#define        CONFIG_CPU_PXA320
 #define CONFIG_ZYLONITE                1       /* Zylonite board       */
 
 /* #define CONFIG_LCD          1 */
@@ -62,7 +63,7 @@
 
 #undef TURN_ON_ETHERNET
 #ifdef TURN_ON_ETHERNET
-# define CONFIG_DRIVER_SMC91111 1
+# define CONFIG_SMC91111 1
 # define CONFIG_SMC91111_BASE   0x14000300
 # define CONFIG_SMC91111_EXT_PHY
 # define CONFIG_SMC_USE_32_BIT
@@ -189,6 +190,8 @@
 
 #undef CONFIG_SYS_SKIP_DRAM_SCRUB
 
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define        CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_GBL_DATA_SIZE + PHYS_SDRAM_1)
 
 /*
  * NAND Flash
@@ -205,8 +208,6 @@
 #define CONFIG_SYS_NAND_SENDCMD_RETRY  3
 #undef NAND_ALLOW_ERASE_ALL    /* Allow erasing bad blocks - don't use */
 
-#define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
-
 /* NAND Timing Parameters (in ns) */
 #define NAND_TIMING_tCH                10
 #define NAND_TIMING_tCS                0