Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h
index c2238c9..d617868 100644 (file)
--- a/include/configs/FADS850SAR.h
+++ b/include/configs/FADS850SAR.h
@@ -63,6 +63,15 @@
 
 
 /*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
  * Command line configuration.
  */
 #include <config_cmd_default.h>
@@ -144,9 +153,10 @@
 #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_ENV_IS_IN_FLASH     1
-#define CFG_ENV_OFFSET         0x00040000      /* Offset of Environment Sector */
-#define        CFG_ENV_SIZE            0x40000 /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_IS_IN_FLASH  1
+#define CONFIG_ENV_OFFSET              0x00040000      /* Offset of Environment Sector */
+#define        CONFIG_ENV_SIZE         0x40000 /* Total Size of Environment Sector     */
+#define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
@@ -400,10 +410,6 @@
 */
 #define NR_8259_INTS   0
 
-/* Machine type
-*/
-#define _MACH_8xx (_MACH_fads)
-
 #define CONFIG_DISK_SPINUP_TIME 1000000