Makefile.mk: redundant bootblock init WIP

Signed-off-by: Filip Lewiński <filip.lewinski@3mdeb.com>

Author: filipleple

Makefile.mk

@@ -127,6 +127,10 @@ subdirs-y += util/checklist util/testing
 #######################################################################
 # Add source classes and their build options
 classes-y := ramstage romstage bootblock decompressor postcar smm smmstub cpu_microcode verstage
+# when building redundant bootblock, we create a second class alias for Slot B
+ifeq ($(CONFIG_REDUNDANT_BOOTBLOCK),y)
+classes-y += bootblock_b
+endif
 
 # Add a special 'all' class to add sources to all stages
 $(call add-special-class,all)
@@ -218,6 +222,11 @@ ramstage-postprocess=$$(eval DEPENDENCIES+=$$(addsuffix .d,$$(basename $(1)))) \
 
 decompressor-generic-ccopts += -D__DECOMPRESSOR__
 bootblock-generic-ccopts += -D__BOOTBLOCK__
+bootblock_b-generic-ccopts += -D__BOOTBLOCK__
+ifeq ($(CONFIG_BOOTBLOCK_SLOT_VARIANTS),y)
+bootblock-generic-ccopts   += -DSLOT_A
+bootblock_b-generic-ccopts += -DSLOT_B
+endif
 romstage-generic-ccopts += -D__ROMSTAGE__
 ramstage-generic-ccopts += -D__RAMSTAGE__
 ifeq ($(CONFIG_COVERAGE),y)
@@ -834,6 +843,13 @@ verstage-y += $(CONFIG_MEMLAYOUT_LD_FILE)
 postcar-y += $(CONFIG_MEMLAYOUT_LD_FILE)
 decompressor-y += $(CONFIG_MEMLAYOUT_LD_FILE)
 
+# Make bootblock_b sources mirror bootblock (alias)
+ifeq ($(CONFIG_REDUNDANT_BOOTBLOCK),y)
+bootblock_b-y               += $(bootblock-y)
+bootblock_b-c-deps          += $(bootblock-c-deps)
+bootblock_b-c-gen-deps      += $(bootblock-c-gen-deps)
+endif
+
 #######################################################################
 # Clean up rules
 clean-abuild:
@@ -922,26 +938,56 @@ $(objcbfs)/bootblock.raw.elf: $(objcbfs)/decompressor.elf
 	@printf "    OBJCOPY    $(notdir $(@))\n"
 	$(OBJCOPY_bootblock) $(preserve-bss-flags) $< $@
 
+ifeq ($(CONFIG_REDUNDANT_BOOTBLOCK),y)
+$(objcbfs)/bootblock_b.raw.elf: $(objcbfs)/decompressor.elf
+	@printf "    OBJCOPY    $(notdir $(@))\n"
+	$(OBJCOPY_bootblock_b) $(preserve-bss-flags) $< $@
+endif
+
 else	# CONFIG_COMPRESS_BOOTBLOCK
 
 $(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
 	@printf "    OBJCOPY    $(notdir $(@))\n"
 	$(OBJCOPY_bootblock) $(preserve-bss-flags) $< $@
 
+ifeq ($(CONFIG_REDUNDANT_BOOTBLOCK),y)
+$(objcbfs)/bootblock_b.raw.elf: $(objcbfs)/bootblock_b.elf
+	@printf "    OBJCOPY    $(notdir $(@))\n"
+	$(OBJCOPY_bootblock_b) $(preserve-bss-flags) $< $@
+endif
+
 endif	# CONFIG_COMPRESS_BOOTBLOCK
 
 $(objcbfs)/bootblock.raw.bin: $(objcbfs)/bootblock.raw.elf
 	@printf "    OBJCOPY    $(notdir $(@))\n"
 	$(OBJCOPY_bootblock) -O binary $< $@
 
+ifeq ($(CONFIG_REDUNDANT_BOOTBLOCK),y)
+$(objcbfs)/bootblock_b.raw.bin: $(objcbfs)/bootblock_b.raw.elf
+	@printf "    OBJCOPY    $(notdir $(@))\n"
+	$(OBJCOPY_bootblock_b) -O binary $< $@
+endif
+
 ifneq ($(CONFIG_HAVE_BOOTBLOCK),y)
 $(objcbfs)/bootblock.bin:
 	dd if=/dev/zero of=$@ bs=64 count=1
+ifeq ($(CONFIG_REDUNDANT_BOOTBLOCK),y)
+$(objcbfs)/bootblock_b.bin:
+	dd if=/dev/zero of=$@ bs=64 count=1
+endif
 endif
 
 $(objcbfs)/%.bin: $(objcbfs)/%.raw.bin
 	cp $< $@
 
+ifeq ($(CONFIG_REDUNDANT_BOOTBLOCK),y)
+# If not building slot-specific variants, Slot B is a copy of Slot A
+ifeq ($(CONFIG_BOOTBLOCK_SLOT_VARIANTS),)
+$(objcbfs)/bootblock_b.bin: $(objcbfs)/bootblock.bin
+	cp $< $@
+endif
+endif
+
 $(objcbfs)/%.map: $(objcbfs)/%.debug
 	$(eval class := $(call find-class,$(@F)))
 	$(NM_$(class)) -n $< | sort > $(basename $@).map
@@ -1301,10 +1347,15 @@ endif
 $(shell rm -f $(obj)/coreboot.pre)
 
 ifneq ($(CONFIG_UPDATE_IMAGE),y)
-$(obj)/coreboot.pre: $$(prebuilt-files) $(CBFSTOOL) $(obj)/fmap.fmap $(obj)/fmap.desc $(objcbfs)/bootblock.bin
+$(obj)/coreboot.pre: $$(prebuilt-files) $(CBFSTOOL) $(obj)/fmap.fmap $(obj)/fmap.desc $(objcbfs)/bootblock.bin \
+	$(if $(CONFIG_REDUNDANT_BOOTBLOCK),$(objcbfs)/bootblock_b.bin)
 	$(CBFSTOOL) $@.tmp create -M $(obj)/fmap.fmap -r $(shell cat $(obj)/fmap.desc)
 	printf "    BOOTBLOCK\n"
 	$(call add_bootblock,$@.tmp,$(objcbfs)/bootblock.bin)
+ifneq ($(CONFIG_REDUNDANT_BOOTBLOCK),)
+	printf "    TOPSWAP BB\n"
+	$(call add_bootblock_region,$@.tmp,$(objcbfs)/bootblock_b.bin,TOPSWAP)
+endif
 	$(prebuild-files) true
 	mv $@.tmp $@
 else # ifneq ($(CONFIG_UPDATE_IMAGE),y)

src/Kconfig

@@ -116,6 +116,23 @@ config CCACHE
 
 	  For details see https://ccache.samba.org.
 
+config REDUNDANT_BOOTBLOCK
+	bool "Build redundant bootblock (Slot A + Slot B)"
+	default y
+	help
+		Build two bootblock binaries and place them into FMAP regions
+		BOOTBLOCK (Slot A) and TOPSWAP (Slot B). Required for Intel Top Swap
+		based redundancy. Logic to choose a slot is out of scope here.
+
+config BOOTBLOCK_SLOT_VARIANTS
+	bool "Compile bootblock per-slot with distinct defines"
+	depends on REDUNDANT_BOOTBLOCK
+	default n
+	help
+		If enabled, bootblock for Slot A and Slot B is compiled separately with
+		-DSLOT_A or -DSLOT_B so later slot-specific logic can be added.
+		If disabled, Slot B is a byte-for-byte copy of Slot A.
+
 config LTO
 	bool "Use link time optimization (LTO) (experimental)"
 	default n