Merge branch 'xl0-timer'

diff --combined src/config.h
index e5d8b11,67fdd64..e004f23
--- 1/src/config.h
--- 2/src/config.h
+++ b/src/config.h
@@@ -51,6 -51,16 +51,16 @@@
  
  /* @END serial.h */
  
+ /* @BEGIN general.h
+  *
+  * Timer configuration
+  *
+  */
+ #define TIMER_BIOS            /* 18Hz BIOS timer */
+ #define TIMER_RDTSC           /* CPU TimeStamp Counter timer */
+ 
+ /* @END general.h */
+ 
  /* @BEGIN isa.h
   *
   * ISA probe address configuration
@@@ -125,7 -135,6 +135,7 @@@
  #define       ROUTE_CMD               /* Routing table management commands */
  #define IMAGE_CMD             /* Image management commands */
  #define DHCP_CMD              /* DHCP management commands */
 +#define SANBOOT_CMD           /* SAN boot commands */
  
  /* @END general.h */ 
  

diff --combined src/core/config.c
index e7db221,94fd0b8..24db355
--- 1/src/core/config.c
--- 2/src/core/config.c
+++ b/src/core/config.c
@@@ -74,6 -74,17 +74,17 @@@ REQUIRE_OBJECT ( pc_kbd )
  REQUIRE_OBJECT ( syslog );
  #endif
  
+ /*
+  * Timers
+  */
+ 
+ #ifdef TIMER_BIOS
+ REQUIRE_OBJECT ( timer_bios );
+ #endif
+ 
+ #ifdef TIMER_RDTSC
+ REQUIRE_OBJECT ( timer_rdtsc );
+ #endif
  /*
   * Drag in all requested protocols
   *
@@@ -175,9 -186,6 +186,9 @@@ REQUIRE_OBJECT ( image_cmd )
  #ifdef DHCP_CMD
  REQUIRE_OBJECT ( dhcp_cmd );
  #endif
 +#ifdef SANBOOT_CMD
 +REQUIRE_OBJECT ( sanboot_cmd );
 +#endif
  
  /*
   * Drag in miscellaneous objects

diff --combined src/drivers/net/tg3.c
index 43706bf,57b9df1..2aa072b
--- 1/src/drivers/net/tg3.c
--- 2/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@@ -17,7 -17,6 +17,6 @@@
  #include <errno.h>
  #include <gpxe/pci.h>
  #include <gpxe/ethernet.h>
- #include "timer.h"
  #include "string.h"
  #include "tg3.h"
  
@@@ -3384,7 -3383,6 +3383,7 @@@ PCI_ROM(0x173b, 0x03e8, "tg3-ac1000"
  PCI_ROM(0x173b, 0x03e9, "tg3-ac1001",      "Altima AC1001"),
  PCI_ROM(0x173b, 0x03ea, "tg3-ac9100",      "Altima AC9100"),
  PCI_ROM(0x173b, 0x03eb, "tg3-ac1003",      "Altima AC1003"),
 +PCI_ROM(0x0e11, 0x00ca, "tg3-hp",        "HP Tigon 3"),
  };
  
  PCI_DRIVER ( tg3_driver, tg3_nics, PCI_NO_CLASS );