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

[u-boot] / include / configs / hcu4.h

diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index e29cfe7ad594c905e5021b820ea76275763785c8..d99ac5355e64d00f0236d3cc51f509c4e6a68aac 100644 (file)
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -1,5 +1,5 @@
 /*
- *(C) Copyright 2005-2007 Netstal Maschinen AG
+ *(C) Copyright 2005-2008 Netstal Maschinen AG
  *    Niklaus Giger (Niklaus.Giger@netstal.com)
  *
  * See file CREDITS for list of people who contributed to this
@@ -103,13 +103,19 @@
  * Flash
  *----------------------------------------------------------------------*/
 
-#define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
-#define CFG_MAX_FLASH_SECT     8       /* max number of sectors on one chip */
+/* Use common CFI driver */
+#define CFG_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
+/* board provides its own flash_init code */
+#define CONFIG_FLASH_CFI_LEGACY                1
+#define CFG_FLASH_CFI_WIDTH            FLASH_CFI_8BIT
+#define CFG_FLASH_LEGACY_512Kx8 1
 
-#define CFG_FLASH_EMPTY_INFO   /* print 'E' for empty sector on flinfo */
+/* print 'E' for empty sector on flinfo */
+#define CFG_FLASH_EMPTY_INFO
 
-#define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
-#define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
+#define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
+#define CFG_MAX_FLASH_SECT     8       /* max number of sectors on one chip */
 
 /*-----------------------------------------------------------------------
  * Environment
@@ -121,14 +127,14 @@
 
 #ifdef  CFG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
-#define PROM_SIZE      2048
+#define PROM_SIZE      2048
 #define CFG_ENV_OFFSET  512
 #define CFG_ENV_SIZE   (PROM_SIZE-CFG_ENV_OFFSET)
 #endif
 
 #ifdef CFG_ENV_IS_IN_FLASH
 /* Put the environment in Flash */
-#define CFG_ENV_SECT_SIZE      0x10000         /* size of one complete sector  */
+#define CFG_ENV_SECT_SIZE      0x10000 /* size of one complete sector  */
 #define CFG_ENV_ADDR           ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
 #define        CFG_ENV_SIZE            8*1024  /* 8 KB Environment Sector      */
 
@@ -192,7 +198,7 @@
        "load=tftp 100000 hcu4/u-boot.bin\0"                            \
        "update=protect off FFFB0000 FFFFFFFF;era FFFB0000 FFFFFFFF;"   \
                "cp.b 100000 FFFB0000 50000\0"                          \
-       "upd=run load;run update\0"                                     \
+       "upd=run load update\0"                                         \
        "vx_rom=hcu4/hcu4_vx_rom\0"                                     \
        "vx=tftp ${loadaddr} ${vx_rom};run vxargs; bootvx\0"            \
        "vxargs=setenv bootargs emac(0,0)c:${vx_rom} e=${ipaddr}"       \