cbfstool: introduce new file types

Let's move x86 style bootblocks (and later the others) and the master header
into the CBFS structure. Prepare for this by adding file types.

Change-Id: I1b4149c7f3b8564ee358a2c18ba91e6a7a6797da
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/11627
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 70f806b..579afa6 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -148,6 +148,8 @@
     Users are welcome to use any other value for their
     components */
 
+#define CBFS_COMPONENT_BOOTBLOCK  0x01
+#define CBFS_COMPONENT_CBFSHEADER 0x02
 #define CBFS_COMPONENT_STAGE      0x10
 #define CBFS_COMPONENT_PAYLOAD    0x20
 #define CBFS_COMPONENT_OPTIONROM  0x30
@@ -181,6 +183,8 @@
 };
 
 static struct typedesc_t filetypes[] unused = {
+	{CBFS_COMPONENT_BOOTBLOCK, "bootblock"},
+	{CBFS_COMPONENT_CBFSHEADER, "cbfs header"},
 	{CBFS_COMPONENT_STAGE, "stage"},
 	{CBFS_COMPONENT_PAYLOAD, "payload"},
 	{CBFS_COMPONENT_OPTIONROM, "optionrom"},