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

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

diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index e1806a7..5b5c6eb 100644 (file)
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -49,20 +49,20 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE       128     /* size in bytes reserved for initial
                                         * data */
 
 /*
  * Hardware drivers
  */
-#define CFG_NS9750_UART                        1       /* use on-chip UART */
+#define CONFIG_NS9750_UART             1       /* use on-chip UART */
 #define CONFIG_DRIVER_NS9750_ETHERNET  1       /* use on-chip ethernet */
 
 /*
  * select serial console configuration
  */
-#define CONFIG_CONS_INDEX          1           /* Port B */
+#define CONFIG_CONS_INDEX          1           /* Port B */
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -71,6 +71,15 @@
 
 
 /*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
  * Command line configuration.
  */
 
@@ -84,7 +93,7 @@
 
 
 #define CONFIG_BOOTDELAY       3
-/*#define CONFIG_BOOTARGS      "root=ramfs devfs=mount console=ttySA0,9600" */
+/*#define CONFIG_BOOTARGS      "root=ramfs devfs=mount console=ttySA0,9600" */
 
 #define CONFIG_ETHADDR         00:04:f3:ff:ff:fb /*@TODO unset */
 #define CONFIG_NETMASK          255.255.255.0
@@ -163,12 +172,12 @@
 #ifdef CONFIG_AMD_LV800
 #define PHYS_FLASH_SIZE                0x00100000 /* 1MB */
 #define CFG_MAX_FLASH_SECT     (19)    /* max number of sectors on one chip */
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
 #endif
 #ifdef CONFIG_AMD_LV400
 #define PHYS_FLASH_SIZE                0x00080000 /* 512KB */
 #define CFG_MAX_FLASH_SECT     (11)    /* max number of sectors on one chip */
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x070000) /* addr of environment */
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x070000) /* addr of environment */
 #endif
 
 /* timeout values are in ticks */
@@ -176,9 +185,9 @@
 #define CFG_FLASH_WRITE_TOUT   (5*CFG_HZ) /* Timeout for Flash Write */
 
 /* @TODO */
-/*#define      CFG_ENV_IS_IN_FLASH     1*/
-#define CFG_ENV_IS_NOWHERE
-#define CFG_ENV_SIZE           0x10000 /* Total Size of Environment Sector */
+/*#define      CONFIG_ENV_IS_IN_FLASH  1*/
+#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_SIZE                0x10000 /* Total Size of Environment Sector */
 
 #ifdef CONFIG_STATUS_LED