From e8af81b6a749ceba87714cedc162a8c32367a276 Mon Sep 17 00:00:00 2001
From: Sean Rhodes <sean@starlabs.systems>
Date: Mon, 9 Oct 2023 11:57:04 +0100
Subject: [PATCH] Adjust the dependencies

---
 Makefile             | 16 +++++++++-------
 make/Makefile.models |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index a7238565..b5a44600 100644
--- a/Makefile
+++ b/Makefile
@@ -23,14 +23,16 @@ ifeq ($(target),coreboot)
 	make -C ../coreboot defconfig KBUILD_DEFCONFIG=configs/config.starlabs_$(model)
 	make -C ../coreboot
 	mv ../coreboot/build/coreboot.rom $@
+else
+	exit 1
 endif
 
 $(OUTPUT_DIR):
 	mkdir -p $@
 
 # Just the binary
-$(OUTPUT_DIR)/$(version).rom:			$(version).rom
-	mv $< $@
+$(OUTPUT_DIR)/$(version).rom:
+	mv $(version).rom $@
 
 $(OUTPUT_DIR)/$(version).cap:			$(OUTPUT_DIR)/$(version).rom
 	./binaries/header.py --guid $(uefi) --bin $< --cap $@
@@ -40,7 +42,7 @@ $(OUTPUT_DIR)/$(sku).$(target).metainfo.xml:	$(OUTPUT_DIR)
 	printf '$(metadata)' > $@
 
 $(OUTPUT_DIR)/$(target)-$(sku).cab:		$(OUTPUT_DIR)/$(sku).$(target).metainfo.xml	\
-						$(OUTPUT_DIR)/$(version).$(file_type)
+						$(OUTPUT_DIR)/$(version).rom
 	gcab -cn $@ $^
 
 # EFI Shell
@@ -48,7 +50,7 @@ $(OUTPUT_DIR)/startup.nsh:			$(OUTPUT_DIR)
 	printf '$(nsh_script)' > $@
 
 $(OUTPUT_DIR)/efi-$(sku).zip:			$(OUTPUT_DIR)/startup.nsh			\
-						$(OUTPUT_DIR)/$(version).$(file_type)		\
+						$(OUTPUT_DIR)/$(version).rom			\
 						binaries/$(nsh_tool).efi
 	zip -rj $@ $^
 
@@ -77,7 +79,7 @@ push_to_git:
 	printf '$(readme_release_notes)\n' >> $(subst $() $(),/,$(name))/README.md
 	git add $(OUTPUT_DIR) $(subst $() $(),/,$(name))/README.md
 	git commit -m "Added $(name) $(target) $(version)"
-	git push
+#	git push
 
 DEPENDENCIES = 				\
 	$(OUTPUT_DIR)			\
@@ -90,9 +92,9 @@ ami-flashrom:					$(DEPENDENCIES)				\
 
 	$(MAKE) target_link="$(link)/$(version).$(file_type)" push_to_git
 
-ami:						$(DEPENDENCIES)
-						$(OUTPUT_DIR)/$(target)-$(sku).cab	\
+ami:						$(DEPENDENCIES)				\
 						$(OUTPUT_DIR)/$(version).cap		\
+						$(OUTPUT_DIR)/$(target)-$(sku).cab	\
 						$(OUTPUT_DIR)/efi-$(sku).zip
 
 	$(MAKE) target_link="$(link)/$(version).$(file_type)" push_to_git
diff --git a/make/Makefile.models b/make/Makefile.models
index 29daced2..cd9d0290 100644
--- a/make/Makefile.models
+++ b/make/Makefile.models
@@ -98,7 +98,7 @@ superio1	= d83a4cd0-fce6-58a8-93c7-bcee89b41dcf
 ami		= 4c7c8bc5-475c-5384-b602-78c9d4771b5d
 coreboot	= ""
 
-ami-switch	= $(afu_amd)
+ami_switch	= $(afu_amd)
 
 else ifeq ($(model),byte_cezanne)
 name		= Byte MkI
@@ -111,7 +111,7 @@ superio1	= d83a4cd0-fce6-58a8-93c7-bcee89b41dcf
 ami		= ""
 coreboot	= ""
 
-ami-switch	= $(afu_amd)
+ami_switch	= $(afu_amd)
 
 else ifeq ($(model),starbook_rpl)
 name		= StarBook MkVIr2-Intel