cbfstool: Change FMD annotation to flags

The idea of "annotation" for firmware sections was pretty flexible, but
in future we will want multiple attributes applied to same area. For
example, indicate the section must be preserved when updating firmware
so serial number or MAC address can be preserved.

The solution here is to extend annotation so it can take multiple
identifiers (flags) in a row. For example, to declare a 64KB COREBOOT
section as CBFS using annotation:

 COREBOOT(CBFS)@0x0 64k

If there's a new flag "PRESERVE" indicating the section must be
preserved before update, we can declare it following CBFS flag:

 COREBOOT(CBFS PRESERVE)@0x0 64k

The flags are directly parsed in fmd_parser, and stored in an union
flashmap_flags. Output modules can choose to ignore or process the
flags.

Currently the only supported flag is "CBFS" (for backward compatible
with annotation). There will be more new flags in follow up patches.

BUG=chromium:936768
TEST=make; boots on x86 "google/eve" and arm "google/kukui" devices

Change-Id: Ie2d99f570e6faff6ed3a4344d6af7526a4515fae
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31706
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 16 insertions, 17 deletions

diff --git a/util/cbfstool/cbfs_sections.c b/util/cbfstool/cbfs_sections.c
index f87b2c8b5a92..285725760b6b 100644
--- a/util/cbfstool/cbfs_sections.c
+++ b/util/cbfstool/cbfs_sections.c
@@ -57,26 +57,25 @@ static void descriptor_list_append(struct descriptor_list *list,
 }
 
 /* Implementation of cbfs module's callback; invoked during fmd file parsing */
-bool fmd_process_annotation_impl(const struct flashmap_descriptor *node,
-							const char *annotation)
+bool fmd_process_flag_cbfs(const struct flashmap_descriptor *node)
 {
-	if (strcmp(annotation, SECTION_ANNOTATION_CBFS) == 0 &&
-							node->list_len == 0) {
-		struct descriptor_node *list_node = malloc(sizeof(*list_node));
-		list_node->val = node;
-		list_node->next = NULL;
-
-		if (strcmp(node->name, SECTION_NAME_PRIMARY_CBFS) == 0) {
-			descriptor_list_prepend(&cbfs_sections, list_node);
-			seen_primary_section = true;
-		} else {
-			descriptor_list_append(&cbfs_sections, list_node);
-		}
-
-		return true;
+	struct descriptor_node *list_node;
+
+	if (node->list_len != 0)
+		return false;
+
+	list_node = (struct descriptor_node *)malloc(sizeof(*list_node));
+	list_node->val = node;
+	list_node->next = NULL;
+
+	if (strcmp(node->name, SECTION_NAME_PRIMARY_CBFS) == 0) {
+		descriptor_list_prepend(&cbfs_sections, list_node);
+		seen_primary_section = true;
+	} else {
+		descriptor_list_append(&cbfs_sections, list_node);
 	}
 
-	return false;
+	return true;
 }
 
 cbfs_section_iterator_t cbfs_sections_iterator(void)