From 4e32a2c2c8f40a5d8a2d1e0ecbf38065276e9e4e Mon Sep 17 00:00:00 2001
From: Julien Viard de Galbert <julien.viard-de-galbert@itrenew.com>
Date: Tue, 8 Jan 2019 17:47:39 +0100
Subject: [PATCH] Move udk dxe list to the board (winterfell only)

Signed-off-by: Julien Viard de Galbert <julien.viard-de-galbert@itrenew.com>
---
 Makefile                         | 6 ++----
 boards/winterfell/Makefile.board | 9 ++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index dcd610a..cef9d30 100644
--- a/Makefile
+++ b/Makefile
@@ -139,13 +139,11 @@ dxe/%.ffs:
 ifndef USE_UTK
 $(BUILD)/linuxboot.rom: $(FVS)
 else
-$(BUILD)/linuxboot.rom: bin/utk ./dxe/linuxboot.ffs $(BUILD)/Linux.ffs $(BUILD)/Initrd.ffs
+$(BUILD)/linuxboot.rom: bin/utk $(DXE_FFS)
 	$< \
 		$(ROM) \
 		remove_dxes_except boards/$(BOARD)/image-files.txt \
-		insert_dxe ./dxe/linuxboot.ffs \
-		insert_dxe $(BUILD)/Linux.ffs \
-		insert_dxe $(BUILD)/Initrd.ffs \
+		$(foreach ffs,$(DXE_FFS), insert_dxe $(ffs)) \
 		save $@
 endif
 
diff --git a/boards/winterfell/Makefile.board b/boards/winterfell/Makefile.board
index 0091618..7c5971c 100644
--- a/boards/winterfell/Makefile.board
+++ b/boards/winterfell/Makefile.board
@@ -36,11 +36,14 @@ $(BUILD)/rom/0x00f00000.fv \
 
 # Replace the DxeCore and SmmCore with our own
 # and add in the Linux kernel / initrd
+DXE_FFS := \
+./dxe/linuxboot.ffs \
+$(BUILD)/Linux.ffs \
+$(BUILD)/Initrd.ffs \
+
 $(BUILD)/dxe.vol: \
 	$(dxe-files) \
-	./dxe/linuxboot.ffs \
-	$(BUILD)/Linux.ffs \
-	$(BUILD)/Initrd.ffs \
+	$(DXE_FFS) \
 
 #
 # Compact the NVRAM region.  this isn't required, but makes for cleaner images.