david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[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>
This commit is contained in:
Michael Brown 2015-06-01 16:50:56 +01:00
parent 982b051cbc
commit 25d6c80498
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.housekeeping
View File

@ -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:

1
src/util/parserom.pl
View File

@ -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;
}