diff options
| author | Frans Hendriks <fhendriks@eltan.com> | 2019-12-09 09:56:44 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-12-11 11:43:39 +0000 |
| commit | 07e6098d487fc9135fc47e316a6d7e0332d814a0 (patch) | |
| tree | 9be834f61f03aaf51b96c7a67be7145d54d69e01 | |
| parent | 8245bd25a35466248c00bc7a4d0cf96f8391924a (diff) | |
| download | coreboot-07e6098d487fc9135fc47e316a6d7e0332d814a0.tar.xz | |
mb/facebook/fbg1701: Move verified items to board_verified_boot.h
Items in onboard.h are related to verified or measured boot.
Move the items to board_verified_boot.h and remove onboard.h.
BUG=N/A
TEST=build
Change-Id: Icfc8d6d8351f0654c277e81c7f3cc2b0a947866a
Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37614
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/facebook/fbg1701/board_mboot.h | 1 | ||||
| -rw-r--r-- | src/mainboard/facebook/fbg1701/board_verified_boot.h | 11 | ||||
| -rw-r--r-- | src/mainboard/facebook/fbg1701/onboard.h | 31 |
3 files changed, 11 insertions, 32 deletions
diff --git a/src/mainboard/facebook/fbg1701/board_mboot.h b/src/mainboard/facebook/fbg1701/board_mboot.h index 5cfb091451..69272de78b 100644 --- a/src/mainboard/facebook/fbg1701/board_mboot.h +++ b/src/mainboard/facebook/fbg1701/board_mboot.h @@ -14,6 +14,7 @@ */ #include <mboot.h> +#include "board_verified_boot.h" const mboot_measure_item_t mb_log_list[] = { { "config", CBFS_TYPE_RAW, MBOOT_PCR_INDEX_0, EV_NO_ACTION, NULL }, diff --git a/src/mainboard/facebook/fbg1701/board_verified_boot.h b/src/mainboard/facebook/fbg1701/board_verified_boot.h index 0f79579050..20f53285ab 100644 --- a/src/mainboard/facebook/fbg1701/board_verified_boot.h +++ b/src/mainboard/facebook/fbg1701/board_verified_boot.h @@ -17,6 +17,15 @@ #define BOARD_VERIFIED_BOOT_H #include <vboot_check.h> -#include "onboard.h" + +/* Define the items to be measured or verified */ +#define FSP (const char *)"fsp.bin" +#define CMOS_LAYOUT (const char *)"cmos_layout.bin" +#define RAMSTAGE (const char *)CONFIG_CBFS_PREFIX"/ramstage" +#define ROMSTAGE (const char *)CONFIG_CBFS_PREFIX"/romstage" +#define PAYLOAD (const char *)CONFIG_CBFS_PREFIX"/payload" +#define POSTCAR (const char *)CONFIG_CBFS_PREFIX"/postcar" +#define OP_ROM_VBT (const char *)"vbt.bin" +#define MICROCODE (const char *)"cpu_microcode_blob.bin" #endif diff --git a/src/mainboard/facebook/fbg1701/onboard.h b/src/mainboard/facebook/fbg1701/onboard.h index 715f76a39d..e69de29bb2 100644 --- a/src/mainboard/facebook/fbg1701/onboard.h +++ b/src/mainboard/facebook/fbg1701/onboard.h @@ -1,31 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 Google Inc. - * Copyright (C) 2015 Intel Corp. - * Copyright (C) 2018-2019 Eltan B.V. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef ONBOARD_H -#define ONBOARD_H - -/* Define the items to be measured or verified */ -#define FSP (const char *)"fsp.bin" -#define CMOS_LAYOUT (const char *)"cmos_layout.bin" -#define RAMSTAGE (const char *)CONFIG_CBFS_PREFIX"/ramstage" -#define ROMSTAGE (const char *)CONFIG_CBFS_PREFIX"/romstage" -#define PAYLOAD (const char *)CONFIG_CBFS_PREFIX"/payload" -#define POSTCAR (const char *)CONFIG_CBFS_PREFIX"/postcar" -#define OP_ROM_VBT (const char *)"vbt.bin" -#define MICROCODE (const char *)"cpu_microcode_blob.bin" - -#endif |