浏览代码

[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>
tags/v1.20.1
Michael Brown 9 年前
父节点
当前提交
25d6c80498
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1
    2
      src/Makefile.housekeeping
  2. 1
    0
      src/util/parserom.pl

+ 1
- 2
src/Makefile.housekeeping 查看文件

@@ -949,9 +949,8 @@ CLEANUP		+= $(BIN)/NIC	# Doesn't match the $(BIN)/*.* pattern
949 949
 
950 950
 # Select drivers to be included in the all-drivers build
951 951
 #
952
-DRIVERS		= $(DRIVERS_net) $(DRIVERS_infiniband) \
952
+DRIVERS_ipxe	= $(DRIVERS_net) $(DRIVERS_infiniband) \
953 953
 		  $(DRIVERS_xen) $(DRIVERS_hyperv)
954
-DRIVERS_ipxe	= $(DRIVERS)
955 954
 
956 955
 # Analyse a target name (e.g. "bin/dfe538--prism2_pci.rom.tmp") and
957 956
 # derive the variables:

+ 1
- 0
src/util/parserom.pl 查看文件

@@ -162,6 +162,7 @@ sub print_make_rules {
162 162
         print "# NIC\t\n";
163 163
         print "# NIC\tfamily\t$state->{family}\n";
164 164
         print "DRIVERS_$state->{driver_class} += $state->{driver_name}\n";
165
+        print "DRIVERS += $state->{driver_name}\n";
165 166
         print "\n";
166 167
         $state->{'is_header_printed'} = 1;
167 168
     }

正在加载...
取消
保存