From dde307c01abc6fb9687404ca08dd40a065530aaf Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 24 Mar 2015 15:54:20 -0600 Subject: cbfstool: add filetypes for FSP, MRC, SPC and MRC_CACHE This adds a few new file types to cbfstool. Currently these files are being added using bare hex values in the coreboot makefiles. This patch is just to make the values official and to help get rid of some confusion in the values used within the makefiles. All of these new types are roughly equivalent to raw. Change-Id: I37c4180a247136cd98080f6f7609d3cf905a62f5 Signed-off-by: Martin Roth Reviewed-on: http://review.coreboot.org/8977 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin --- util/cbfstool/cbfs.h | 4 ++++ util/cbfstool/cbfs_image.c | 4 ++++ util/cbfstool/common.c | 4 ++++ 3 files changed, 12 insertions(+) (limited to 'util') diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index e5011d6e1e..f26b14c50a 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -106,7 +106,11 @@ struct cbfs_payload { #define CBFS_COMPONENT_VSA 0x51 #define CBFS_COMPONENT_MBI 0x52 #define CBFS_COMPONENT_MICROCODE 0x53 +#define CBFS_COMPONENT_FSP 0x60 +#define CBFS_COMPONENT_MRC 0x61 #define CBFS_COMPONENT_CMOS_DEFAULT 0xaa +#define CBFS_COMPONENT_SPD 0xab +#define CBFS_COMPONENT_MRC_CACHE 0xac #define CBFS_COMPONENT_CMOS_LAYOUT 0x01aa /* The deleted type is chosen to be a value diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 6b0ed59efc..1f60d68154 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -49,8 +49,12 @@ static const struct typedesc_t types_cbfs_entry[] = { {CBFS_COMPONENT_VSA, "vsa"}, {CBFS_COMPONENT_MBI, "mbi"}, {CBFS_COMPONENT_MICROCODE, "microcode"}, + {CBFS_COMPONENT_FSP, "fsp"}, + {CBFS_COMPONENT_MRC, "mrc"}, {CBFS_COMPONENT_CMOS_DEFAULT, "cmos_default"}, {CBFS_COMPONENT_CMOS_LAYOUT, "cmos_layout"}, + {CBFS_COMPONENT_SPD, "spd"}, + {CBFS_COMPONENT_MRC_CACHE, "mrc_cache"}, {CBFS_COMPONENT_DELETED, "deleted"}, {CBFS_COMPONENT_NULL, "null"}, {0, NULL}, diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 6ac39ef826..9923ca344e 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -184,8 +184,12 @@ static struct filetypes_t { {CBFS_COMPONENT_VSA, "vsa"}, {CBFS_COMPONENT_MBI, "mbi"}, {CBFS_COMPONENT_MICROCODE, "microcode"}, + {CBFS_COMPONENT_FSP, "fsp"}, + {CBFS_COMPONENT_MRC, "mrc"}, {CBFS_COMPONENT_CMOS_DEFAULT, "cmos default"}, {CBFS_COMPONENT_CMOS_LAYOUT, "cmos layout"}, + {CBFS_COMPONENT_SPD, "spd"}, + {CBFS_COMPONENT_MRC_CACHE, "mrc_cache"}, {CBFS_COMPONENT_DELETED, "deleted"}, {CBFS_COMPONENT_NULL, "null"} }; -- cgit v1.2.3