summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2018-01-09 14:43:01 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-01-10 12:58:55 -0800
commitc20884cf4e1d8e059952e1e313a5a949e96be91b (patch)
tree55b9ac271bc3027ab4c42dceee6794199cfc0a63
parent5ec8f4f49541efa98a606dbf84f0516b66378bef (diff)
downloadchrome-ec-c20884cf4e1d8e059952e1e313a5a949e96be91b.tar.gz
EFS: Add SIG_RW_B in fmap
This patch adds SIG_RW_B in fmap. It'll be referenced by futility to show signature information. BUG=b:69921268 BRANCH=none TEST=futility dump_fmap build/fizz/ec.bin area: 11 area_offset: 0x0007fc00 area_size: 0x00000400 (1024) area_name: SIG_RW_B Change-Id: Ief9980b00f7bce876256c34cd5d35c9f6b7a31e0 Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/858225 Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r--common/fmap.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/common/fmap.c b/common/fmap.c
index b2dc24e9b8..8b2087d7fe 100644
--- a/common/fmap.c
+++ b/common/fmap.c
@@ -74,7 +74,11 @@ struct fmap_area_header {
#define NUM_EC_FMAP_AREAS_ROLLBACK 0
#endif
#ifdef CONFIG_RW_B
-#define NUM_EC_FMAP_AREAS_RW_B 1
+# ifdef CONFIG_RWSIG_TYPE_RWSIG
+# define NUM_EC_FMAP_AREAS_RW_B 2
+# else
+# define NUM_EC_FMAP_AREAS_RW_B 1
+# endif
#else
#define NUM_EC_FMAP_AREAS_RW_B 0
#endif
@@ -234,6 +238,17 @@ const struct _ec_fmap {
.area_size = CONFIG_RW_SIZE,
.area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO,
},
+#ifdef CONFIG_RWSIG_TYPE_RWSIG
+ {
+ /* RW_B image signature */
+ .area_name = "SIG_RW_B",
+ .area_offset = CONFIG_EC_PROTECTED_STORAGE_OFF -
+ FMAP_REGION_START + CONFIG_RW_B_SIG_ADDR -
+ CONFIG_PROGRAM_MEMORY_BASE,
+ .area_size = CONFIG_RW_SIG_SIZE,
+ .area_flags = FMAP_AREA_STATIC | FMAP_AREA_RO,
+ },
+#endif
#endif
}
};