Переглянути джерело

We now have just romprefix, rather than having isaprefix and pciprefix

tags/v0.9.3
Michael Brown 18 роки тому
джерело
коміт
763b7e2ef9
2 змінених файлів з 4 додано та 12 видалено
  1. 2
    7
      src/Makefile.housekeeping
  2. 2
    5
      src/arch/i386/Makefile

+ 2
- 7
src/Makefile.housekeeping Переглянути файл

@@ -178,14 +178,12 @@ TGT_DRIVERS	= $(strip $(if $(DRIVERS_$(TGT_ROM_NAME)), \
178 178
 			         $(call CARD_DRIVER,$(TGT_ELEMENT))) ))
179 179
 TGT_MEDIA	= $(subst z,,$(TGT_PREFIX))
180 180
 
181
-# Look up ROM type and IDs for the current target
181
+# Look up ROM IDs for the current target
182 182
 # (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the variables:
183 183
 #
184
-# TGT_ROM_TYPE   : PCI/ISA indicator (e.g. "pci")
185 184
 # TGT_PCI_VENDOR : the PCI vendor ID (e.g. "0x1186")
186 185
 # TGT_PCI_DEVICE : the PCI device ID (e.g. "0x1300")
187 186
 #
188
-TGT_ROM_TYPE	= $(ROM_TYPE_$(TGT_ROM_NAME))
189 187
 TGT_PCI_VENDOR	= $(PCI_VENDOR_$(TGT_ROM_NAME))
190 188
 TGT_PCI_DEVICE	= $(PCI_DEVICE_$(TGT_ROM_NAME))
191 189
 
@@ -194,13 +192,11 @@ TGT_PCI_DEVICE	= $(PCI_DEVICE_$(TGT_ROM_NAME))
194 192
 #
195 193
 # TGT_LD_DRIVERS : symbols to require in order to drag in the relevant drivers
196 194
 #		   (e.g. "obj_rtl8139 obj_prism2_pci")
197
-# TGT_LD_PREFIX  : symbols to require in order to drag in the relevant prefix
198
-#		   (e.g. "obj_zpciprefix")
199 195
 # TGT_LD_IDS :     symbols to define in order to fill in ID structures in the
200 196
 #		   ROM header (e.g."pci_vendor_id=0x1186 pci_device_id=0x1300")
201 197
 #
202 198
 TGT_LD_DRIVERS	= $(subst -,_,$(patsubst %,obj_%,$(TGT_DRIVERS)))
203
-TGT_LD_PREFIX	= obj_$(subst rom,$(TGT_ROM_TYPE),$(TGT_PREFIX))prefix
199
+TGT_LD_PREFIX	= obj_$(TGT_PREFIX)prefix
204 200
 TGT_LD_IDS	= $(if $(TGT_PCI_VENDOR),pci_vendor_id=$(TGT_PCI_VENDOR)) \
205 201
 		  $(if $(TGT_PCI_DEVICE),pci_device_id=$(TGT_PCI_DEVICE))
206 202
 
@@ -246,7 +242,6 @@ $(BIN)/%.info :
246 242
 	@echo 'ROM name             : $(TGT_ROM_NAME)'
247 243
 	@echo 'Media                : $(TGT_MEDIA)'
248 244
 	@echo
249
-	@echo 'ROM type             : $(TGT_ROM_TYPE)'
250 245
 	@echo 'PCI vendor           : $(TGT_PCI_VENDOR)'
251 246
 	@echo 'PCI device           : $(TGT_PCI_DEVICE)'
252 247
 	@echo

+ 2
- 5
src/arch/i386/Makefile Переглянути файл

@@ -45,11 +45,8 @@ LDSCRIPT		= arch/i386/scripts/i386.lds
45 45
 CFLAGS_ZPREFIX		= -DCOMPRESS
46 46
 
47 47
 MEDIA			+= rom
48
-OBJS_romprefix		= isaprefix zisaprefix pciprefix zpciprefix
49
-CFLAGS_isaprefix	=
50
-CFLAGS_zisaprefix	= $(CFLAGS_ZPREFIX)
51
-CFLAGS_pciprefix	= -DPCI_PNP_HEADER
52
-CFLAGS_zpciprefix	= $(CFLAGS_pciprefix) $(CFLAGS_ZPREFIX)
48
+OBJS_romprefix		= romprefix zromprefix
49
+CFLAGS_zromprefix	= $(CFLAGS_ZPREFIX)
53 50
 
54 51
 MEDIA			+= pxe
55 52
 OBJS_pxeprefix		= pxeprefix zpxeprefix

Завантаження…
Відмінити
Зберегти