mirrors/linuxboot
1
0
Fork 0
mirror of https://github.com/linuxboot/linuxboot synced 2024-11-21 15:50:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ensure that all of the extracted files depend on the extract target (issue #9)

Browse Source
This commit is contained in:
Trammell hudson 2018-03-16 10:43:29 -04:00
parent 060af5df98
commit 60cff7d961
No known key found for this signature in database
GPG Key ID: 687A5005935B1533
6 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -121,6 +121,7 @@ extract.intermediate: $(ROM)
# All of the output volumes depend on extracting the firmware
$(patsubst %.vol,,$(FVS)): extract.intermediate
$(patsubst %.fv,,$(FVS)): extract.intermediate
$(BUILD)/linuxboot.rom: $(FVS)

2
boards/monolake/Makefile.board
View File

@ -18,6 +18,8 @@ dxe-files := $(shell awk \
boards/$(BOARD)/image-files.txt \
)
$(dxe-files): extract.intermediate
# The Monolake ROM is really fragmented.
# We could recover osme of the space at 0x8800000

10
boards/qemu/Makefile.board
View File

@ -20,11 +20,17 @@ merged-size := 0x748000
fv-path := $(BUILD)/rom/0x00084000/9e21fd93-9c72-4c15-8c4b-e77f1db2d792
dxe-path := $(fv-path)/1
vendor-files := $(shell awk \
dxe-files := $(shell awk \
'/^[0-9A-Fa-f]/ {print "$(dxe-path)/"$$1".ffs"}' \
boards/$(BOARD)/image-files.txt \
)
$(dxe-files): extract.intermediate
# since the 0.fv is nested inside another FV, we have to add an
# explicit dependency on the extract target to ensure that it is created
$(fv-path)/0.fv: extract.intermediate
FVS := \
$(BUILD)/rom/0x00000000.fv \
$(BUILD)/merged.vol \
@ -44,7 +50,7 @@ $(BUILD)/merged.vol: \
$(BUILD)/dxe.vol: \
$(BUILD)/DxeCore.ffs \
$(vendor-files) \
$(dxe-files) \
$(BUILD)/Linux.ffs \
$(BUILD)/Initrd.ffs \

2
boards/r630/Makefile.board
View File

@ -29,6 +29,8 @@ dxe-files := $(shell awk \
boards/$(BOARD)/image-files.txt \
)
$(dxe-files): extract.intermediate
FVS := \
$(BUILD)/rom/0x00000000.ifd \

2
boards/s2600wf/Makefile.board
View File

@ -31,6 +31,8 @@ dxe-files := $(shell awk \
boards/$(BOARD)/image-files.txt \
)
$(dxe-files): extract.intermediate
# The Intel firmware has lots of small pieces.
# We replace the DXE recovery image and one of the other

2
boards/winterfell/Makefile.board
View File

@ -19,6 +19,8 @@ dxe-files := $(shell awk \
boards/$(BOARD)/image-files.txt \
)
$(dixe-files): extract.intermediate
# The Intel firmware has lots of small pieces.
# We replace the DXE recovery image and one of the other