diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/cbfstool/cbfs.h | 11 | ||||
| -rw-r--r-- | util/cbfstool/common.c | 5 | ||||
| -rw-r--r-- | util/x86emu/yabel/vbe.c | 5 |
3 files changed, 15 insertions, 6 deletions
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 9d57165d85..9661bbd2c9 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -68,9 +68,14 @@ struct cbfs_payload { Users are welcome to use any other value for their components */ -#define CBFS_COMPONENT_STAGE 0x10 -#define CBFS_COMPONENT_PAYLOAD 0x20 -#define CBFS_COMPONENT_OPTIONROM 0x30 +#define CBFS_COMPONENT_STAGE 0x10 +#define CBFS_COMPONENT_PAYLOAD 0x20 +#define CBFS_COMPONENT_OPTIONROM 0x30 +#define CBFS_COMPONENT_BOOTSPLASH 0x40 +#define CBFS_COMPONENT_RAW 0x50 +#define CBFS_COMPONENT_VSA 0x51 +#define CBFS_COMPONENT_MBI 0x52 +#define CBFS_COMPONENT_MICROCODE 0x53 /* The deleted type is chosen to be a value * that can be written in a FLASH from all other diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 784e1f9f5f..e0f4c312a3 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -128,6 +128,11 @@ struct filetypes_t { {CBFS_COMPONENT_STAGE, "stage"}, {CBFS_COMPONENT_PAYLOAD, "payload"}, {CBFS_COMPONENT_OPTIONROM, "optionrom"}, + {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"}, + {CBFS_COMPONENT_RAW, "raw"}, + {CBFS_COMPONENT_VSA, "vsa"}, + {CBFS_COMPONENT_MBI, "mbi"}, + {CBFS_COMPONENT_MICROCODE, "microcode"}, {CBFS_COMPONENT_DELETED, "deleted"}, {CBFS_COMPONENT_NULL, "null"} }; diff --git a/util/x86emu/yabel/vbe.c b/util/x86emu/yabel/vbe.c index 90b468bd25..6814b1964f 100644 --- a/util/x86emu/yabel/vbe.c +++ b/util/x86emu/yabel/vbe.c @@ -795,12 +795,11 @@ void vbe_set_graphics(void) * cares. */ int imagesize = 1024*768*2; - struct cbfs_file *file = cbfs_find("bootsplash.jpg"); - if (!file) { + unsigned char *jpeg = cbfs_find_file("bootsplash.jpg", CBFS_TYPE_BOOTSPLASH); + if (!jpeg) { DEBUG_PRINTF_VBE("Could not find bootsplash.jpg\n"); return; } - unsigned char *jpeg = ((unsigned char *)file) + ntohl(file->offset); DEBUG_PRINTF_VBE("Splash at %08x ...\n", jpeg); dump(jpeg, 64); |