From c8d4abd8ba3f2ad841dda13278bd55a8e78db800 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 20 Jan 2016 15:54:31 +0100 Subject: [PATCH] vboot: Install files into FW_MAIN_A and FW_MAIN_B unless they're for RO Setup an initial rule to make use of the updatable CBFS regions in fmap. Change-Id: I1fe1c6e7574854b735760c85590da6e297f6e687 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/13060 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- Makefile.inc | 1 + src/vendorcode/google/chromeos/vboot2/Makefile.inc | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/Makefile.inc b/Makefile.inc index aab1efbcd2..ab7248a1a1 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -112,6 +112,7 @@ spc := spc += $(spc) := $(spc) += +comma := , # files-in-dir-recursive,dir,files files-in-dir-recursive=$(filter $(1)%,$(2)) diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc index fdb0d4e954..34f1f745dc 100644 --- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc +++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc @@ -85,3 +85,14 @@ else romstage-srcs += $(objgenerated)/libverstage.a endif endif # CONFIG_SEPARATE_VERSTAGE + +# Define a list of files that need to be in RO only. +# All other files will be installed into RO and RW regions +# Use $(sort) to cut down on extra spaces that would be translated to commas +regions-for-file = $(subst $(spc),$(comma),$(sort \ + $(if $(filter \ + $(if $(filter y,$(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK)),, \ + %/romstage) \ + mts \ + %/verstage \ + ,$(1)),COREBOOT,COREBOOT FW_MAIN_A FW_MAIN_B)))