soc/intel/baytrail/Makefile.mk: Check if MANIFESTS region start is co…

…rrect Signed-off-by: Michał Żygowski <[email protected]>
Dasharo · Oct 9, 2024 · 13bf594 · 13bf594
1 parent 56baef0
commit 13bf594
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/soc/intel/baytrail/Makefile.mk b/src/soc/intel/baytrail/Makefile.mk
@@ -106,13 +106,12 @@ add_bootblock = \
 ifeq ($(CONFIG_TXE_SB_INCLUDE_KEY_MANIFEST),y)
 ifneq ($(call strip_quotes,$(CONFIG_TXE_SB_KEY_MANIFEST_PATH)),)
 
-key_manifest_pos = $(call int-subtract, $(CONFIG_ROM_SIZE) 0x21000)
-
-$(call add_intermediate, add_txe_sb_km, $(call strip_quotes,$(CONFIG_TXE_SB_KEY_MANIFEST_PATH)))
-	printf "    DD         Adding SB Key Manifest\n" \
-	dd if=$(CONFIG_TXE_SB_KEY_MANIFEST_PATH) \
-		of=$< conv=notrunc bs=4K \
-		seek=$(key_manifest_pos) >/dev/null 2>&1
+$(call add_intermediate, add_txe_sb_km, $(obj)/fmap_config.h $(call strip_quotes,$(CONFIG_TXE_SB_KEY_MANIFEST_PATH)))
+	$(if $(filter 1,, $(call int-eq, $(call get_fmap_value,FMAP_SECTION_MANIFESTS_START) $(call int-subtract, $(CONFIG_ROM_SIZE) 0x21000)) \
+			  $(call int-eq, $(call get_fmap_value,FMAP_SECTION_MANIFESTS_START) 0xfffdf000)), , \
+		$(error FMAP_SECTION_MANIFESTS_START must be at 0xfffdf000))
+	printf "    CBFSTOOL   Adding SB Key Manifest\n" \
+	$(CBFSTOOL) $(1) write -d -r MANIFESTS -f $(CONFIG_TXE_SB_KEY_MANIFEST_PATH)
 
 endif
 endif # CONFIG_TXE_SB_INCLUDE_KEY_MANIFEST