diff options
| author | stroese <stroese> | 2003-08-28 14:17:32 +0000 |
|---|---|---|
| committer | stroese <stroese> | 2003-08-28 14:17:32 +0000 |
| commit | fe389a82c9f9f29c54768e3b3ac947487ff85d59 (patch) | |
| tree | fcc90efe718cf41f033b77417c87aa79cabf6464 /include | |
| parent | d94f92cbd7f4a4d3bf0d5d963b709c686e8f6633 (diff) | |
| download | blackbird-obmc-uboot-fe389a82c9f9f29c54768e3b3ac947487ff85d59.tar.gz blackbird-obmc-uboot-fe389a82c9f9f29c54768e3b3ac947487ff85d59.zip | |
- Added CONFIG_BOOTP_DNS2 and CONFIG_BOOTP_SEND_HOSTNAME to CONFIG_BOOTP_MASK.
Diffstat (limited to 'include')
| -rw-r--r-- | include/cmd_confdefs.h | 2 | ||||
| -rw-r--r-- | include/configs/CPCI405.h | 10 | ||||
| -rw-r--r-- | include/configs/CPCI4052.h | 10 | ||||
| -rw-r--r-- | include/configs/CPCI405AB.h | 5 | ||||
| -rw-r--r-- | include/net.h | 3 |
5 files changed, 17 insertions, 13 deletions
diff --git a/include/cmd_confdefs.h b/include/cmd_confdefs.h index 8b8b0f58e7..d7f1fd4fed 100644 --- a/include/cmd_confdefs.h +++ b/include/cmd_confdefs.h @@ -148,6 +148,8 @@ #define CONFIG_BOOTP_BOOTPATH 0x00000010 #define CONFIG_BOOTP_BOOTFILESIZE 0x00000020 #define CONFIG_BOOTP_DNS 0x00000040 +#define CONFIG_BOOTP_DNS2 0x00000080 +#define CONFIG_BOOTP_SEND_HOSTNAME 0x00000100 #define CONFIG_BOOTP_VENDOREX 0x80000000 diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h index 4be94ed854..b877043712 100644 --- a/include/configs/CPCI405.h +++ b/include/configs/CPCI405.h @@ -69,12 +69,10 @@ #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_PHY_ADDR 0 /* PHY address */ -#if 0 /* test-only */ -#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \ - CONFIG_BOOTP_VENDOREX) -#else -#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT) -#endif +#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \ + CONFIG_BOOTP_DNS | \ + CONFIG_BOOTP_DNS2 | \ + CONFIG_BOOTP_SEND_HOSTNAME ) #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_DHCP | \ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 1f9d39c606..dd2fa7ffea 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -72,12 +72,10 @@ #define CONFIG_RTC_M48T35A 1 /* ST Electronics M48 timekeeper */ -#if 0 /* test-only */ -#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \ - CONFIG_BOOTP_VENDOREX) -#else -#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT) -#endif +#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \ + CONFIG_BOOTP_DNS | \ + CONFIG_BOOTP_DNS2 | \ + CONFIG_BOOTP_SEND_HOSTNAME ) #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_DHCP | \ diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h index 00adfd5998..d55b51eb97 100644 --- a/include/configs/CPCI405AB.h +++ b/include/configs/CPCI405AB.h @@ -65,7 +65,10 @@ #define CONFIG_RTC_M48T35A 1 /* ST Electronics M48 timekeeper */ -#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT) +#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \ + CONFIG_BOOTP_DNS | \ + CONFIG_BOOTP_DNS2 | \ + CONFIG_BOOTP_SEND_HOSTNAME ) #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ CFG_CMD_DHCP | \ diff --git a/include/net.h b/include/net.h index dd8d378045..2d4aa94d0d 100644 --- a/include/net.h +++ b/include/net.h @@ -275,6 +275,9 @@ typedef struct icmphdr { extern IPaddr_t NetOurGatewayIP; /* Our gateway IP addresse */ extern IPaddr_t NetOurSubnetMask; /* Our subnet mask (0 = unknown)*/ extern IPaddr_t NetOurDNSIP; /* Our Domain Name Server (0 = unknown)*/ +#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2) +extern IPaddr_t NetOurDNS2IP; /* Our 2nd Domain Name Server (0 = unknown)*/ +#endif extern char NetOurNISDomain[32]; /* Our NIS domain */ extern char NetOurHostName[32]; /* Our hostname */ extern char NetOurRootPath[64]; /* Our root path */ |
