Index: packages/redboot/current/cdl/redboot.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/redboot/current/cdl/redboot.cdl,v retrieving revision 1.25 diff -u -r1.25 redboot.cdl --- redboot.cdl 2001/08/17 16:37:37 1.25 +++ redboot.cdl 2001/09/13 18:51:12 @@ -124,7 +124,16 @@ puts $::cdl_system_header "#define CYGNUM_HAL_VIRTUAL_VECTOR_AUX_CHANNELS 1" } - cdl_option CYGDAT_REDBOOT_DEFAULT_IP_ADDR { + cdl_option CYGSEM_REDBOOT_NET_DEBUG { + display "Print debug information" + flavor bool + default_value 0 + description " + This option is overriden by the configuration stored in flash. + " + } + + cdl_component CYGDAT_REDBOOT_DEFAULT_IP_ADDR { display "Default IP address" flavor booldata default_value CYGSEM_REDBOOT_FLASH_CONFIG ? 0 : \ @@ -134,7 +143,20 @@ server does not respond. The numbers should be separated by *commas*, and not dots. If an IP address is configured into the Flash configuration, that will be used in preference." + + cdl_option CYGSEM_REDBOOT_DEFAULT_NO_BOOTP { + display "Do not try to use BOOTP" + flavor bool + default_value 0 + requires CYGDAT_REDBOOT_DEFAULT_IP_ADDR + description " + By default Redboot try to use BOOTP to get an IP address. If there's no + BOOTP server on your network use this option to avoid to wait until the + timeout. This option is overriden by the configuration stored in flash." + } + } + cdl_option CYGNUM_REDBOOT_NETWORKING_TCP_PORT { display "TCP port to listen for incoming connections" Index: packages/redboot/current/src/net/net_io.c =================================================================== RCS file: /cvs/ecos/ecos/packages/redboot/current/src/net/net_io.c,v retrieving revision 1.16 diff -u -r1.16 net_io.c --- net_io.c 2001/08/10 19:27:58 1.16 +++ net_io.c 2001/09/13 18:51:12 @@ -535,8 +535,8 @@ cyg_netdevtab_entry_t *t; // Set defaults as appropriate - use_bootp = true; - net_debug = false; + use_bootp = ! CYGSEM_REDBOOT_DEFAULT_NO_BOOTP; + net_debug = CYGSEM_REDBOOT_NET_DEBUG; gdb_port = CYGNUM_REDBOOT_NETWORKING_TCP_PORT; #ifdef CYGSEM_REDBOOT_FLASH_CONFIG // Fetch values from saved config data, if available