Browse Source

Use pci_{vendor,device}_id instead of just pci_{vendor,device}, to avoid

conflict with pci_device function.
tags/v0.9.3
Michael Brown 19 years ago
parent
commit
eb8f730d63
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      src/Makefile.housekeeping

+ 3
- 3
src/Makefile.housekeeping View File

190
 # TGT_LD_PREFIX  : symbols to require in order to drag in the relevant prefix
190
 # TGT_LD_PREFIX  : symbols to require in order to drag in the relevant prefix
191
 #		   (e.g. "obj_zpciprefix")
191
 #		   (e.g. "obj_zpciprefix")
192
 # TGT_LD_IDS :     symbols to define in order to fill in ID structures in the
192
 # TGT_LD_IDS :     symbols to define in order to fill in ID structures in the
193
-#		   ROM header (e.g. "pci_vendor=0x1186 pci_device=0x1300")
193
+#		   ROM header (e.g."pci_vendor_id=0x1186 pci_device_id=0x1300")
194
 #
194
 #
195
 TGT_LD_DRIVERS	= $(subst -,_,$(patsubst %,obj_%,$(TGT_DRIVERS)))
195
 TGT_LD_DRIVERS	= $(subst -,_,$(patsubst %,obj_%,$(TGT_DRIVERS)))
196
 TGT_LD_PREFIX	= obj_$(subst rom,$(TGT_ROM_TYPE),$(TGT_PREFIX))prefix
196
 TGT_LD_PREFIX	= obj_$(subst rom,$(TGT_ROM_TYPE),$(TGT_PREFIX))prefix
197
-TGT_LD_IDS	= $(if $(TGT_PCI_VENDOR),pci_vendor=$(TGT_PCI_VENDOR)) \
198
-		  $(if $(TGT_PCI_DEVICE),pci_device=$(TGT_PCI_DEVICE))
197
+TGT_LD_IDS	= $(if $(TGT_PCI_VENDOR),pci_vendor_id=$(TGT_PCI_VENDOR)) \
198
+		  $(if $(TGT_PCI_DEVICE),pci_device_id=$(TGT_PCI_DEVICE))
199
 
199
 
200
 # Calculate linker flags based on link-time options for the current
200
 # Calculate linker flags based on link-time options for the current
201
 # target type (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the
201
 # target type (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the

Loading…
Cancel
Save