aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brown <mcb30@etherboot.org>2008-04-23 16:24:00 +0100
committerMichael Brown <mcb30@etherboot.org>2008-04-23 16:24:00 +0100
commiteec9814a0ec3705d4c464b8eaa6a8360685c4ca2 (patch)
tree937d5db3c1c2cede9fece8fbe7a261c6b7552736
parent3430226d4006b10077b35d71a2e5ff1fa448c520 (diff)
downloadipxe-eec9814a0ec3705d4c464b8eaa6a8360685c4ca2.zip
ipxe-eec9814a0ec3705d4c464b8eaa6a8360685c4ca2.tar.gz
ipxe-eec9814a0ec3705d4c464b8eaa6a8360685c4ca2.tar.bz2
[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.
-rw-r--r--src/Makefile.housekeeping4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index fe3addc..216f29e 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -278,8 +278,8 @@ TGT_PCI_DEVICE = $(PCI_DEVICE_$(TGT_ROM_NAME))
#
TGT_LD_DRIVERS = $(subst -,_,$(patsubst %,obj_%,$(TGT_DRIVERS)))
TGT_LD_PREFIX = obj_$(TGT_PREFIX)prefix
-TGT_LD_IDS = $(if $(TGT_PCI_VENDOR),pci_vendor_id=$(TGT_PCI_VENDOR)) \
- $(if $(TGT_PCI_DEVICE),pci_device_id=$(TGT_PCI_DEVICE))
+TGT_LD_IDS = pci_vendor_id=$(firstword $(TGT_PCI_VENDOR) 0) \
+ pci_device_id=$(firstword $(TGT_PCI_DEVICE) 0)
# Calculate linker flags based on link-time options for the current
# target type (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the