|
@@ -898,14 +898,13 @@ $(BIN)/NIC : $(AUTO_DEPS)
|
898
|
898
|
@perl -ne 'chomp; print "$$1\n" if /\# NIC\t(.*)$$/' $^ >> $@
|
899
|
899
|
CLEANUP += $(BIN)/NIC # Doesn't match the $(BIN)/*.* pattern
|
900
|
900
|
|
901
|
|
-# Analyse a target name (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and
|
|
901
|
+# Analyse a target name (e.g. "bin/dfe538--prism2_pci.rom.tmp") and
|
902
|
902
|
# derive the variables:
|
903
|
903
|
#
|
904
|
904
|
# TGT_ELEMENTS : the elements of the target (e.g. "dfe538 prism2_pci")
|
905
|
|
-# TGT_PREFIX : the prefix type (e.g. "zrom")
|
|
905
|
+# TGT_PREFIX : the prefix type (e.g. "rom")
|
906
|
906
|
# TGT_DRIVERS : the driver for each element (e.g. "rtl8139 prism2_pci")
|
907
|
907
|
# TGT_ROM_NAME : the ROM name (e.g. "dfe538")
|
908
|
|
-# TGT_MEDIA : the media type (e.g. "rom")
|
909
|
908
|
#
|
910
|
909
|
DRIVERS_ipxe = $(DRIVERS)
|
911
|
910
|
CARD_DRIVER = $(firstword $(DRIVER_$(1)) $(1))
|
|
@@ -916,10 +915,9 @@ TGT_DRIVERS = $(strip $(if $(DRIVERS_$(TGT_ROM_NAME)), \
|
916
|
915
|
$(DRIVERS_$(TGT_ROM_NAME)), \
|
917
|
916
|
$(foreach TGT_ELEMENT,$(TGT_ELEMENTS), \
|
918
|
917
|
$(call CARD_DRIVER,$(TGT_ELEMENT))) ))
|
919
|
|
-TGT_MEDIA = $(subst z,,$(TGT_PREFIX))
|
920
|
918
|
|
921
|
919
|
# Look up ROM IDs for the current target
|
922
|
|
-# (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the variables:
|
|
920
|
+# (e.g. "bin/dfe538--prism2_pci.rom.tmp") and derive the variables:
|
923
|
921
|
#
|
924
|
922
|
# TGT_PCI_VENDOR : the PCI vendor ID (e.g. "0x1186")
|
925
|
923
|
# TGT_PCI_DEVICE : the PCI device ID (e.g. "0x1300")
|
|
@@ -928,7 +926,7 @@ TGT_PCI_VENDOR = $(PCI_VENDOR_$(TGT_ROM_NAME))
|
928
|
926
|
TGT_PCI_DEVICE = $(PCI_DEVICE_$(TGT_ROM_NAME))
|
929
|
927
|
|
930
|
928
|
# Calculate link-time options for the current target
|
931
|
|
-# (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the variables:
|
|
929
|
+# (e.g. "bin/dfe538--prism2_pci.rom.tmp") and derive the variables:
|
932
|
930
|
#
|
933
|
931
|
# TGT_LD_DRIVERS : symbols to require in order to drag in the relevant drivers
|
934
|
932
|
# (e.g. "obj_rtl8139 obj_prism2_pci")
|
|
@@ -941,7 +939,7 @@ TGT_LD_IDS = pci_vendor_id=$(firstword $(TGT_PCI_VENDOR) 0) \
|
941
|
939
|
TGT_LD_ENTRY = _$(TGT_PREFIX)_start
|
942
|
940
|
|
943
|
941
|
# Calculate linker flags based on link-time options for the current
|
944
|
|
-# target type (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the
|
|
942
|
+# target type (e.g. "bin/dfe538--prism2_pci.rom.tmp") and derive the
|
945
|
943
|
# variables:
|
946
|
944
|
#
|
947
|
945
|
# TGT_LD_FLAGS : target-specific flags to pass to linker (e.g.
|
|
@@ -972,7 +970,6 @@ $(BIN)/%.info :
|
972
|
970
|
@$(ECHO) 'Prefix : $(TGT_PREFIX)'
|
973
|
971
|
@$(ECHO) 'Drivers : $(TGT_DRIVERS)'
|
974
|
972
|
@$(ECHO) 'ROM name : $(TGT_ROM_NAME)'
|
975
|
|
- @$(ECHO) 'Media : $(TGT_MEDIA)'
|
976
|
973
|
@$(ECHO)
|
977
|
974
|
@$(ECHO) 'PCI vendor : $(TGT_PCI_VENDOR)'
|
978
|
975
|
@$(ECHO) 'PCI device : $(TGT_PCI_DEVICE)'
|