Merge "Add matcha FPGA test target based on Kelvin SW binaraies"

cantrip_builtins.mk

diff --git a/cantrip_builtins.mk b/cantrip_builtins.mk
index 3479e3c..ba1c9a4 100644
--- a/cantrip_builtins.mk
+++ b/cantrip_builtins.mk
@@ -31,12 +31,22 @@
 CPIO ?= cpio
 BUILTINS_CPIO_OPTS := -H newc -L --no-absolute-filenames --reproducible --owner=root:root
 
-$(CANTRIP_OUT_RELEASE)/builtins: $(CANTRIP_APPS_RELEASE) $(CANTRIP_MODEL_RELEASE) ${CANTRIP_SCRIPTS}
+$(CANTRIP_OUT_RELEASE)/builtins: \
+  $(CANTRIP_APPS_RELEASE) \
+  $(CANTRIP_MODEL_RELEASE) \
+  ${CANTRIP_SCRIPTS} \
+  ${ROOTDIR}/build/cantrip_builtins.mk \
+  ${ROOTDIR}/build/platforms/${PLATFORM}/cantrip_builtins.mk
 	rm -rf $@
 	mkdir -p $@
 	cp $(CANTRIP_APPS_RELEASE) $(CANTRIP_MODEL_RELEASE) ${CANTRIP_SCRIPTS} $@
 
-$(CANTRIP_OUT_DEBUG)/builtins: $(CANTRIP_APPS_DEBUG) $(CANTRIP_MODEL_DEBUG) ${CANTRIP_SCRIPTS}
+$(CANTRIP_OUT_DEBUG)/builtins: \
+  $(CANTRIP_APPS_DEBUG) \
+  $(CANTRIP_MODEL_DEBUG) \
+  ${CANTRIP_SCRIPTS} \
+  ${ROOTDIR}/build/cantrip_builtins.mk \
+  ${ROOTDIR}/build/platforms/${PLATFORM}/cantrip_builtins.mk
 	rm -rf $@
 	mkdir -p $@
 	cp $(CANTRIP_APPS_DEBUG) $(CANTRIP_MODEL_DEBUG) ${CANTRIP_SCRIPTS} $@