Merge with /home/sr/git/u-boot/cfi-flash

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

diff --git a/include/configs/OXC.h b/include/configs/OXC.h
index 7a60e4b6eef4aa24d97f6c8f3babc5033fa60747..787407c5eb85b64177a92cb8c905bb0b66e8233c 100644 (file)
--- a/include/configs/OXC.h
+++ b/include/configs/OXC.h
@@ -39,7 +39,7 @@
 #define CONFIG_MPC8240         1
 #define CONFIG_OXC             1
 
-#define CONFIG_BOARD_PRE_INIT  1       /* Call board_pre_init  */
+#define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f      */
 
 #define CONFIG_IDENT_STRING     " [oxc] "
 
@@ -94,6 +94,7 @@
 #define CONFIG_NET_MULTI                       /* Multi ethernet cards support */
 
 #define CONFIG_EEPRO100                                /* Ethernet Express PRO 100     */
+#define CFG_RX_ETH_BUFFER      8               /* use 8 rx buffer on eepro100  */
 
 #define PCI_ENET0_IOADDR       0x80000000
 #define PCI_ENET0_MEMADDR      0x80000000
@@ -180,8 +181,9 @@
  */
 
 #define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR           0xFFF30000      /* Offset of Environment Sector */
+#define CFG_ENV_ADDR           0xFFF30000      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x00010000      /* Total Size of Environment Sector */
+#define        CFG_ENV_IS_EMBEDDED     1               /* short-cut compile-time test  */
 #define CONFIG_ENV_OVERWRITE    1              /* Allow modifying the environment */
 
 /*