From e8c8d93331e6e7363e5e45636ca8227eec380c10 Mon Sep 17 00:00:00 2001
From: Sean Rhodes <sean@starlabs.systems>
Date: Mon, 9 Oct 2023 12:07:55 +0100
Subject: [PATCH] Create EFI capsules from the raw binaries

---
 Makefile                 | 5 ++---
 make/Makefile.nsh_script | 4 ++--
 make/Makefile.targets    | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a1b2a9b7..3460d25c 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ $(OUTPUT_DIR):
 $(OUTPUT_DIR)/$(version).rom:
 	mv $(version).rom $@
 
-$(OUTPUT_DIR)/$(version).cap:			$(OUTPUT_DIR)/$(version).rom
+$(OUTPUT_DIR)/$(version).cap:			$(subst $() $(),/,$(name))/$(target)-flashrom/$(version)/$(version).rom
 	./binaries/header.py --guid $(uefi) --bin $< --cap $@
 
 # Standard CAB
@@ -83,7 +83,7 @@ push_to_git:
 DEPENDENCIES = 				\
 	$(OUTPUT_DIR)			\
 	$(OUTPUT_DIR)/release_notes.md	\
-	$(OUTPUT_DIR)/$(version).rom
+	$(OUTPUT_DIR)/$(version).$(file_type)
 
 # Master recipes to be called
 ami-flashrom:					$(DEPENDENCIES)				\
@@ -93,7 +93,6 @@ ami-flashrom:					$(DEPENDENCIES)				\
 	$(MAKE) target_link="$(link)/$(version).$(file_type)" push_to_git
 
 ami:						$(DEPENDENCIES)				\
-						$(OUTPUT_DIR)/$(version).cap		\
 						$(OUTPUT_DIR)/$(target)-$(sku).cab
 
 	$(MAKE) target_link="$(link)/$(version).$(file_type)" push_to_git
diff --git a/make/Makefile.nsh_script b/make/Makefile.nsh_script
index 6b032186..83e203e8 100644
--- a/make/Makefile.nsh_script
+++ b/make/Makefile.nsh_script
@@ -17,10 +17,10 @@ nsh_script += echo "************************************************************
 nsh_script += echo " "\n
 nsh_script += echo "This update is for the $(name). Installing on any other laptop will cause it not to start."\n
 nsh_script += echo " "\n
-nsh_script += echo "Press Enter to update firmware or press Q to quit."\n
-nsh_script += pause\n
 nsh_script += echo \"This update contains the following changes:\"\n
 nsh_script += $(nsh_release_notes)
+nsh_script += echo "Press Enter to update firmware or press Q to quit."\n
+nsh_script += pause\n
 nsh_script += for %%a run (0 10)\n
 nsh_script += 	\tif exist fs%%a:$(nsh_tool).efi then\n
 nsh_script += 		\t\tfs%%a:\n
diff --git a/make/Makefile.targets b/make/Makefile.targets
index c08164b0..f6006012 100644
--- a/make/Makefile.targets
+++ b/make/Makefile.targets
@@ -32,9 +32,6 @@ meta_branch		= false
 meta_guid_1		= $(uefi)
 file_type		= cap
 
-nsh_tool		= AfuEfix64
-nsh_switch		= $(ami_switch)
-
 else ifeq ($(target),ami-flashrom)
 meta_version		= 1.7.7
 meta_protocol		= org.flashrom
@@ -44,5 +41,8 @@ meta_branch		= false
 meta_guid_1		= $(coreboot)
 file_type		= rom
 
+nsh_tool		= AfuEfix64
+nsh_switch		= $(ami_switch)
+
 endif