[build] Fix .ids.o creation for drivers not in the all-drivers build

Commit dc19e63 ("[build] Construct all-drivers list based on driver
class") accidentally excluded the USB bus drivers from the list of
files parsed in order to create PCI 3.0 device ID lists.

Fix by returning $(DRIVERS) to its previous definition as a list of
all driver files, and use only $(DRIVERS_ipxe) to contain the
filtered list containing only those drivers which we want to include
in the "all-drivers" build.

Reported-by: Mary-Ann Johnson <MaryAnn.Johnson@displaylink.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index be9ad7c4150f6f6988bb166bc52c8b33864853a1..03800c8efbc901dbb62cda97010622d170786d54 100644 (file)
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -949,9 +949,8 @@ CLEANUP             += $(BIN)/NIC   # Doesn't match the $(BIN)/*.* pattern
 
 # Select drivers to be included in the all-drivers build
 #
-DRIVERS                = $(DRIVERS_net) $(DRIVERS_infiniband) \
+DRIVERS_ipxe   = $(DRIVERS_net) $(DRIVERS_infiniband) \
                  $(DRIVERS_xen) $(DRIVERS_hyperv)
-DRIVERS_ipxe   = $(DRIVERS)
 
 # Analyse a target name (e.g. "bin/dfe538--prism2_pci.rom.tmp") and
 # derive the variables:

diff --git a/src/util/parserom.pl b/src/util/parserom.pl
index 2c59f4863146a482c6cdf8ecdaead036cfaa5d7d..28df6065263b0f488bc5f81d4d5be543d484925c 100755 (executable)
--- a/src/util/parserom.pl
+++ b/src/util/parserom.pl
@@ -162,6 +162,7 @@ sub print_make_rules {
         print "# NIC\t\n";
         print "# NIC\tfamily\t$state->{family}\n";
         print "DRIVERS_$state->{driver_class} += $state->{driver_name}\n";
+        print "DRIVERS += $state->{driver_name}\n";
         print "\n";
         $state->{'is_header_printed'} = 1;
     }