Browse Source

[build] Remove obsolete references to .zrom build targets

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 9 years ago
parent
commit
5b72cf055c
1 changed files with 5 additions and 8 deletions
  1. 5
    8
      src/Makefile.housekeeping

+ 5
- 8
src/Makefile.housekeeping View File

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

Loading…
Cancel
Save