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

libpayload: Minor board ID / RAM code cleanups 

This patch mirrors recent cleanups in coreboot regarding the strapping
ID entries in the coreboot table.

Change-Id: Ia5c3728daf2cb317f8e2bc72c6f1714d6cb4d080
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/22742
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Julius Werner 2017-12-05 13:43:56 -08:00
parent e2f17f782f
commit 2e029ac6a6
3 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,14 +225,6 @@ struct cb_cbmem_tab {
uint64_t cbmem_tab; uint64_t cbmem_tab;
}; };
#define CB_TAG_BOARD_ID 0x0025
struct cb_board_id {
uint32_t tag;
uint32_t size;
/* Board ID as retrieved from the board revision GPIOs. */
uint32_t board_id;
};
#define CB_TAG_X86_ROM_MTRR 0x0021 #define CB_TAG_X86_ROM_MTRR 0x0021
struct cb_x86_rom_mtrr { struct cb_x86_rom_mtrr {
uint32_t tag; uint32_t tag;
@ -244,11 +236,13 @@ struct cb_x86_rom_mtrr {
uint32_t index; uint32_t index;
}; };
#define CB_TAG_BOARD_ID 0x0025
#define CB_TAG_RAM_CODE 0x0028 #define CB_TAG_RAM_CODE 0x0028
struct cb_ram_code { struct cb_strapping_id {
uint32_t tag; uint32_t tag;
uint32_t size; uint32_t size;
uint32_t ram_code; uint32_t id_code;
}; };
#define CB_TAG_SPI_FLASH 0x0029 #define CB_TAG_SPI_FLASH 0x0029

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

@ -108,8 +108,11 @@ struct sysinfo_t {
void *cbmem_cons; void *cbmem_cons;
void *mrc_cache; void *mrc_cache;
void *acpi_gnvs; void *acpi_gnvs;
#define UNDEFINED_STRAPPING_ID (~0)
u32 board_id; u32 board_id;
u32 ram_code; u32 ram_code;
void *wifi_calibration; void *wifi_calibration;
uint64_t ramoops_buffer; uint64_t ramoops_buffer;
uint32_t ramoops_buffer_size; uint32_t ramoops_buffer_size;

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

@ -147,14 +147,14 @@ static void cb_parse_acpi_gnvs(unsigned char *ptr, struct sysinfo_t *info)
static void cb_parse_board_id(unsigned char *ptr, struct sysinfo_t *info) static void cb_parse_board_id(unsigned char *ptr, struct sysinfo_t *info)
{ {
struct cb_board_id *const cbbid = (struct cb_board_id *)ptr; struct cb_strapping_id *const cbbid = (struct cb_strapping_id *)ptr;
info->board_id = cbbid->board_id; info->board_id = cbbid->id_code;
} }
static void cb_parse_ram_code(unsigned char *ptr, struct sysinfo_t *info) static void cb_parse_ram_code(unsigned char *ptr, struct sysinfo_t *info)
{ {
struct cb_ram_code *const ram_code = (struct cb_ram_code *)ptr; struct cb_strapping_id *const ram_code = (struct cb_strapping_id *)ptr;
info->ram_code = ram_code->ram_code; info->ram_code = ram_code->id_code;
} }
#if IS_ENABLED(CONFIG_LP_NVRAM) #if IS_ENABLED(CONFIG_LP_NVRAM)
@ -277,13 +277,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
info->header = header; info->header = header;
/* /* Initialize IDs as undefined in case they don't show up in table. */
* Board straps represented by numerical values are small numbers. info->board_id = UNDEFINED_STRAPPING_ID;
* Preset them to an invalid value in case the firmware does not info->ram_code = UNDEFINED_STRAPPING_ID;
* supply the info.
*/
info->board_id = ~0;
info->ram_code = ~0;
/* Now, walk the tables. */ /* Now, walk the tables. */
ptr += header->header_bytes; ptr += header->header_bytes;