Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include/configs/[a-m]*: Directly use CONFIG_BOOTP_* symbols rather than CONFIG_BOOTP_MASK.

Browse Source 
Signed-off-by: Jon Loeliger <jdl@freescale.com>
master
Jon Loeliger 18 years ago
parent 37d4bb7058
commit 2fd90ce575
20 changed files with 147 additions and 40 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      include/configs/armadillo.h
  2. 9
      include/configs/assabet.h
  3. 10
      include/configs/atc.h
  4. 8
      include/configs/atstk1002.h
  5. 16
      include/configs/barco.h
  6. 10
      include/configs/c2mon.h
  7. 12
      include/configs/csb272.h
  8. 13
      include/configs/csb472.h
  9. 9
      include/configs/ep7312.h
  10. 9
      include/configs/evb4510.h
  11. 9
      include/configs/gcplus.h
  12. 15
      include/configs/gw8260.h
  13. 9
      include/configs/hermes.h
  14. 9
      include/configs/impa7.h
  15. 1
      include/configs/integratorap.h
  16. 2
      include/configs/integratorcp.h
  17. 10
      include/configs/kvme080.h
  18. 9
      include/configs/lpc2292sodimm.h
  19. 9
      include/configs/lwmon.h
  20. 9
      include/configs/modnet50.h

9
include/configs/armadillo.h
Unescape View File

@ -71,7 +71,14 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
/* /*

9
include/configs/assabet.h
Unescape View File

@ -75,7 +75,14 @@
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySA0,115200n8 root=/dev/nfs ip=bootp" #define CONFIG_BOOTARGS "console=ttySA0,115200n8 root=/dev/nfs ip=bootp"

10
include/configs/atc.h
Unescape View File

@ -122,7 +122,15 @@
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#undef CFG_LOADS_BAUD_CHANGE /* don't allow baudrate change */ #undef CFG_LOADS_BAUD_CHANGE /* don't allow baudrate change */
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
/*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
/* /*

8
include/configs/atstk1002.h
Unescape View File

@ -108,8 +108,12 @@
#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 #define CONFIG_OVERWRITE_ETHADDR_ONCE 1
#define CONFIG_NET_MULTI 1 #define CONFIG_NET_MULTI 1
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_SUBNETMASK \ /*
| CONFIG_BOOTP_GATEWAY) * BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
/* /*
* Command line configuration. * Command line configuration.

16
include/configs/barco.h
Unescape View File

@ -70,13 +70,17 @@
#define CONFIG_BOOTARGS "mem=32M" #define CONFIG_BOOTARGS "mem=32M"
/* Add support for a few extra bootp options like:
* - File size /*
* - DNS * BOOTP options
*/ */
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \ #define CONFIG_BOOTP_SUBNETMASK
CONFIG_BOOTP_BOOTFILESIZE | \ #define CONFIG_BOOTP_GATEWAY
CONFIG_BOOTP_DNS) #define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_DNS
/* /*
* Command line configuration. * Command line configuration.

10
include/configs/c2mon.h
Unescape View File

@ -68,7 +68,15 @@
#undef CONFIG_CAN_DRIVER /* CAN Driver support disabled */ #undef CONFIG_CAN_DRIVER /* CAN Driver support disabled */
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

12
include/configs/csb272.h
Unescape View File

@ -73,12 +73,14 @@
#endif #endif
/* /*
* BOOTP/DHCP protocol configuration * BOOTP options
*
*/ */
#define CONFIG_BOOTP_MASK ( CONFIG_BOOTP_DEFAULT | \ #define CONFIG_BOOTP_SUBNETMASK
CONFIG_BOOTP_DNS2 | \ #define CONFIG_BOOTP_GATEWAY
CONFIG_BOOTP_BOOTFILESIZE ) #define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_DNS2
/* /*

13
include/configs/csb472.h
Unescape View File

@ -73,12 +73,15 @@
#endif #endif
/* /*
* BOOTP/DHCP protocol configuration * BOOTP options
*
*/ */
#define CONFIG_BOOTP_MASK ( CONFIG_BOOTP_DEFAULT | \ #define CONFIG_BOOTP_SUBNETMASK
CONFIG_BOOTP_DNS2 | \ #define CONFIG_BOOTP_GATEWAY
CONFIG_BOOTP_BOOTFILESIZE ) #define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_DNS2
/* /*
* Command line configuration. * Command line configuration.

9
include/configs/ep7312.h
Unescape View File

@ -62,7 +62,14 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
/* /*

9
include/configs/evb4510.h
Unescape View File

@ -72,7 +72,14 @@
#define CONFIG_BAUDRATE 19200 #define CONFIG_BAUDRATE 19200
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
/* /*

9
include/configs/gcplus.h
Unescape View File

@ -88,7 +88,14 @@
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySA0,38400n8 mtdparts=sa1100-flash:1m@0(zImage),3m@1m(ramdisk.gz),12m@4m(userfs) root=/dev/nfs ip=bootp" #define CONFIG_BOOTARGS "console=ttySA0,38400n8 mtdparts=sa1100-flash:1m@0(zImage),3m@1m(ramdisk.gz),12m@4m(userfs) root=/dev/nfs ip=bootp"

15
include/configs/gw8260.h
Unescape View File

@ -285,13 +285,16 @@
#undef CONFIG_AUTOBOOT_DELAY_STR #undef CONFIG_AUTOBOOT_DELAY_STR
#define DEBUG_BOOTKEYS 0 #define DEBUG_BOOTKEYS 0
/* Add support for a few extra bootp options like: /*
* - File size * BOOTP options
* - DNS
*/ */
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \ #define CONFIG_BOOTP_SUBNETMASK
CONFIG_BOOTP_BOOTFILESIZE | \ #define CONFIG_BOOTP_GATEWAY
CONFIG_BOOTP_DNS) #define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
#definef CONFIG_BOOTP_DNS
/* undef this to save memory */ /* undef this to save memory */
#define CFG_LONGHELP #define CFG_LONGHELP

9
include/configs/hermes.h
Unescape View File

@ -71,7 +71,14 @@
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options

9
include/configs/impa7.h
Unescape View File

@ -61,7 +61,14 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
/* /*

1
include/configs/integratorap.h
Unescape View File

@ -67,7 +67,6 @@
#define CFG_SERIAL1 0x17000000 #define CFG_SERIAL1 0x17000000
/*#define CONFIG_NET_MULTI */ /*#define CONFIG_NET_MULTI */
/*#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT */
/* /*

2
include/configs/integratorcp.h
Unescape View File

@ -84,8 +84,6 @@
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
/* #define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT */
#if 0 #if 0
#define CONFIG_BOOTDELAY 2 #define CONFIG_BOOTDELAY 2
#define CONFIG_BOOTARGS "root=/dev/nfs nfsroot=<IP address>:/<exported rootfs> mem=128M ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" #define CONFIG_BOOTARGS "root=/dev/nfs nfsroot=<IP address>:/<exported rootfs> mem=128M ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"

10
include/configs/kvme080.h
Unescape View File

@ -60,7 +60,15 @@
#undef CONFIG_WATCHDOG #undef CONFIG_WATCHDOG
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

9
include/configs/lpc2292sodimm.h
Unescape View File

@ -66,7 +66,14 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
/* /*

9
include/configs/lwmon.h
Unescape View File

@ -196,7 +196,14 @@
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
/* /*

9
include/configs/modnet50.h
Unescape View File

@ -63,7 +63,14 @@
#define CONFIG_BAUDRATE 38400 #define CONFIG_BAUDRATE 38400
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) /*
* BOOTP options
*/
#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
/* /*

Write Preview
Loading…
Cancel
Save