GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: store boot media information in sysinfo 

Write boot media information in sysinfo, if it exists. This allows picking the
right CBFS for further files in case there are several.

Change-Id: I75a8ee6b93f349b9f2fab1e82826aba675949c0a
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10869
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
This commit is contained in:
Patrick Georgi 2015-07-14 17:15:24 +01:00 committed by Patrick Georgi
parent fb5d5b16ee
commit f61b35d5b0
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
payloads/libpayload/include/coreboot_tables.h
View File

@ -257,6 +257,17 @@ struct cb_spi_flash {
uint32_t erase_cmd; uint32_t erase_cmd;
}; };
#define CB_TAG_BOOT_MEDIA_PARAMS 0x0030
struct cb_boot_media_params {
uint32_t tag;
uint32_t size;
/* offsets are relative to start of boot media */
uint64_t fmap_offset;
uint64_t cbfs_offset;
uint64_t cbfs_size;
uint64_t boot_media_size;
};
#define CB_TAG_SERIALNO 0x002a #define CB_TAG_SERIALNO 0x002a
#define CB_MAX_SERIALNO_LENGTH 32 #define CB_MAX_SERIALNO_LENGTH 32

4
payloads/libpayload/include/sysinfo.h
View File

@ -124,6 +124,10 @@ struct sysinfo_t {
uint32_t sector_size; uint32_t sector_size;
uint32_t erase_cmd; uint32_t erase_cmd;
} spi_flash; } spi_flash;
uint64_t fmap_offset;
uint64_t cbfs_offset;
uint64_t cbfs_size;
uint64_t boot_media_size;
uint64_t mtc_start; uint64_t mtc_start;
uint32_t mtc_size; uint32_t mtc_size;
}; };

14
payloads/libpayload/libc/coreboot.c
View File

@ -220,6 +220,17 @@ static void cb_parse_spi_flash(void *ptr, struct sysinfo_t *info)
info->spi_flash.erase_cmd = flash->erase_cmd; info->spi_flash.erase_cmd = flash->erase_cmd;
} }
static void cb_parse_boot_media_params(unsigned char *ptr,
struct sysinfo_t *info)
{
struct cb_boot_media_params *const bmp =
(struct cb_boot_media_params *)ptr;
info->fmap_offset = bmp->fmap_offset;
info->cbfs_offset = bmp->cbfs_offset;
info->cbfs_size = bmp->cbfs_size;
info->boot_media_size = bmp->boot_media_size;
}
int cb_parse_header(void *addr, int len, struct sysinfo_t *info) int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
{ {
struct cb_header *header; struct cb_header *header;
@ -372,6 +383,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
case CB_TAG_MTC: case CB_TAG_MTC:
cb_parse_mtc(ptr, info); cb_parse_mtc(ptr, info);
break; break;
case CB_TAG_BOOT_MEDIA_PARAMS:
cb_parse_boot_media_params(ptr, info);
break;
default: default:
cb_parse_arch_specific(rec, info); cb_parse_arch_specific(rec, info);
break; break;