Merge with /home/m8/git/u-boot

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

diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h
index f23300d004b63163c78ccd5576c395fe81ad1c3c..4232d504ee9148066e6fda0352ae514cd01cf2a1 100644 (file)
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -36,6 +36,7 @@
  */
 #define CONFIG_CPU_MONAHANS    1       /* Intel Monahan CPU    */
 #define CONFIG_ZYLONITE                1       /* Zylonite board       */
+
 /* #define CONFIG_LCD          1 */
 #ifdef CONFIG_LCD
 #define CONFIG_SHARP_LM8V31
@@ -62,7 +63,7 @@
 # define CONFIG_SMC91111_BASE   0x14000300
 # define CONFIG_SMC91111_EXT_PHY
 # define CONFIG_SMC_USE_32_BIT
-# undef CONFIG_SMC_USE_IOFUNCS
+# undef CONFIG_SMC_USE_IOFUNCS          /* just for use with the kernel */
 #endif
 
 /*
@@ -77,7 +78,7 @@
 
 /* #define CONFIG_COMMANDS       (CONFIG_CMD_DFL | CFG_CMD_MMC | CFG_CMD_FAT) */
 #ifdef TURN_ON_ETHERNET
-# define CONFIG_COMMANDS        (CONFIG_CMD_DFL)
+# define CONFIG_COMMANDS        (CONFIG_CMD_DFL | CFG_CMD_PING)
 #else
 # define CONFIG_COMMANDS       (CONFIG_CMD_DFL & ~CFG_CMD_NET)
 #endif
@@ -86,7 +87,7 @@
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
 
-#define CONFIG_BOOTDELAY       3
+#define CONFIG_BOOTDELAY       -1
 #define CONFIG_ETHADDR         08:00:3e:26:0a:5b
 #define CONFIG_NETMASK         255.255.0.0
 #define CONFIG_IPADDR          192.168.0.21
@@ -119,8 +120,8 @@
 #define CFG_BARGSIZE           CFG_CBSIZE      /* Boot Argument Buffer Size    */
 #define CFG_DEVICE_NULLDEV     1
 
-#define CFG_MEMTEST_START      0xa0400000      /* memtest works on     */
-#define CFG_MEMTEST_END                0xa0800000      /* 4 ... 8 MB in DRAM   */
+#define CFG_MEMTEST_START      0x9c000000      /* memtest works on     */
+#define CFG_MEMTEST_END                0x9c400000      /* 4 ... 8 MB in DRAM   */
 
 #undef CFG_CLKS_IN_HZ          /* everything, incl board info, in Hz */
 
@@ -230,7 +231,8 @@
  * second sector, not an environment.  You have been warned!
  */
 #define        CFG_MONITOR_LEN         PHYS_FLASH_SECT_SIZE
-#undef  CFG_ENV_IS_IN_FLASH
+
+#define CFG_ENV_IS_IN_FLASH     1
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
 #define CFG_ENV_SECT_SIZE      PHYS_FLASH_SECT_SIZE
 #define CFG_ENV_SIZE           (PHYS_FLASH_SECT_SIZE / 16)