Selaa lähdekoodia

[Makefile] Quick hack: always define pci_{vendor,device}_id

ROMs will refuse to build unless pci_vendor_id and pci_device_id are
defined.  We probably ought to fix up the Makefile (and the ROM prefix) so
that they're required only for PCI ROMs, but this will do for now.
tags/v0.9.4
Michael Brown 16 vuotta sitten
vanhempi
commit
eec9814a0e
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2
    2
      src/Makefile.housekeeping

+ 2
- 2
src/Makefile.housekeeping Näytä tiedosto

@@ -278,8 +278,8 @@ TGT_PCI_DEVICE	= $(PCI_DEVICE_$(TGT_ROM_NAME))
278 278
 #
279 279
 TGT_LD_DRIVERS	= $(subst -,_,$(patsubst %,obj_%,$(TGT_DRIVERS)))
280 280
 TGT_LD_PREFIX	= obj_$(TGT_PREFIX)prefix
281
-TGT_LD_IDS	= $(if $(TGT_PCI_VENDOR),pci_vendor_id=$(TGT_PCI_VENDOR)) \
282
-		  $(if $(TGT_PCI_DEVICE),pci_device_id=$(TGT_PCI_DEVICE))
281
+TGT_LD_IDS	= pci_vendor_id=$(firstword $(TGT_PCI_VENDOR) 0) \
282
+		  pci_device_id=$(firstword $(TGT_PCI_DEVICE) 0)
283 283
 
284 284
 # Calculate linker flags based on link-time options for the current
285 285
 # target type (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the

Loading…
Peruuta
Tallenna