Explorar el Código

Add bin/pci_VVVV_DDDD target to allow building ROM images without

needing to know the gPXE internal ROM name.
tags/v0.9.3
Michael Brown hace 17 años
padre
commit
a1e243d504
Se han modificado 1 ficheros con 5 adiciones y 4 borrados
  1. 5
    4
      src/util/parserom.pl

+ 5
- 4
src/util/parserom.pl Ver fichero

@@ -32,8 +32,8 @@ sub rom {
32 32
   print "DRIVER_$image = $driver_name\n";
33 33
   print "ROM_TYPE_$image = $type\n";
34 34
   print "ROM_DESCRIPTION_$image = \"$desc\"\n";
35
-  print "PCI_VENDOR_$image = $vendor\n" if $vendor;
36
-  print "PCI_DEVICE_$image = $device\n" if $device;
35
+  print "PCI_VENDOR_$image = 0x$vendor\n" if $vendor;
36
+  print "PCI_DEVICE_$image = 0x$device\n" if $device;
37 37
   print "ROMS += $image\n";
38 38
   print "ROMS_$driver_name += $image\n";
39 39
 }
@@ -42,13 +42,14 @@ while ( <DRV> ) {
42 42
   next unless /(PCI|ISA)_ROM\s*\(/;
43 43
 
44 44
   if ( /^\s*PCI_ROM\s*\(
45
-         \s*(0x[0-9A-Fa-f]{4})\s*, # PCI vendor
46
-         \s*(0x[0-9A-Fa-f]{4})\s*, # PCI device
45
+         \s*0x([0-9A-Fa-f]{4})\s*, # PCI vendor
46
+         \s*0x([0-9A-Fa-f]{4})\s*, # PCI device
47 47
          \s*\"([^\"]*)\"\s*,	   # Image
48 48
          \s*\"([^\"]*)\"\s*	   # Description
49 49
        \)/x ) {
50 50
     ( my $vendor, my $device, my $image, my $desc ) = ( lc $1, lc $2, $3, $4 );
51 51
     rom ( "pci", $image, $desc, $vendor, $device );
52
+    rom ( "pci", lc "pci_${vendor}_${device}", $desc, $vendor, $device );
52 53
   } elsif ( /^\s*ISA_ROM\s*\(
53 54
 	      \s*\"([^\"]*)\"\s*,  # Image
54 55
 	      \s*\"([^\"]*)\"\s*   # Description

Loading…
Cancelar
Guardar