coreboot-gerrit March 2016

coreboot-gerrit@coreboot.org

1 participants
1119 discussions

New patch to review for coreboot: util/tss-generator: WIP - Add TSS generator
by Philipp Deppenwiese 18 Mar '16

18 Mar '16

Philipp Deppenwiese (zaolin.daisuki(a)googlemail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14135 -gerrit commit e09664eac833a5ff420af941385f9bf512cddf5b Author: Philipp Deppenwiese <zaolin(a)das-labor.org> Date: Mon Mar 14 18:53:09 2016 +0100 util/tss-generator: WIP - Add TSS generator Change-Id: I93ef112111b403a23c0dce4cf109b9e87424bc1a Signed-off-by: Philipp Deppenwiese <zaolin(a)das-labor.org> --- src/include/tpm/tss_constants.h | 174 +++++++++--- util/tss-generator/Makefile | 16 ++ util/tss-generator/Makefile.inc | 19 ++ util/tss-generator/tss-generator.c | 560 +++++++++++++++++++++++++++++++++++++ util/tss-generator/tss_extras.h | 27 ++ util/tss-generator/tss_internal.h | 61 ++++ 6 files changed, 824 insertions(+), 33 deletions(-) diff --git a/src/include/tpm/tss_constants.h b/src/include/tpm/tss_constants.h index afd2593..2417356 100644 --- a/src/include/tpm/tss_constants.h +++ b/src/include/tpm/tss_constants.h @@ -18,37 +18,40 @@ #define TPM_E_NON_FATAL 0x800 -#define TPM_SUCCESS ((uint32_t)0x00000000) - -#define TPM_E_AREA_LOCKED ((uint32_t)0x0000003c) -#define TPM_E_BADINDEX ((uint32_t)0x00000002) -#define TPM_E_BAD_PRESENCE ((uint32_t)0x0000002d) -#define TPM_E_IOERROR ((uint32_t)0x0000001f) -#define TPM_E_INVALID_POSTINIT ((uint32_t)0x00000026) -#define TPM_E_MAXNVWRITES ((uint32_t)0x00000048) -#define TPM_E_OWNER_SET ((uint32_t)0x00000014) - -#define TPM_E_NEEDS_SELFTEST ((uint32_t)(TPM_E_NON_FATAL + 1)) -#define TPM_E_DOING_SELFTEST ((uint32_t)(TPM_E_NON_FATAL + 2)) - -#define TPM_E_ALREADY_INITIALIZED ((uint32_t)0x00005000) /* vboot local */ -#define TPM_E_INTERNAL_INCONSISTENCY ((uint32_t)0x00005001) /* vboot local */ -#define TPM_E_MUST_REBOOT ((uint32_t)0x00005002) /* vboot local */ -#define TPM_E_CORRUPTED_STATE ((uint32_t)0x00005003) /* vboot local */ -#define TPM_E_COMMUNICATION_ERROR ((uint32_t)0x00005004) /* vboot local */ -#define TPM_E_RESPONSE_TOO_LARGE ((uint32_t)0x00005005) /* vboot local */ -#define TPM_E_NO_DEVICE ((uint32_t)0x00005006) /* vboot local */ -#define TPM_E_INPUT_TOO_SMALL ((uint32_t)0x00005007) /* vboot local */ -#define TPM_E_WRITE_FAILURE ((uint32_t)0x00005008) /* vboot local */ -#define TPM_E_READ_EMPTY ((uint32_t)0x00005009) /* vboot local */ -#define TPM_E_READ_FAILURE ((uint32_t)0x0000500a) /* vboot local */ - -#define TPM_NV_INDEX0 ((uint32_t)0x00000000) -#define TPM_NV_INDEX_LOCK ((uint32_t)0xffffffff) -#define TPM_NV_PER_GLOBALLOCK (((uint32_t)1)<<15) -#define TPM_NV_PER_PPWRITE (((uint32_t)1)<<0) -#define TPM_NV_PER_READ_STCLEAR (((uint32_t)1)<<31) -#define TPM_NV_PER_WRITE_STCLEAR (((uint32_t)1)<<14) +#define TPM_SUCCESS ((uint32_t) 0x00000000) + +#define TPM_E_AREA_LOCKED ((uint32_t) 0x0000003c) +#define TPM_E_BADINDEX ((uint32_t) 0x00000002) +#define TPM_E_BAD_PRESENCE ((uint32_t) 0x0000002d) +#define TPM_E_IOERROR ((uint32_t) 0x0000001f) +#define TPM_E_INVALID_POSTINIT ((uint32_t) 0x00000026) +#define TPM_E_MAXNVWRITES ((uint32_t) 0x00000048) +#define TPM_E_OWNER_SET ((uint32_t) 0x00000014) + +#define TPM_E_NEEDS_SELFTEST ((uint32_t) (TPM_E_NON_FATAL + 1)) +#define TPM_E_DOING_SELFTEST ((uint32_t) (TPM_E_NON_FATAL + 2)) + +#define TPM_E_ALREADY_INITIALIZED ((uint32_t) 0x00005000) /* vboot local */ +#define TPM_E_INTERNAL_INCONSISTENCY ((uint32_t) 0x00005001) /* vboot local */ +#define TPM_E_MUST_REBOOT ((uint32_t) 0x00005002) /* vboot local */ +#define TPM_E_CORRUPTED_STATE ((uint32_t) 0x00005003) /* vboot local */ +#define TPM_E_COMMUNICATION_ERROR ((uint32_t) 0x00005004) /* vboot local */ +#define TPM_E_RESPONSE_TOO_LARGE ((uint32_t) 0x00005005) /* vboot local */ +#define TPM_E_NO_DEVICE ((uint32_t) 0x00005006) /* vboot local */ +#define TPM_E_INPUT_TOO_SMALL ((uint32_t) 0x00005007) /* vboot local */ +#define TPM_E_WRITE_FAILURE ((uint32_t) 0x00005008) /* vboot local */ +#define TPM_E_READ_EMPTY ((uint32_t) 0x00005009) /* vboot local */ +#define TPM_E_READ_FAILURE ((uint32_t) 0x0000500a) /* vboot local */ + +#define TPM_NV_INDEX0 ((uint32_t) 0x00000000) +#define TPM_NV_INDEX_LOCK ((uint32_t) 0xffffffff) +#define TPM_NV_PER_GLOBALLOCK (((uint32_t) 1) << 15) +#define TPM_NV_PER_PPWRITE (((uint32_t) 1) << 0) +#define TPM_NV_PER_READ_STCLEAR (((uint32_t)1) << 31) +#define TPM_NV_PER_WRITE_STCLEAR (((uint32_t)1) << 14) + +#define TPM_TAG_NV_ATTRIBUTES ((uint16_t) 0x0017) +#define TPM_TAG_NV_DATA_PUBLIC ((uint16_t) 0x0018) #define TPM_TAG_RQU_COMMAND ((uint16_t) 0xc1) #define TPM_TAG_RQU_AUTH1_COMMAND ((uint16_t) 0xc2) @@ -59,9 +62,75 @@ #define TPM_TAG_RSP_AUTH2_COMMAND ((uint16_t) 0xc6) typedef uint8_t TSS_BOOL; +typedef uint8_t TPM_BOOL; +typedef uint16_t TPM_TAG; typedef uint16_t TPM_STRUCTURE_TAG; +typedef uint32_t TPM_NV_INDEX; +typedef uint32_t TPM_NV_PER_ATTRIBUTES; +typedef uint8_t TPM_LOCALITY_SELECTION; +typedef uint32_t TPM_COMMAND_CODE; +typedef uint16_t TPM_PHYSICAL_PRESENCE; +typedef uint16_t TPM_STARTUP_TYPE; +typedef uint32_t TPM_CAPABILITY_AREA; + +#define TPM_CAP_FLAG ((uint32_t) 0x00000004) +#define TPM_CAP_FLAG_PERMANENT ((uint32_t) 0x00000108) +#define TPM_CAP_FLAG_VOLATILE ((uint32_t) 0x00000109) + +#define TPM_CAP_PROPERTY ((uint32_t) 0x00000005) +#define TPM_CAP_PROP_OWNER ((uint32_t) 0x00000111) +#define TPM_CAP_NV_INDEX ((uint32_t) 0x00000011) + +#define TPM_ST_CLEAR ((uint16_t) 0x0001) +#define TPM_ST_STATE ((uint16_t) 0x0002) +#define TPM_ST_DEACTIVATED ((uint16_t) 0x0003) + +#define TPM_LOC_FOUR (((uint32_t)1)<<4) +#define TPM_LOC_THREE (((uint32_t)1)<<3) +#define TPM_LOC_TWO (((uint32_t)1)<<2) +#define TPM_LOC_ONE (((uint32_t)1)<<1) +#define TPM_LOC_ZERO (((uint32_t)1)<<0) + +#define TPM_PHYSICAL_PRESENCE_LOCK ((uint16_t) 0x0004) +#define TPM_PHYSICAL_PRESENCE_PRESENT ((uint16_t) 0x0008) +#define TPM_PHYSICAL_PRESENCE_NOTPRESENT ((uint16_t) 0x0010) +#define TPM_PHYSICAL_PRESENCE_CMD_ENABLE ((uint16_t) 0x0020) +#define TPM_PHYSICAL_PRESENCE_HW_ENABLE ((uint16_t) 0x0040) +#define TPM_PHYSICAL_PRESENCE_LIFETIME_LOCK ((uint16_t) 0x0080) +#define TPM_PHYSICAL_PRESENCE_CMD_DISABLE ((uint16_t) 0x0100) +#define TPM_PHYSICAL_PRESENCE_HW_DISABLE ((uint16_t) 0x0200) + +#define TPM_SHA1_160_HASH_LEN 0x14 +#define TPM_SHA1BASED_NONCE_LEN TPM_SHA1_160_HASH_LEN -typedef struct tdTPM_PERMANENT_FLAGS { +typedef struct tdTPM_DIGEST +{ + uint8_t digest[TPM_SHA1_160_HASH_LEN]; +} TPM_DIGEST; + +typedef TPM_DIGEST TPM_COMPOSITE_HASH; + +typedef struct tdTPM_PCR_SELECTION +{ + uint16_t sizeOfSelect; + uint8_t *pcrSelect; +} TPM_PCR_SELECTION; + +typedef struct tdTPM_NV_ATTRIBUTES +{ + TPM_STRUCTURE_TAG tag; + TPM_NV_PER_ATTRIBUTES attributes; +} TPM_NV_ATTRIBUTES; + +typedef struct tdTPM_PCR_INFO_SHORT +{ + TPM_PCR_SELECTION pcrSelection; + TPM_LOCALITY_SELECTION localityAtRelease; + TPM_COMPOSITE_HASH digestAtRelease; +} TPM_PCR_INFO_SHORT; + +typedef struct tdTPM_PERMANENT_FLAGS +{ TPM_STRUCTURE_TAG tag; TSS_BOOL disable; TSS_BOOL ownership; @@ -94,4 +163,43 @@ typedef struct tdTPM_STCLEAR_FLAGS { TSS_BOOL bGlobalLock; } TPM_STCLEAR_FLAGS; -#endif /* TPM_TSS_CONSTANTS_H */ +typedef struct tdTPM_NV_DATA_PUBLIC +{ + TPM_STRUCTURE_TAG tag; + TPM_NV_INDEX nvIndex; + TPM_PCR_INFO_SHORT pcrInfoRead; + TPM_PCR_INFO_SHORT pcrInfoWrite; + TPM_NV_ATTRIBUTES permission; + TPM_BOOL bReadSTClear; + TPM_BOOL bWriteSTClear; + TPM_BOOL bWriteDefine; + uint32_t dataSize; +} TPM_NV_DATA_PUBLIC; + +typedef struct tdTPM_NONCE +{ + uint8_t nonce[TPM_SHA1BASED_NONCE_LEN]; +} TPM_NONCE; + +/* Ordinals */ + +#define TPM_ORD_ContinueSelfTest ((uint32_t) 0x00000053) +#define TPM_ORD_Extend ((uint32_t) 0x00000014) +#define TPM_ORD_ForceClear ((uint32_t) 0x0000005D) +#define TPM_ORD_GetCapability ((uint32_t) 0x00000065) +#define TPM_ORD_GetRandom ((uint32_t) 0x00000046) +#define TPM_ORD_NV_DefineSpace ((uint32_t) 0x000000CC) +#define TPM_ORD_NV_ReadValue ((uint32_t) 0x000000CF) +#define TPM_ORD_NV_WriteValue ((uint32_t) 0x000000CD) +#define TPM_ORD_PcrRead ((uint32_t) 0x00000015) +#define TPM_ORD_PhysicalEnable ((uint32_t) 0x0000006F) +#define TPM_ORD_PhysicalDisable ((uint32_t) 0x00000070) +#define TSC_ORD_PhysicalPresence ((uint32_t) 0x4000000A) +#define TPM_ORD_PhysicalSetDeactivated ((uint32_t) 0x00000072) +#define TPM_ORD_ReadPubek ((uint32_t) 0x0000007C) +#define TPM_ORD_SaveState ((uint32_t) 0x00000098) +#define TPM_ORD_SelfTestFull ((uint32_t) 0x00000050) +#define TPM_ORD_Startup ((uint32_t) 0x00000099) + + +#endif /* TPM_TSS_CONSTANTS_H */ diff --git a/util/tss-generator/Makefile b/util/tss-generator/Makefile new file mode 100644 index 0000000..63e3d69 --- /dev/null +++ b/util/tss-generator/Makefile @@ -0,0 +1,16 @@ +top ?= $(abspath ../..) +objutil ?= $(top)/util +arch ?= $(ARCH) + +HOSTCC ?= $(CC) + +.PHONY: all +all: $(objutil)/tss-generator/tss-generator + +.PHONY: clean +clean: + $(RM) $(objutil)/tss-generator/tss-generator $(tssobj) + +.SILENT: + +include Makefile.inc diff --git a/util/tss-generator/Makefile.inc b/util/tss-generator/Makefile.inc new file mode 100644 index 0000000..c3f44e5 --- /dev/null +++ b/util/tss-generator/Makefile.inc @@ -0,0 +1,19 @@ +tssobj := +tssobj += tss-generator.o + +TOOLCFLAGS := -Werror -Wall -Wextra +TOOLCFLAGS += -I$(top)/src/include/tpm +TOOLCFLAGS += -I$(top)/src/commonlib/include +TOOLCFLAGS += -I$(objutil)/tss-generator + +$(objutil)/tss-generator/%.o: $(objutil)/tss-generator/%.c + printf " HOSTCC $(subst $(objutil)/,,$(@))\n" + $(HOSTCC) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $< + +$(objutil)/tss-generator/%.o: $(top)/util/tss-generator/%.c + printf " HOSTCC $(subst $(objutil)/,,$(@))\n" + $(HOSTCC) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $< + +$(objutil)/tss-generator/tss-generator: $(addprefix $(objutil)/tss-generator/,$(tssobj)) + printf " HOSTCC $(subst $(objutil)/,,$(@)) (link)\n" + $(HOSTCC) -o $@ $(addprefix $(objutil)/tss-generator/,$(tssobj)) diff --git a/util/tss-generator/tss-generator.c b/util/tss-generator/tss-generator.c new file mode 100644 index 0000000..44b7869 --- /dev/null +++ b/util/tss-generator/tss-generator.c @@ -0,0 +1,560 @@ +/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +/* This program generates partially filled TPM datagrams and other compile-time + * constants (e.g. structure sizes and offsets). Compile this file---and ONLY + * this file---with -fpack-struct. We take advantage of the fact that the + * (packed) TPM structures layout (mostly) match the TPM request and response + * datagram layout. When they don't completely match, some fixing is necessary + * (see PCR_SELECTION_FIX below). + */ + +#include <assert.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> + +#include <inttypes.h> /* For PRIu64 */ +#include <stddef.h> +#include <stdint.h> +#include <stdlib.h> + +#if defined(HAVE_ENDIAN_H) && defined(HAVE_LITTLE_ENDIAN) +#include <byteswap.h> +#include <memory.h> +#endif + +#include "tss_internal.h" +#include "tss_extras.h" +#include <tss_constants.h> + +/* See struct Command below. This structure represent a field in a TPM + * command. [name] is the field name. [visible] is 1 if the field is + * modified by the run-time. Non-visible fields are initialized at build time + * and remain constant. [size] is the field size in bytes. [value] is the + * fixed value of non-visible fields. + */ +typedef struct Field { + const char* name; + int visible; + int offset; + int size; + uint32_t value; /* large enough for all initializers */ + struct Field* next; +} Field; + +/* This structure is used to build (at build time) and manipulate (at firmware + * or emulation run time) buffers containing TPM datagrams. [name] is the name + * of a TPM command. [size] is the size of the command buffer in bytes, when + * known. [max_size] is the maximum size allowed for variable-length commands + * (such as Read and Write). [fields] is a link-list of command fields. + */ +typedef struct Command { + const char* name; + int size; + int max_size; + Field* fields; + struct Command* next; +} Command; + +/* Adds a field to a command, and makes its offset visible. The fields must be + * added at increasing offsets. + */ +static void AddVisibleField(Command* cmd, const char* name, int offset) { + Field* fld = (Field*) calloc(1, sizeof(Field)); + if (cmd->fields != NULL) { + assert(offset > fld->offset); + } + fld->next = cmd->fields; + cmd->fields = fld; + fld->name = name; + fld->visible = 1; + fld->offset = offset; +} + +/* Adds a constant field with its value. The fields must be added at + * increasing offsets. + */ +static void AddInitializedField(Command* cmd, int offset, + int size, uint32_t value) { + Field* fld = (Field*) calloc(1, sizeof(Field)); + fld->next = cmd->fields; + cmd->fields = fld; + fld->name = NULL; + fld->visible = 0; + fld->size = size; + fld->offset = offset; + fld->value = value; +} + +/* Create a structure representing a TPM command datagram. + */ +Command* newCommand(TPM_COMMAND_CODE code, int size) { + Command* cmd = (Command*) calloc(1, sizeof(Command)); + cmd->size = size; + AddInitializedField(cmd, 0, sizeof(TPM_TAG), TPM_TAG_RQU_COMMAND); + AddInitializedField(cmd, sizeof(TPM_TAG), sizeof(uint32_t), size); + AddInitializedField(cmd, sizeof(TPM_TAG) + sizeof(uint32_t), + sizeof(TPM_COMMAND_CODE), code); + return cmd; +} + +/* The TPM_PCR_SELECTION structure in /usr/include/tss/tpm.h contains a pointer + * instead of an array[3] of bytes, so we need to adjust sizes and offsets + * accordingly. + */ +#define PCR_SELECTION_FIX (3 - sizeof(char *)) + +/* BuildXXX builds TPM command XXX. + */ +Command* BuildDefineSpaceCommand(void) { + int nv_data_public = kTpmRequestHeaderLength; + int nv_index = nv_data_public + offsetof(TPM_NV_DATA_PUBLIC, nvIndex); + int nv_pcr_info_read = nv_data_public + + offsetof(TPM_NV_DATA_PUBLIC, pcrInfoRead); + /* + * Here we need to carefully add PCR_SELECTION_FIX (or twice that much) in + * all the places where the offset calculation would be wrong without it. + * The mismatch occurs in the TPM_PCR_SELECTION structure, and it must be + * accounted for in all the structures that include it, directly or + * indirectly. + */ + int read_locality = nv_pcr_info_read + + offsetof(TPM_PCR_INFO_SHORT, localityAtRelease) + PCR_SELECTION_FIX; + int nv_pcr_info_write = nv_data_public + + offsetof(TPM_NV_DATA_PUBLIC, pcrInfoWrite) + PCR_SELECTION_FIX; + int write_locality = nv_pcr_info_write + + offsetof(TPM_PCR_INFO_SHORT, localityAtRelease) + PCR_SELECTION_FIX; + int nv_permission = nv_data_public + + offsetof(TPM_NV_DATA_PUBLIC, permission) + 2 * PCR_SELECTION_FIX; + int nv_permission_tag = + nv_permission + offsetof(TPM_NV_ATTRIBUTES, tag); + int nv_permission_attributes = + nv_permission + offsetof(TPM_NV_ATTRIBUTES, attributes); + int nv_datasize = nv_data_public + + offsetof(TPM_NV_DATA_PUBLIC, dataSize) + 2 * PCR_SELECTION_FIX; + + int size = kTpmRequestHeaderLength + sizeof(TPM_NV_DATA_PUBLIC) + + 2 * PCR_SELECTION_FIX + kEncAuthLength; + Command* cmd = newCommand(TPM_ORD_NV_DefineSpace, size); + cmd->name = "tpm_nv_definespace_cmd"; + + AddVisibleField(cmd, "index", nv_index); + AddVisibleField(cmd, "perm", nv_permission_attributes); + AddVisibleField(cmd, "size", nv_datasize); + + AddInitializedField(cmd, nv_data_public, sizeof(uint16_t), + TPM_TAG_NV_DATA_PUBLIC); + AddInitializedField(cmd, nv_pcr_info_read, sizeof(uint16_t), 3); + AddInitializedField(cmd, read_locality, sizeof(TPM_LOCALITY_SELECTION), + TPM_ALL_LOCALITIES); + AddInitializedField(cmd, nv_pcr_info_write, sizeof(uint16_t), 3); + AddInitializedField(cmd, write_locality, sizeof(TPM_LOCALITY_SELECTION), + TPM_ALL_LOCALITIES); + AddInitializedField(cmd, nv_permission_tag, sizeof(TPM_STRUCTURE_TAG), + TPM_TAG_NV_ATTRIBUTES); + return cmd; +} + +/* BuildXXX builds TPM command XXX. + */ +Command* BuildWriteCommand(void) { + Command* cmd = newCommand(TPM_ORD_NV_WriteValue, 0); + cmd->name = "tpm_nv_write_cmd"; + cmd->max_size = TPM_LARGE_ENOUGH_COMMAND_SIZE; + AddVisibleField(cmd, "index", kTpmRequestHeaderLength); + AddVisibleField(cmd, "length", kTpmRequestHeaderLength + 8); + AddVisibleField(cmd, "data", kTpmRequestHeaderLength + 12); + return cmd; +} + +Command* BuildReadCommand(void) { + int size = kTpmRequestHeaderLength + kTpmReadInfoLength; + Command* cmd = newCommand(TPM_ORD_NV_ReadValue, size); + cmd->name = "tpm_nv_read_cmd"; + AddVisibleField(cmd, "index", kTpmRequestHeaderLength); + AddVisibleField(cmd, "length", kTpmRequestHeaderLength + 8); + return cmd; +} + +Command* BuildPCRReadCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(uint32_t); + Command* cmd = newCommand(TPM_ORD_PcrRead, size); + cmd->name = "tpm_pcr_read_cmd"; + AddVisibleField(cmd, "pcrNum", kTpmRequestHeaderLength); + return cmd; +} + +Command* BuildPPAssertCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(TPM_PHYSICAL_PRESENCE); + Command* cmd = newCommand(TSC_ORD_PhysicalPresence, size); + cmd->name = "tpm_ppassert_cmd"; + AddInitializedField(cmd, kTpmRequestHeaderLength, + sizeof(TPM_PHYSICAL_PRESENCE), + TPM_PHYSICAL_PRESENCE_PRESENT); + return cmd; +} + +Command* BuildPPEnableCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(TPM_PHYSICAL_PRESENCE); + Command* cmd = newCommand(TSC_ORD_PhysicalPresence, size); + cmd->name = "tpm_ppenable_cmd"; + AddInitializedField(cmd, kTpmRequestHeaderLength, + sizeof(TPM_PHYSICAL_PRESENCE), + TPM_PHYSICAL_PRESENCE_CMD_ENABLE); + return cmd; +} + +Command* BuildFinalizePPCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(TPM_PHYSICAL_PRESENCE); + Command* cmd = newCommand(TSC_ORD_PhysicalPresence, size); + cmd->name = "tpm_finalizepp_cmd"; + AddInitializedField(cmd, kTpmRequestHeaderLength, + sizeof(TPM_PHYSICAL_PRESENCE), + TPM_PHYSICAL_PRESENCE_CMD_ENABLE | + TPM_PHYSICAL_PRESENCE_HW_DISABLE | + TPM_PHYSICAL_PRESENCE_LIFETIME_LOCK); + return cmd; +} + +Command* BuildPPLockCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(TPM_PHYSICAL_PRESENCE); + Command* cmd = newCommand(TSC_ORD_PhysicalPresence, size); + cmd->name = "tpm_pplock_cmd"; + AddInitializedField(cmd, kTpmRequestHeaderLength, + sizeof(TPM_PHYSICAL_PRESENCE), + TPM_PHYSICAL_PRESENCE_LOCK); + return cmd; +} + +Command* BuildStartupCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(TPM_STARTUP_TYPE); + Command* cmd = newCommand(TPM_ORD_Startup, size); + cmd->name = "tpm_startup_cmd"; + AddInitializedField(cmd, kTpmRequestHeaderLength, + sizeof(TPM_STARTUP_TYPE), + TPM_ST_CLEAR); + return cmd; +} + +Command* BuildSaveStateCommand(void) { + int size = kTpmRequestHeaderLength; + Command* cmd = newCommand(TPM_ORD_SaveState, size); + cmd->name = "tpm_savestate_cmd"; + return cmd; +} + +Command* BuildResumeCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(TPM_STARTUP_TYPE); + Command* cmd = newCommand(TPM_ORD_Startup, size); + cmd->name = "tpm_resume_cmd"; + AddInitializedField(cmd, kTpmRequestHeaderLength, + sizeof(TPM_STARTUP_TYPE), + TPM_ST_STATE); + return cmd; +} + +Command* BuildSelftestfullCommand(void) { + int size = kTpmRequestHeaderLength; + Command* cmd = newCommand(TPM_ORD_SelfTestFull, size); + cmd->name = "tpm_selftestfull_cmd"; + return cmd; +} + +Command* BuildContinueSelfTestCommand(void) { + int size = kTpmRequestHeaderLength; + Command* cmd = newCommand(TPM_ORD_ContinueSelfTest, size); + cmd->name = "tpm_continueselftest_cmd"; + return cmd; +} + +Command* BuildReadPubekCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(TPM_NONCE); + Command* cmd = newCommand(TPM_ORD_ReadPubek, size); + cmd->name = "tpm_readpubek_cmd"; + return cmd; +} + +Command* BuildForceClearCommand(void) { + int size = kTpmRequestHeaderLength; + Command* cmd = newCommand(TPM_ORD_ForceClear, size); + cmd->name = "tpm_forceclear_cmd"; + return cmd; +} + +Command* BuildPhysicalEnableCommand(void) { + int size = kTpmRequestHeaderLength; + Command* cmd = newCommand(TPM_ORD_PhysicalEnable, size); + cmd->name = "tpm_physicalenable_cmd"; + return cmd; +} + +Command* BuildPhysicalDisableCommand(void) { + int size = kTpmRequestHeaderLength; + Command* cmd = newCommand(TPM_ORD_PhysicalDisable, size); + cmd->name = "tpm_physicaldisable_cmd"; + return cmd; +} + +Command* BuildPhysicalSetDeactivatedCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(uint8_t); + Command* cmd = newCommand(TPM_ORD_PhysicalSetDeactivated, size); + cmd->name = "tpm_physicalsetdeactivated_cmd"; + AddVisibleField(cmd, "deactivated", kTpmRequestHeaderLength); + return cmd; +} + +Command* BuildExtendCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(uint32_t) + kPcrDigestLength; + Command* cmd = newCommand(TPM_ORD_Extend, size); + cmd->name = "tpm_extend_cmd"; + AddVisibleField(cmd, "pcrNum", kTpmRequestHeaderLength); + AddVisibleField(cmd, "inDigest", kTpmRequestHeaderLength + sizeof(uint32_t)); + return cmd; +} + +Command* BuildGetFlagsCommand(void) { + int size = (kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA) + /* capArea */ + sizeof(uint32_t) + /* subCapSize */ + sizeof(uint32_t)); /* subCap */ + + Command* cmd = newCommand(TPM_ORD_GetCapability, size); + cmd->name = "tpm_getflags_cmd"; + AddInitializedField(cmd, kTpmRequestHeaderLength, + sizeof(TPM_CAPABILITY_AREA), TPM_CAP_FLAG); + AddInitializedField(cmd, kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA), + sizeof(uint32_t), sizeof(uint32_t)); + AddInitializedField(cmd, kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA) + sizeof(uint32_t), + sizeof(uint32_t), TPM_CAP_FLAG_PERMANENT); + return cmd; +} + +Command* BuildGetSTClearFlagsCommand(void) { + int size = (kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA) + /* capArea */ + sizeof(uint32_t) + /* subCapSize */ + sizeof(uint32_t)); /* subCap */ + + Command* cmd = newCommand(TPM_ORD_GetCapability, size); + cmd->name = "tpm_getstclearflags_cmd"; + AddInitializedField(cmd, kTpmRequestHeaderLength, + sizeof(TPM_CAPABILITY_AREA), TPM_CAP_FLAG); + AddInitializedField(cmd, kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA), + sizeof(uint32_t), sizeof(uint32_t)); + AddInitializedField(cmd, kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA) + sizeof(uint32_t), + sizeof(uint32_t), TPM_CAP_FLAG_VOLATILE); + return cmd; +} + +Command* BuildGetPermissionsCommand(void) { + int size = (kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA) + /* capArea */ + sizeof(uint32_t) + /* subCapSize */ + sizeof(uint32_t)); /* subCap */ + + Command* cmd = newCommand(TPM_ORD_GetCapability, size); + cmd->name = "tpm_getpermissions_cmd"; + AddInitializedField(cmd, kTpmRequestHeaderLength, + sizeof(TPM_CAPABILITY_AREA), TPM_CAP_NV_INDEX); + AddInitializedField(cmd, kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA), + sizeof(uint32_t), sizeof(uint32_t)); + AddVisibleField(cmd, "index", kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA) + sizeof(uint32_t)); + return cmd; +} + +Command* BuildGetOwnershipCommand(void) { + int size = (kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA) + /* capArea */ + sizeof(uint32_t) + /* subCapSize */ + sizeof(uint32_t)); /* subCap */ + + Command* cmd = newCommand(TPM_ORD_GetCapability, size); + cmd->name = "tpm_getownership_cmd"; + AddInitializedField(cmd, kTpmRequestHeaderLength, + sizeof(TPM_CAPABILITY_AREA), TPM_CAP_PROPERTY); + AddInitializedField(cmd, kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA), + sizeof(uint32_t), sizeof(uint32_t)); + AddInitializedField(cmd, kTpmRequestHeaderLength + + sizeof(TPM_CAPABILITY_AREA) + sizeof(uint32_t), + sizeof(uint32_t), TPM_CAP_PROP_OWNER); + return cmd; +} + +Command* BuildGetRandomCommand(void) { + int size = kTpmRequestHeaderLength + sizeof(uint32_t); + Command* cmd = newCommand(TPM_ORD_GetRandom, size); + cmd->name = "tpm_get_random_cmd"; + AddVisibleField(cmd, "bytesRequested", kTpmRequestHeaderLength); + return cmd; +} + +/* Output the fields of a structure. + */ +void OutputFields(Field* fld) { + /* + * Field order is reversed. + */ + if (fld != NULL) { + OutputFields(fld->next); + if (fld->visible) { + printf(" uint16_t %s;\n", fld->name); + } + } +} + +/* Outputs a structure initializer. + */ +int OutputBytes_(Command* cmd, Field* fld) { + int cursor = 0; + int i; + /* + * Field order is reversed. + */ + if (fld != NULL) { + cursor = OutputBytes_(cmd, fld->next); + } else { + return 0; + } + if (!fld->visible) { + /* + * Catch up missing fields. + */ + assert(fld->offset >= cursor); + for (i = 0; i < fld->offset - cursor; i++) { + printf("0, "); + } + cursor = fld->offset; + switch (fld->size) { + case 1: + printf("0x%x, ", fld->value); + cursor += 1; + break; + case 2: + printf("0x%x, 0x%x, ", fld->value >> 8, fld->value & 0xff); + cursor += 2; + break; + case 4: + printf("0x%x, 0x%x, 0x%x, 0x%x, ", fld->value >> 24, + (fld->value >> 16) & 0xff, + (fld->value >> 8) & 0xff, + fld->value & 0xff); + cursor += 4; + break; + default: + fprintf(stderr, "invalid field size %d\n", fld->size); + exit(1); + break; + } + } + return cursor; +} + +/* Helper to output a structure initializer. + */ +void OutputBytes(Command* cmd) { + (void) OutputBytes_(cmd, cmd->fields); +} + +void OutputFieldPointers(Command* cmd, Field* fld) { + if (fld == NULL) { + return; + } else { + OutputFieldPointers(cmd, fld->next); + if (fld->visible) { + printf("%d, ", fld->offset); + } + } +} + +/* Outputs the structure initializers for all commands. + */ +void OutputCommands(Command* cmd) { + if (cmd == NULL) { + return; + } else { + printf("const struct s_%s{\n uint8_t buffer[%d];\n", + cmd->name, cmd->size == 0 ? cmd->max_size : cmd->size); + OutputFields(cmd->fields); + printf("} %s = {{", cmd->name); + OutputBytes(cmd); + printf("},\n"); + OutputFieldPointers(cmd, cmd->fields); + printf("};\n\n"); + } + OutputCommands(cmd->next); +} + +Command* (*builders[])(void) = { + BuildDefineSpaceCommand, + BuildWriteCommand, + BuildReadCommand, + BuildPCRReadCommand, + BuildPPAssertCommand, + BuildPPEnableCommand, + BuildPPLockCommand, + BuildFinalizePPCommand, + BuildStartupCommand, + BuildSaveStateCommand, + BuildResumeCommand, + BuildSelftestfullCommand, + BuildContinueSelfTestCommand, + BuildReadPubekCommand, + BuildForceClearCommand, + BuildPhysicalDisableCommand, + BuildPhysicalEnableCommand, + BuildPhysicalSetDeactivatedCommand, + BuildGetFlagsCommand, + BuildGetSTClearFlagsCommand, + BuildGetPermissionsCommand, + BuildGetOwnershipCommand, + BuildGetRandomCommand, + BuildExtendCommand, +}; + +static void FreeFields(Field* fld) { + if (fld != NULL) { + Field* next_field = fld->next; + free(fld); + FreeFields(next_field); + } +} + +static void FreeCommands(Command* cmd) { + if (cmd != NULL) { + Command* next_command = cmd->next; + FreeFields(cmd->fields); + free(cmd); + FreeCommands(next_command); + } +} + +int main(void) { + Command* commands = NULL; + uint32_t i; + for (i = 0; i < sizeof(builders) / sizeof(builders[0]); i++) { + Command* cmd = builders[i](); + cmd->next = commands; + commands = cmd; + } + + printf("/* This file is automatically generated */\n\n"); + OutputCommands(commands); + printf("const int kWriteInfoLength = %d;\n", (int) sizeof(TPM_WRITE_INFO)); + printf("const int kNvDataPublicPermissionsOffset = %d;\n", + (int) (offsetof(TPM_NV_DATA_PUBLIC, permission) + + 2 * PCR_SELECTION_FIX + + offsetof(TPM_NV_ATTRIBUTES, attributes))); + + FreeCommands(commands); + return 0; +} diff --git a/util/tss-generator/tss_extras.h b/util/tss-generator/tss_extras.h new file mode 100644 index 0000000..0fe0982 --- /dev/null +++ b/util/tss-generator/tss_extras.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2010 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +/* + * TPM definitions not available in any TSS include file :-( + */ + +#ifndef TPM_LITE_TPMEXTRAS_H_ +#define TPM_LITE_TPMEXTRAS_H_ + +#define TPM_MAX_COMMAND_SIZE 4096 +#define TPM_LARGE_ENOUGH_COMMAND_SIZE 256 /* saves space in the firmware */ +#define TPM_ENCAUTH_SIZE 20 +#define TPM_PUBEK_SIZE 256 + +#define TPM_ALL_LOCALITIES (TPM_LOC_ZERO | TPM_LOC_ONE | TPM_LOC_TWO \ + | TPM_LOC_THREE | TPM_LOC_FOUR) /* 0x1f */ + +typedef struct tdTPM_WRITE_INFO { + uint32_t nvIndex; + uint32_t offset; + uint32_t dataSize; +} TPM_WRITE_INFO; + +#endif diff --git a/util/tss-generator/tss_internal.h b/util/tss-generator/tss_internal.h new file mode 100644 index 0000000..51fe6ef --- /dev/null +++ b/util/tss-generator/tss_internal.h @@ -0,0 +1,61 @@ +/* Copyright (c) 2010 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef TPM_LITE_TLCL_INTERNAL_H_ +#define TPM_LITE_TLCL_INTERNAL_H_ + +/* + * These numbers derive from adding the sizes of command fields as shown in the + * TPM commands manual. + */ +#define kTpmRequestHeaderLength 10 +#define kTpmResponseHeaderLength 10 +#define kTpmReadInfoLength 12 +#define kEncAuthLength 20 +#define kPcrDigestLength 20 + + +/* + * Conversion functions. ToTpmTYPE puts a value of type TYPE into a TPM + * command buffer. FromTpmTYPE gets a value of type TYPE from a TPM command + * buffer into a variable. + */ +__attribute__((unused)) +static inline void ToTpmUint32(uint8_t *buffer, uint32_t x) { + buffer[0] = (uint8_t)(x >> 24); + buffer[1] = (uint8_t)((x >> 16) & 0xff); + buffer[2] = (uint8_t)((x >> 8) & 0xff); + buffer[3] = (uint8_t)(x & 0xff); +} + +/* + * See comment for above function. + */ +__attribute__((unused)) +static inline void FromTpmUint32(const uint8_t *buffer, uint32_t *x) { + *x = ((buffer[0] << 24) | + (buffer[1] << 16) | + (buffer[2] << 8) | + buffer[3]); +} + +/* + * See comment for above function. + */ +__attribute__((unused)) +static inline void ToTpmUint16(uint8_t *buffer, uint16_t x) { + buffer[0] = (uint8_t)(x >> 8); + buffer[1] = (uint8_t)(x & 0xff); +} + +/* + * See comment for above function. + */ +__attribute__((unused)) +static inline void FromTpmUint16(const uint8_t *buffer, uint16_t *x) { + *x = (buffer[0] << 8) | buffer[1]; +} + +#endif /* TPM_LITE_TLCL_INTERNAL_H_ */

1 0

Patch set updated for coreboot: Documentation/RFC: WIP - Add initial TPM documentation.
by Philipp Deppenwiese 17 Mar '16

17 Mar '16

Philipp Deppenwiese (zaolin.daisuki(a)googlemail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14134 -gerrit commit 67713d10ca7c0196f52430d43b1511c756080e03 Author: Philipp Deppenwiese <zaolin(a)das-labor.org> Date: Mon Mar 14 14:37:08 2016 +0100 Documentation/RFC: WIP - Add initial TPM documentation. Change-Id: I9fe050b802ef9c1ea05ce9b5442e70b5c7ee1d90 --- Documentation/RFC/tpm.md | 115 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/Documentation/RFC/tpm.md b/Documentation/RFC/tpm.md new file mode 100644 index 0000000..1bf7564 --- /dev/null +++ b/Documentation/RFC/tpm.md @@ -0,0 +1,115 @@ +# Introduction + +TPM v1.2 support in coreboot came with supporting Chromebook's and Thinkpad's in the coreboot tree. Currently the implementation is used for vboot2 and the standalone trustedboot version of coreboot. TPM support can be easily activated via: + +__Menuconfig:__ +``` +Generic Drivers + -> [*] Enable TPM support +``` + +At the moment only Static Root of Trust for Measurement __(SRTM)__ is supported ! + +# TDDL + +__Code:__ +``` +src/drivers/tpm/ +``` + +Support for LPC and I2C bus protocols is given within all stages of coreboot. + +# TSS and TSPI + +__Code:__ +``` +src/lib/tpm/ +src/include/tpm/ +``` + +The TSS and TSPI is integrated into coreboot through all stages. For coreboot standalone trusted computing functions the TSPI should be used as it is stated in TCG specification. For vboot2 the TSS will be the state of the art API. + +## TSS Generator + +The TCG specified a lot of functions for use with the tpm. Therefore Google wrote his own automatic code generation which generates the tss_structures. + +__Code:__ +``` +util/tss-generator/ +``` + +__Command:__ +```bash +./tss-generator > tss_structures.h +``` + +# Trusted Boot + +Besides the vboot2 implementation, coreboot supports it's own trustedboot which is used to improve boot security and platform protection. It's not mandatory, opt-in and can be activated if needed. So it's an alternative toy secureboot which locks out users the most times and ensures that the PC is under control of the user. Keep in mind a trustedboot is enforced via operating system and not by the firmware ! Which means you are free to choose whatever you do ! + +__Menuconfig:__ +``` +Security + -> [*] Enable TrustedBoot support + -> [*] Microcode measurement + -> [*] Configuration Data measurement + -> [*] Option ROM's measurement + -> [*] Intel MRC measurement + -> [*] AMD PSP & AGESA measurement + -> [*] GBE measurement + -> [*] Descriptor measurement + -> [*] ME code section measurement +``` + +## Specification + +For the coreboot TPM measurement specification PCR 0 - 7 is used. Which is common to be used for firmware only measurement. + +__PCR-00:__ +``` +BOOTBLOCK (optional) CBFS: bootblock +``` + +__PCR-01:__ +``` +ROMSTAGE, MICROCODE CBFS: fallback/romstage ; cpu_microcode_blob.bin +``` + +__PCR-02:__ +``` +RAMSTAGE, SMM CBFS: fallback/ramstage +``` + +__PCR-03:__ +``` +OPTIONS ROMS CBFS: pciXXXX,XXXX.rom +``` + +__PCR-04:__ +``` +CMOS CONFIGURATION RUNTIME +``` + +__PCR-05:__ +``` +PAYLOAD CBFS: fallback/payload +``` + +__PCR-06:__ +``` +MRC, PSP +``` + +__PCR-07:__ +``` +DESCRIPTOR, GBE, ME (optional) SPI +``` + +## Hooks +## PCR Measurement +## TCPA Log + +The TCPA Log for coreboot isn't TCG specification conform. + +# Payloads +## Seabios

1 0

New patch to review for coreboot: Documentation/RFC: WIP - Add initial TPM documentation.
by Philipp Deppenwiese 17 Mar '16

17 Mar '16

Philipp Deppenwiese (zaolin.daisuki(a)googlemail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14134 -gerrit commit 18cd48105bf59ba3213d1c59f669509e83689944 Author: Philipp Deppenwiese <zaolin(a)das-labor.org> Date: Thu Mar 17 22:35:51 2016 +0100 Documentation/RFC: WIP - Add initial TPM documentation. Change-Id: I9fe050b802ef9c1ea05ce9b5442e70b5c7ee1d90 --- Documentation/RFC/tpm.md | 107 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) diff --git a/Documentation/RFC/tpm.md b/Documentation/RFC/tpm.md index 6528438..1bf7564 100644 --- a/Documentation/RFC/tpm.md +++ b/Documentation/RFC/tpm.md @@ -1,10 +1,115 @@ # Introduction -TPM support in coreboot came with supporting Chromebook's and Thinkpad's . +TPM v1.2 support in coreboot came with supporting Chromebook's and Thinkpad's in the coreboot tree. Currently the implementation is used for vboot2 and the standalone trustedboot version of coreboot. TPM support can be easily activated via: +__Menuconfig:__ +``` +Generic Drivers + -> [*] Enable TPM support +``` + +At the moment only Static Root of Trust for Measurement __(SRTM)__ is supported ! # TDDL +__Code:__ +``` +src/drivers/tpm/ +``` + +Support for LPC and I2C bus protocols is given within all stages of coreboot. + # TSS and TSPI +__Code:__ +``` +src/lib/tpm/ +src/include/tpm/ +``` + +The TSS and TSPI is integrated into coreboot through all stages. For coreboot standalone trusted computing functions the TSPI should be used as it is stated in TCG specification. For vboot2 the TSS will be the state of the art API. + +## TSS Generator + +The TCG specified a lot of functions for use with the tpm. Therefore Google wrote his own automatic code generation which generates the tss_structures. + +__Code:__ +``` +util/tss-generator/ +``` + +__Command:__ +```bash +./tss-generator > tss_structures.h +``` + # Trusted Boot + +Besides the vboot2 implementation, coreboot supports it's own trustedboot which is used to improve boot security and platform protection. It's not mandatory, opt-in and can be activated if needed. So it's an alternative toy secureboot which locks out users the most times and ensures that the PC is under control of the user. Keep in mind a trustedboot is enforced via operating system and not by the firmware ! Which means you are free to choose whatever you do ! + +__Menuconfig:__ +``` +Security + -> [*] Enable TrustedBoot support + -> [*] Microcode measurement + -> [*] Configuration Data measurement + -> [*] Option ROM's measurement + -> [*] Intel MRC measurement + -> [*] AMD PSP & AGESA measurement + -> [*] GBE measurement + -> [*] Descriptor measurement + -> [*] ME code section measurement +``` + +## Specification + +For the coreboot TPM measurement specification PCR 0 - 7 is used. Which is common to be used for firmware only measurement. + +__PCR-00:__ +``` +BOOTBLOCK (optional) CBFS: bootblock +``` + +__PCR-01:__ +``` +ROMSTAGE, MICROCODE CBFS: fallback/romstage ; cpu_microcode_blob.bin +``` + +__PCR-02:__ +``` +RAMSTAGE, SMM CBFS: fallback/ramstage +``` + +__PCR-03:__ +``` +OPTIONS ROMS CBFS: pciXXXX,XXXX.rom +``` + +__PCR-04:__ +``` +CMOS CONFIGURATION RUNTIME +``` + +__PCR-05:__ +``` +PAYLOAD CBFS: fallback/payload +``` + +__PCR-06:__ +``` +MRC, PSP +``` + +__PCR-07:__ +``` +DESCRIPTOR, GBE, ME (optional) SPI +``` + +## Hooks +## PCR Measurement +## TCPA Log + +The TCPA Log for coreboot isn't TCG specification conform. + +# Payloads +## Seabios

1 0

New patch to review for coreboot: Add initial documentation about tpm usage
by Philipp Deppenwiese 17 Mar '16

17 Mar '16

Philipp Deppenwiese (zaolin.daisuki(a)googlemail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14133 -gerrit commit 8a9d86dc2ae53c25a2e9a4483c39636a68e443c1 Author: Philipp Deppenwiese <zaolin(a)das-labor.org> Date: Mon Mar 14 14:37:08 2016 +0100 Add initial documentation about tpm usage Change-Id: I62ff3f04788e15d5d455ed8e14317676c0d4c6fe --- Documentation/RFC/tpm.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/RFC/tpm.md b/Documentation/RFC/tpm.md new file mode 100644 index 0000000..6528438 --- /dev/null +++ b/Documentation/RFC/tpm.md @@ -0,0 +1,10 @@ +# Introduction + +TPM support in coreboot came with supporting Chromebook's and Thinkpad's . + + +# TDDL + +# TSS and TSPI + +# Trusted Boot

1 0

New patch to review for coreboot: payloads: Add a target to print payload git urls and directories
by Martin Roth 17 Mar '16

17 Mar '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14132 -gerrit commit c5de49cd314160bae54f483c9c29061a2bde9c26 Author: Martin Roth <martinroth(a)google.com> Date: Wed Mar 16 12:42:05 2016 -0600 payloads: Add a target to print payload git urls and directories Being able to fetch this list will allow the jenkins builder to securely fetch the external payloads so we can start testing payload builds. Change-Id: I777229216b2f11f0f427cd5f8cfa003da4171a77 Signed-off-by: Martin Roth <martinroth(a)google.com> --- payloads/Makefile.inc | 5 ++++- payloads/external/FILO/Makefile | 10 ++++++++-- payloads/external/GRUB2/Makefile | 10 ++++++++-- payloads/external/Memtest86Plus/Makefile | 5 ++++- payloads/external/SeaBIOS/Makefile | 10 ++++++++-- payloads/external/U-Boot/Makefile | 5 ++++- payloads/external/depthcharge/Makefile | 5 ++++- 7 files changed, 40 insertions(+), 10 deletions(-) diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index 44d1d77..c969c9e 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -34,4 +34,7 @@ clean-payloads: distclean-payloads: $(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) distclean; ) -.PHONY: clean-payloads distclean-payloads +print-repo-info-payloads: + -$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; ) + +.PHONY: clean-payloads distclean-payloads print-repo-info-payloads diff --git a/payloads/external/FILO/Makefile b/payloads/external/FILO/Makefile index 6a96a22..13d3e8f 100644 --- a/payloads/external/FILO/Makefile +++ b/payloads/external/FILO/Makefile @@ -3,6 +3,9 @@ NAME-$(CONFIG_FILO_MASTER)=MASTER TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646 NAME-$(CONFIG_FILO_STABLE)=STABLE +project_git_repo=http://review.coreboot.org/p/filo.git +project_dir=filo + unexport KCONFIG_AUTOHEADER unexport KCONFIG_AUTOCONFIG unexport KCONFIG_DEPENDENCIES @@ -15,7 +18,7 @@ all: filo checkout: echo " GIT FILO $(NAME-y)" test -d filo || \ - git clone http://review.coreboot.org/p/filo.git + git clone $(project_git_repo) $(project_dir) cd filo && \ git checkout master && \ git remote update && \ @@ -46,4 +49,7 @@ clean: distclean: rm -rf filo -.PHONY: checkout config filo clean distclean +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: checkout config filo clean distclean print-repo-info diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile index 11630c8..5d53922 100644 --- a/payloads/external/GRUB2/Makefile +++ b/payloads/external/GRUB2/Makefile @@ -1,6 +1,9 @@ TAG-$(CONFIG_GRUB2_MASTER)= NAME-$(CONFIG_GRUB2_MASTER)=HEAD +project_git_repo=git://git.sv.gnu.org/grub.git +project_dir=grub2 + unexport KCONFIG_AUTOCONFIG unexport CFLAGS unexport CPPFLAGS @@ -22,7 +25,7 @@ all: grub2 checkout: echo " GIT GRUB2 $(NAME-y)" test -d grub2 || \ - git clone git://git.sv.gnu.org/grub.git grub2 + git clone $(project_git_repo) $(project_dir) cd grub2 && \ git checkout master && \ git pull; \ @@ -50,4 +53,7 @@ clean: distclean: rm -rf grub2 -.PHONY: checkout config grub2 clean distclean +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: checkout config grub2 clean distclean print-repo-info diff --git a/payloads/external/Memtest86Plus/Makefile b/payloads/external/Memtest86Plus/Makefile index ee79032..db8a51d 100644 --- a/payloads/external/Memtest86Plus/Makefile +++ b/payloads/external/Memtest86Plus/Makefile @@ -39,4 +39,7 @@ clean: distclean: rm -rf $(project_dir) -.PHONY: all build fetch clean distclean +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: all build fetch clean distclean print-repo-info diff --git a/payloads/external/SeaBIOS/Makefile b/payloads/external/SeaBIOS/Makefile index 0ac04d7..862a679 100644 --- a/payloads/external/SeaBIOS/Makefile +++ b/payloads/external/SeaBIOS/Makefile @@ -2,6 +2,9 @@ TAG-$(CONFIG_SEABIOS_MASTER)=origin/master TAG-$(CONFIG_SEABIOS_STABLE)=b3ef39f532db52bf17457ba931da758eeb38d6b4 TAG-$(CONFIG_SEABIOS_REVISION)=$(CONFIG_SEABIOS_REVISION_ID) +project_git_repo=http://review.coreboot.org/p/seabios.git +project_dir=seabios + unexport KCONFIG_AUTOHEADER unexport KCONFIG_AUTOCONFIG unexport KCONFIG_DEPENDENCIES @@ -13,7 +16,7 @@ all: build seabios: echo " Cloning SeaBIOS from Git" - git clone http://review.coreboot.org/p/seabios.git seabios + git clone $(project_git_repo) $(project_dir) fetch: seabios ifeq ($(TAG-y),) @@ -71,4 +74,7 @@ clean: distclean: rm -rf seabios -.PHONY: checkout config build clean distclean clone fetch +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: checkout config build clean distclean clone fetch print-repo-info diff --git a/payloads/external/U-Boot/Makefile b/payloads/external/U-Boot/Makefile index 255db29..67c60c1 100644 --- a/payloads/external/U-Boot/Makefile +++ b/payloads/external/U-Boot/Makefile @@ -79,4 +79,7 @@ clean: distclean: rm -rf $(project_dir) -.PHONY: config build clean distclean fetch +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: config build clean distclean fetch print-repo-info diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile index 4e76687..cf2d0a1 100644 --- a/payloads/external/depthcharge/Makefile +++ b/payloads/external/depthcharge/Makefile @@ -68,4 +68,7 @@ clean: distclean: rm -rf $(project_dir) -.PHONY: checkout config build clean distclean clone fetch +print-repo-info: + echo "$(project_git_repo) $(project_dir)" + +.PHONY: checkout config build clean distclean clone fetch print-repo-info

1 0

New patch to review for coreboot: payloads/Makefile.inc: Clean up Makefile
by Martin Roth 17 Mar '16

17 Mar '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14131 -gerrit commit b9c63f8f6509d1392c31aaaedfd99f6221ac70de Author: Martin Roth <martinroth(a)google.com> Date: Wed Mar 16 10:45:35 2016 -0600 payloads/Makefile.inc: Clean up Makefile - Instead of adding each payload to each common target, create a list and loop through the list for all of the payloads - '.phony' doesn't work - the target needs to be uppercase '.PHONY' Change-Id: I4a7712c94d0f127c2fff8cb8fada4b8132a4ab3b Signed-off-by: Martin Roth <martinroth(a)google.com> --- payloads/Makefile.inc | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index ee3c41a..44d1d77 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -17,24 +17,21 @@ cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf img/coreinfo-type := payload +PAYLOADS_LIST=\ +payloads/coreinfo \ +payloads/libpayload \ +payloads/external/depthcharge \ +payloads/external/SeaBIOS \ +payloads/external/U-Boot \ +payloads/external/Memtest86Plus + payloads/coreinfo/build/coreinfo.elf coreinfo: $(MAKE) -C payloads/coreinfo defaultbuild clean-payloads: - $(MAKE) -C payloads/coreinfo clean - $(MAKE) -C payloads/libpayload clean - $(MAKE) -C payloads/external/depthcharge clean - $(MAKE) -C payloads/external/SeaBIOS clean - $(MAKE) -C payloads/external/U-Boot clean - $(MAKE) -C payloads/external/Memtest86Plus clean - + $(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) clean; ) distclean-payloads: - $(MAKE) -C payloads/coreinfo distclean - $(MAKE) -C payloads/libpayload distclean - $(MAKE) -C payloads/external/depthcharge distclean - $(MAKE) -C payloads/external/SeaBIOS distclean - $(MAKE) -C payloads/external/U-Boot distclean - $(MAKE) -C payloads/external/Memtest86Plus distclean + $(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) distclean; ) -.phony: clean-payloads distclean-payloads +.PHONY: clean-payloads distclean-payloads

1 0

New patch to review for coreboot: payloads/external: Rename Makefile.inc to Makefile
by Martin Roth 17 Mar '16

17 Mar '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14130 -gerrit commit 0847b7d976c9a693fedabf121e2b23d030d45187 Author: Martin Roth <martinroth(a)google.com> Date: Wed Mar 16 10:39:30 2016 -0600 payloads/external: Rename Makefile.inc to Makefile These makefiles are not included by anything, so they shouldn't be named Makefile.inc. Also, having them all be named 'Makefile' makes some other consolidation work I'm doing much easier. Change-Id: I1234539ba6a0a6f47d2eb0c21de3da3607c6b8de Signed-off-by: Martin Roth <martinroth(a)google.com> --- payloads/Makefile.inc | 16 +++--- payloads/external/FILO/Makefile | 49 +++++++++++++++++ payloads/external/FILO/Makefile.inc | 49 ----------------- payloads/external/GRUB2/Makefile | 53 ++++++++++++++++++ payloads/external/GRUB2/Makefile.inc | 53 ------------------ payloads/external/Makefile.inc | 12 ++-- payloads/external/Memtest86Plus/Makefile | 42 ++++++++++++++ payloads/external/Memtest86Plus/Makefile.inc | 42 -------------- payloads/external/SeaBIOS/Makefile | 74 +++++++++++++++++++++++++ payloads/external/SeaBIOS/Makefile.inc | 74 ------------------------- payloads/external/U-Boot/Makefile | 82 ++++++++++++++++++++++++++++ payloads/external/U-Boot/Makefile.inc | 82 ---------------------------- payloads/external/depthcharge/Makefile | 71 ++++++++++++++++++++++++ payloads/external/depthcharge/Makefile.inc | 71 ------------------------ 14 files changed, 385 insertions(+), 385 deletions(-) diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index 792df60..ee3c41a 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -23,18 +23,18 @@ payloads/coreinfo/build/coreinfo.elf coreinfo: clean-payloads: $(MAKE) -C payloads/coreinfo clean $(MAKE) -C payloads/libpayload clean - $(MAKE) -C payloads/external/depthcharge -f Makefile.inc clean - $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc clean - $(MAKE) -C payloads/external/U-Boot -f Makefile.inc clean - $(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc clean + $(MAKE) -C payloads/external/depthcharge clean + $(MAKE) -C payloads/external/SeaBIOS clean + $(MAKE) -C payloads/external/U-Boot clean + $(MAKE) -C payloads/external/Memtest86Plus clean distclean-payloads: $(MAKE) -C payloads/coreinfo distclean $(MAKE) -C payloads/libpayload distclean - $(MAKE) -C payloads/external/depthcharge -f Makefile.inc distclean - $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc distclean - $(MAKE) -C payloads/external/U-Boot -f Makefile.inc distclean - $(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc distclean + $(MAKE) -C payloads/external/depthcharge distclean + $(MAKE) -C payloads/external/SeaBIOS distclean + $(MAKE) -C payloads/external/U-Boot distclean + $(MAKE) -C payloads/external/Memtest86Plus distclean .phony: clean-payloads distclean-payloads diff --git a/payloads/external/FILO/Makefile b/payloads/external/FILO/Makefile new file mode 100644 index 0000000..6a96a22 --- /dev/null +++ b/payloads/external/FILO/Makefile @@ -0,0 +1,49 @@ +TAG-$(CONFIG_FILO_MASTER)=origin/master +NAME-$(CONFIG_FILO_MASTER)=MASTER +TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646 +NAME-$(CONFIG_FILO_STABLE)=STABLE + +unexport KCONFIG_AUTOHEADER +unexport KCONFIG_AUTOCONFIG +unexport KCONFIG_DEPENDENCIES +unexport KCONFIG_SPLITCONFIG +unexport KCONFIG_TRISTATE +unexport KCONFIG_NEGATIVES + +all: filo + +checkout: + echo " GIT FILO $(NAME-y)" + test -d filo || \ + git clone http://review.coreboot.org/p/filo.git + cd filo && \ + git checkout master && \ + git remote update && \ + test -n $(TAG-y) && \ + git branch -f $(NAME-y) $(TAG-y) && \ + git checkout $(NAME-y) + +config: libpayload + echo " CONFIG FILO $(NAME-y)" + $(MAKE) -C filo defconfig LIBCONFIG_PATH=../../../libpayload + # This shows how to force a previously unset .config option *on* + #echo "CONFIG_VGAHOOKS=y" >> filo/.config + # This shows how to force a previously set .config option *off* + #echo "# CONFIG_SMBIOS is not set" >> filo/.config + $(MAKE) -C filo oldconfig LIBCONFIG_PATH=../../../libpayload + +filo: config + echo " MAKE FILO $(NAME-y)" + $(MAKE) -C filo + +libpayload: checkout + cd ../../libpayload && $(MAKE) defconfig && \ + $(MAKE) && $(MAKE) DESTDIR=../external/FILO/filo/build install + +clean: + test -d filo && $(MAKE) -C filo clean || exit 0 + +distclean: + rm -rf filo + +.PHONY: checkout config filo clean distclean diff --git a/payloads/external/FILO/Makefile.inc b/payloads/external/FILO/Makefile.inc deleted file mode 100644 index 6a96a22..0000000 --- a/payloads/external/FILO/Makefile.inc +++ /dev/null @@ -1,49 +0,0 @@ -TAG-$(CONFIG_FILO_MASTER)=origin/master -NAME-$(CONFIG_FILO_MASTER)=MASTER -TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646 -NAME-$(CONFIG_FILO_STABLE)=STABLE - -unexport KCONFIG_AUTOHEADER -unexport KCONFIG_AUTOCONFIG -unexport KCONFIG_DEPENDENCIES -unexport KCONFIG_SPLITCONFIG -unexport KCONFIG_TRISTATE -unexport KCONFIG_NEGATIVES - -all: filo - -checkout: - echo " GIT FILO $(NAME-y)" - test -d filo || \ - git clone http://review.coreboot.org/p/filo.git - cd filo && \ - git checkout master && \ - git remote update && \ - test -n $(TAG-y) && \ - git branch -f $(NAME-y) $(TAG-y) && \ - git checkout $(NAME-y) - -config: libpayload - echo " CONFIG FILO $(NAME-y)" - $(MAKE) -C filo defconfig LIBCONFIG_PATH=../../../libpayload - # This shows how to force a previously unset .config option *on* - #echo "CONFIG_VGAHOOKS=y" >> filo/.config - # This shows how to force a previously set .config option *off* - #echo "# CONFIG_SMBIOS is not set" >> filo/.config - $(MAKE) -C filo oldconfig LIBCONFIG_PATH=../../../libpayload - -filo: config - echo " MAKE FILO $(NAME-y)" - $(MAKE) -C filo - -libpayload: checkout - cd ../../libpayload && $(MAKE) defconfig && \ - $(MAKE) && $(MAKE) DESTDIR=../external/FILO/filo/build install - -clean: - test -d filo && $(MAKE) -C filo clean || exit 0 - -distclean: - rm -rf filo - -.PHONY: checkout config filo clean distclean diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile new file mode 100644 index 0000000..11630c8 --- /dev/null +++ b/payloads/external/GRUB2/Makefile @@ -0,0 +1,53 @@ +TAG-$(CONFIG_GRUB2_MASTER)= +NAME-$(CONFIG_GRUB2_MASTER)=HEAD + +unexport KCONFIG_AUTOCONFIG +unexport CFLAGS +unexport CPPFLAGS +unexport CCASFLAGS +unexport CC +unexport BUILD_CC +unexport TARGET_CC +unexport TARGET_CFLAGS +unexport TARGET_CPPFLAGS +unexport TARGET_STRIP +unexport TARGET_OBJCOPY +unexport HOST_CFLAGS +unexport HOST_CPPFLAGS +unexport HOST_CC + + +all: grub2 + +checkout: + echo " GIT GRUB2 $(NAME-y)" + test -d grub2 || \ + git clone git://git.sv.gnu.org/grub.git grub2 + cd grub2 && \ + git checkout master && \ + git pull; \ + test -n "$(TAG-y)" && \ + git branch -f $(NAME-y) $(TAG-y) && \ + git checkout $(NAME-y) || true + +config: checkout + echo " CONFIG GRUB2 $(NAME-y)" + rm -rf grub2/build + mkdir grub2/build + cd grub2 && ./autogen.sh + cd grub2/build && ../configure BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \ + TARGET_CC="$(CC)" \ + TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" CFLAGS=-O2 TARGET_CFLAGS=-Os --with-platform=coreboot + +grub2: config + echo " MAKE GRUB2 $(NAME-y)" + $(MAKE) -C grub2/build CC="$(HOSTCC)" + $(MAKE) -C grub2/build default_payload.elf EXTRA_PAYLOAD_MODULES="$(GRUB2_EXTRA_MODULES)" + +clean: + test -d grub2 && $(MAKE) -C grub2 clean || exit 0 + +distclean: + rm -rf grub2 + +.PHONY: checkout config grub2 clean distclean diff --git a/payloads/external/GRUB2/Makefile.inc b/payloads/external/GRUB2/Makefile.inc deleted file mode 100644 index 11630c8..0000000 --- a/payloads/external/GRUB2/Makefile.inc +++ /dev/null @@ -1,53 +0,0 @@ -TAG-$(CONFIG_GRUB2_MASTER)= -NAME-$(CONFIG_GRUB2_MASTER)=HEAD - -unexport KCONFIG_AUTOCONFIG -unexport CFLAGS -unexport CPPFLAGS -unexport CCASFLAGS -unexport CC -unexport BUILD_CC -unexport TARGET_CC -unexport TARGET_CFLAGS -unexport TARGET_CPPFLAGS -unexport TARGET_STRIP -unexport TARGET_OBJCOPY -unexport HOST_CFLAGS -unexport HOST_CPPFLAGS -unexport HOST_CC - - -all: grub2 - -checkout: - echo " GIT GRUB2 $(NAME-y)" - test -d grub2 || \ - git clone git://git.sv.gnu.org/grub.git grub2 - cd grub2 && \ - git checkout master && \ - git pull; \ - test -n "$(TAG-y)" && \ - git branch -f $(NAME-y) $(TAG-y) && \ - git checkout $(NAME-y) || true - -config: checkout - echo " CONFIG GRUB2 $(NAME-y)" - rm -rf grub2/build - mkdir grub2/build - cd grub2 && ./autogen.sh - cd grub2/build && ../configure BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \ - TARGET_CC="$(CC)" \ - TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" CFLAGS=-O2 TARGET_CFLAGS=-Os --with-platform=coreboot - -grub2: config - echo " MAKE GRUB2 $(NAME-y)" - $(MAKE) -C grub2/build CC="$(HOSTCC)" - $(MAKE) -C grub2/build default_payload.elf EXTRA_PAYLOAD_MODULES="$(GRUB2_EXTRA_MODULES)" - -clean: - test -d grub2 && $(MAKE) -C grub2 clean || exit 0 - -distclean: - rm -rf grub2 - -.PHONY: checkout config grub2 clean distclean diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 5a6f625..5335db9 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -40,7 +40,7 @@ payload_revision-type := raw SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1) payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(top)/$(DOTCONFIG) - $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \ + $(MAKE) -C payloads/external/SeaBIOS \ HOSTCC="$(HOSTCC)" \ CC=$(word $(SEABIOS_CC_OFFSET),$(CC_x86_32)) \ CFLAGS="$(patsubst $(word $(SEABIOS_CC_OFFSET),$(CC_x86_32))%,,$(wordlist $(SEABIOS_CC_OFFSET),9999,$(CC_x86_32)))" \ @@ -64,12 +64,12 @@ payloads/external/SeaBIOS/seabios/.config: payloads/external/SeaBIOS/seabios/out payloads/external/SeaBIOS/seabios/out/autoversion.h: payloads/external/SeaBIOS/seabios/out/bios.bin.elf payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(top)/$(DOTCONFIG) $(CBFSTOOL) - $(MAKE) -C payloads/external/depthcharge -f Makefile.inc \ + $(MAKE) -C payloads/external/depthcharge \ BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \ MFLAGS= MAKEFLAGS= filo: - $(MAKE) -C payloads/external/FILO -f Makefile.inc \ + $(MAKE) -C payloads/external/FILO \ HOSTCC="$(HOSTCC)" \ CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \ @@ -81,7 +81,7 @@ payloads/external/FILO/filo/.config: filo payloads/external/FILO/filo/build/version.h: filo grub2: - $(MAKE) -C payloads/external/GRUB2 -f Makefile.inc \ + $(MAKE) -C payloads/external/GRUB2 \ HOSTCC="$(HOSTCC)" \ CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \ @@ -90,7 +90,7 @@ grub2: payloads/external/GRUB2/grub2/build/default_payload.elf: grub2 payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(top)/$(DOTCONFIG) - $(MAKE) -C payloads/external/U-Boot -f Makefile.inc \ + $(MAKE) -C payloads/external/U-Boot \ CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \ CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE) @@ -105,7 +105,7 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) endif payloads/external/Memtest86Plus/memtest86plus/memtest: $(top)/$(DOTCONFIG) - $(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc all \ + $(MAKE) -C payloads/external/Memtest86Plus all \ CC="$(CC_x86_32)" \ LD="$(LD_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" \ diff --git a/payloads/external/Memtest86Plus/Makefile b/payloads/external/Memtest86Plus/Makefile new file mode 100644 index 0000000..ee79032 --- /dev/null +++ b/payloads/external/Memtest86Plus/Makefile @@ -0,0 +1,42 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2016 Google Inc. +## +## 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. +## + +project_name=Memtest86+ +project_dir=$(CURDIR)/memtest86plus +project_git_repo=https://review.coreboot.org/memtest86plus + +all: build + +$(project_dir): + echo " Cloning $(project_name) from Git" + git clone $(project_git_repo) $(project_dir) + +fetch: $(project_dir) + cd $(project_dir); \ + test -e '.git' && \ + git fetch && \ + git checkout origin/master + +build: fetch + echo " MAKE $(project_name)" + $(MAKE) -C $(project_dir) all + +clean: + test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0 + +distclean: + rm -rf $(project_dir) + +.PHONY: all build fetch clean distclean diff --git a/payloads/external/Memtest86Plus/Makefile.inc b/payloads/external/Memtest86Plus/Makefile.inc deleted file mode 100644 index ee79032..0000000 --- a/payloads/external/Memtest86Plus/Makefile.inc +++ /dev/null @@ -1,42 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2016 Google Inc. -## -## 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. -## - -project_name=Memtest86+ -project_dir=$(CURDIR)/memtest86plus -project_git_repo=https://review.coreboot.org/memtest86plus - -all: build - -$(project_dir): - echo " Cloning $(project_name) from Git" - git clone $(project_git_repo) $(project_dir) - -fetch: $(project_dir) - cd $(project_dir); \ - test -e '.git' && \ - git fetch && \ - git checkout origin/master - -build: fetch - echo " MAKE $(project_name)" - $(MAKE) -C $(project_dir) all - -clean: - test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0 - -distclean: - rm -rf $(project_dir) - -.PHONY: all build fetch clean distclean diff --git a/payloads/external/SeaBIOS/Makefile b/payloads/external/SeaBIOS/Makefile new file mode 100644 index 0000000..0ac04d7 --- /dev/null +++ b/payloads/external/SeaBIOS/Makefile @@ -0,0 +1,74 @@ +TAG-$(CONFIG_SEABIOS_MASTER)=origin/master +TAG-$(CONFIG_SEABIOS_STABLE)=b3ef39f532db52bf17457ba931da758eeb38d6b4 +TAG-$(CONFIG_SEABIOS_REVISION)=$(CONFIG_SEABIOS_REVISION_ID) + +unexport KCONFIG_AUTOHEADER +unexport KCONFIG_AUTOCONFIG +unexport KCONFIG_DEPENDENCIES +unexport KCONFIG_SPLITCONFIG +unexport KCONFIG_TRISTATE +unexport KCONFIG_NEGATIVES + +all: build + +seabios: + echo " Cloning SeaBIOS from Git" + git clone http://review.coreboot.org/p/seabios.git seabios + +fetch: seabios +ifeq ($(TAG-y),) + echo "Error: The specified tag is invalid" +ifeq ($(CONFIG_SEABIOS_REVISION),y) + echo "Error: There is no revision specified for SeaBIOS" + false +endif + false +endif + cd seabios; git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ] || \ + [ "$(TAG-y)" = "origin/master" ]; then \ + echo " Fetching new commits from the SeaBIOS git repo"; \ + git fetch; fi + +checkout: fetch + echo " Checking out SeaBIOS revision $(TAG-y)" + cd seabios; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y) + +config: checkout + echo " CONFIG SeaBIOS $(TAG-y)" + echo "CONFIG_COREBOOT=y" > seabios/.config +ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) + echo "CONFIG_DEBUG_SERIAL=y" >> seabios/.config + echo "CONFIG_DEBUG_SERIAL_PORT=$(CONFIG_TTYS0_BASE)" >> seabios/.config +else + echo "# CONFIG_DEBUG_SERIAL is not set" >> seabios/.config +endif +ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) + echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config +endif +ifeq ($(CONFIG_SEABIOS_VGA_COREBOOT),y) + echo "CONFIG_VGA_COREBOOT=y" >> seabios/.config + echo "CONFIG_BUILD_VGABIOS=y" >> seabios/.config +endif +ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),) +ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","") + cat $(CONFIG_PAYLOAD_CONFIGFILE) >> seabios/.config +else + echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist" + false +endif +endif + # This shows how to force a previously set .config option *off* + #echo "# CONFIG_SMBIOS is not set" >> seabios/.config + $(MAKE) -C seabios olddefconfig OUT=out/ + +build: config + echo " MAKE SeaBIOS $(TAG-y)" + $(MAKE) -C seabios OUT=out/ + +clean: + test -d seabios/out && rm -rf seabios/out || exit 0 + +distclean: + rm -rf seabios + +.PHONY: checkout config build clean distclean clone fetch diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc deleted file mode 100644 index 0ac04d7..0000000 --- a/payloads/external/SeaBIOS/Makefile.inc +++ /dev/null @@ -1,74 +0,0 @@ -TAG-$(CONFIG_SEABIOS_MASTER)=origin/master -TAG-$(CONFIG_SEABIOS_STABLE)=b3ef39f532db52bf17457ba931da758eeb38d6b4 -TAG-$(CONFIG_SEABIOS_REVISION)=$(CONFIG_SEABIOS_REVISION_ID) - -unexport KCONFIG_AUTOHEADER -unexport KCONFIG_AUTOCONFIG -unexport KCONFIG_DEPENDENCIES -unexport KCONFIG_SPLITCONFIG -unexport KCONFIG_TRISTATE -unexport KCONFIG_NEGATIVES - -all: build - -seabios: - echo " Cloning SeaBIOS from Git" - git clone http://review.coreboot.org/p/seabios.git seabios - -fetch: seabios -ifeq ($(TAG-y),) - echo "Error: The specified tag is invalid" -ifeq ($(CONFIG_SEABIOS_REVISION),y) - echo "Error: There is no revision specified for SeaBIOS" - false -endif - false -endif - cd seabios; git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ] || \ - [ "$(TAG-y)" = "origin/master" ]; then \ - echo " Fetching new commits from the SeaBIOS git repo"; \ - git fetch; fi - -checkout: fetch - echo " Checking out SeaBIOS revision $(TAG-y)" - cd seabios; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y) - -config: checkout - echo " CONFIG SeaBIOS $(TAG-y)" - echo "CONFIG_COREBOOT=y" > seabios/.config -ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) - echo "CONFIG_DEBUG_SERIAL=y" >> seabios/.config - echo "CONFIG_DEBUG_SERIAL_PORT=$(CONFIG_TTYS0_BASE)" >> seabios/.config -else - echo "# CONFIG_DEBUG_SERIAL is not set" >> seabios/.config -endif -ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) - echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config -endif -ifeq ($(CONFIG_SEABIOS_VGA_COREBOOT),y) - echo "CONFIG_VGA_COREBOOT=y" >> seabios/.config - echo "CONFIG_BUILD_VGABIOS=y" >> seabios/.config -endif -ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),) -ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","") - cat $(CONFIG_PAYLOAD_CONFIGFILE) >> seabios/.config -else - echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist" - false -endif -endif - # This shows how to force a previously set .config option *off* - #echo "# CONFIG_SMBIOS is not set" >> seabios/.config - $(MAKE) -C seabios olddefconfig OUT=out/ - -build: config - echo " MAKE SeaBIOS $(TAG-y)" - $(MAKE) -C seabios OUT=out/ - -clean: - test -d seabios/out && rm -rf seabios/out || exit 0 - -distclean: - rm -rf seabios - -.PHONY: checkout config build clean distclean clone fetch diff --git a/payloads/external/U-Boot/Makefile b/payloads/external/U-Boot/Makefile new file mode 100644 index 0000000..255db29 --- /dev/null +++ b/payloads/external/U-Boot/Makefile @@ -0,0 +1,82 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2015 Google Inc. +## +## 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. +## + +# 2016-1 tag +STABLE_COMMIT_ID=fa85e826c16b9ce1ad302a57e9c4b24db0d8b930 + +TAG-$(CONFIG_UBOOT_MASTER)=origin/master +TAG-$(CONFIG_UBOOT_STABLE)=$(STABLE_COMMIT_ID) + +project_name=U-Boot +project_dir=u-boot +project_git_repo=http://git.denx.de/u-boot.git +project_config_file=$(project_dir)/.config + +unexport KCONFIG_AUTOHEADER +unexport KCONFIG_AUTOCONFIG +unexport KCONFIG_DEPENDENCIES +unexport KCONFIG_SPLITCONFIG +unexport KCONFIG_TRISTATE +unexport KCONFIG_NEGATIVES + +all: build + +$(project_dir): + echo " Cloning $(project_name) from Git" + git clone $(project_git_repo) $(project_dir) + +fetch: $(project_dir) +ifeq ($(CONFIG_UBOOT_MASTER),y) + echo " Fetching new commits from the $(project_name) git repo" + git fetch + + #master doesn't get a file, so it's continuously updated + rm -f $(project_dir)/$(STABLE_COMMIT_ID) +else + cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ]; \ + then echo " Fetching new commits from the $(project_name) git repo"; git fetch; fi + touch $(project_dir)/$(STABLE_COMMIT_ID) +endif + +$(project_dir)/tag-$(TAG-y): fetch + echo " Checking out $(project_name) revision $(TAG-y)" + cd $(project_dir); git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y) + +config: $(project_dir)/$(TAG-y) + rm -f $(project_config_file) +ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),) +ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","") + cat $(CONFIG_PAYLOAD_CONFIGFILE)" > tag-$(project_config_file) +else + echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist" + false +endif +else + cat $(project_dir)/configs/coreboot-x86_defconfig >> $(project_config_file) +endif + + $(MAKE) -C $(project_dir) olddefconfig + +build: config + echo " MAKE $(project_name) $(TAG-y)" + $(MAKE) -C $(project_dir) + +clean: + test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0 + +distclean: + rm -rf $(project_dir) + +.PHONY: config build clean distclean fetch diff --git a/payloads/external/U-Boot/Makefile.inc b/payloads/external/U-Boot/Makefile.inc deleted file mode 100644 index 255db29..0000000 --- a/payloads/external/U-Boot/Makefile.inc +++ /dev/null @@ -1,82 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2015 Google Inc. -## -## 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. -## - -# 2016-1 tag -STABLE_COMMIT_ID=fa85e826c16b9ce1ad302a57e9c4b24db0d8b930 - -TAG-$(CONFIG_UBOOT_MASTER)=origin/master -TAG-$(CONFIG_UBOOT_STABLE)=$(STABLE_COMMIT_ID) - -project_name=U-Boot -project_dir=u-boot -project_git_repo=http://git.denx.de/u-boot.git -project_config_file=$(project_dir)/.config - -unexport KCONFIG_AUTOHEADER -unexport KCONFIG_AUTOCONFIG -unexport KCONFIG_DEPENDENCIES -unexport KCONFIG_SPLITCONFIG -unexport KCONFIG_TRISTATE -unexport KCONFIG_NEGATIVES - -all: build - -$(project_dir): - echo " Cloning $(project_name) from Git" - git clone $(project_git_repo) $(project_dir) - -fetch: $(project_dir) -ifeq ($(CONFIG_UBOOT_MASTER),y) - echo " Fetching new commits from the $(project_name) git repo" - git fetch - - #master doesn't get a file, so it's continuously updated - rm -f $(project_dir)/$(STABLE_COMMIT_ID) -else - cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ]; \ - then echo " Fetching new commits from the $(project_name) git repo"; git fetch; fi - touch $(project_dir)/$(STABLE_COMMIT_ID) -endif - -$(project_dir)/tag-$(TAG-y): fetch - echo " Checking out $(project_name) revision $(TAG-y)" - cd $(project_dir); git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y) - -config: $(project_dir)/$(TAG-y) - rm -f $(project_config_file) -ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),) -ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","") - cat $(CONFIG_PAYLOAD_CONFIGFILE)" > tag-$(project_config_file) -else - echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist" - false -endif -else - cat $(project_dir)/configs/coreboot-x86_defconfig >> $(project_config_file) -endif - - $(MAKE) -C $(project_dir) olddefconfig - -build: config - echo " MAKE $(project_name) $(TAG-y)" - $(MAKE) -C $(project_dir) - -clean: - test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0 - -distclean: - rm -rf $(project_dir) - -.PHONY: config build clean distclean fetch diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile new file mode 100644 index 0000000..4e76687 --- /dev/null +++ b/payloads/external/depthcharge/Makefile @@ -0,0 +1,71 @@ +# release-R50-7978.B +STABLE_COMMIT_ID=124af94fa5599a0698e59bf3d73675eb52fc6879 + +project_name=depthcharge +project_dir=$(CURDIR)/depthcharge +project_git_repo=https://chromium.googlesource.com/chromiumos/platform/depthcharge +project_config_file=$(project_dir)/.config +output_dir=$(project_dir)/build +libpayload_dir=$(abspath $(CURDIR)/../../libpayload) +libpayload_install_dir=$(output_dir)/lp_$(BOARD) +vboot_dir=$(abspath $(CURDIR)/../../../3rdparty/vboot) + +TAG-$(DEPTHCHARGE_MASTER)=origin/master +TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID) + +unexport KCONFIG_AUTOHEADER +unexport KCONFIG_AUTOCONFIG +unexport KCONFIG_DEPENDENCIES +unexport KCONFIG_SPLITCONFIG +unexport KCONFIG_TRISTATE +unexport KCONFIG_NEGATIVES +unexport src srck obj objk + +BOARD:=$(notdir $(CONFIG_MAINBOARD_DIR)) + +all: build + +$(project_dir): + echo " Cloning $(project_name) from Git" + git clone $(project_git_repo) + +fetch: $(project_dir) + cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ] || \ + [ "$(TAG-y)" = "origin/master" ]; then \ + echo " Fetching new commits from the $(project_name) git repo"; \ + git fetch; fi + +checkout: fetch + echo " Checking out $(project_name) revision $(TAG-y)" + cd $(project_dir) ; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y) + +$(libpayload_install_dir): $(project_dir) + test -f $(libpayload_dir)/configs/config.$(BOARD) || \ + (echo "Error: $(libpayload_dir)/configs/config.$(BOARD) is not present" && \ + false) + cp $(libpayload_dir)/configs/config.$(BOARD) $(libpayload_dir)/.config + $(MAKE) -C $(libpayload_dir) olddefconfig + $(MAKE) -C $(libpayload_dir) + $(MAKE) -C $(libpayload_dir) install DESTDIR=$(libpayload_install_dir) +# rm -f $(libpayload_dir)/.config + +config: $(libpayload_install_dir) checkout + echo " CONFIG project_name $(TAG-y)" + export VERSION=$$(cd depthcharge && \ + git describe --tags --long --dirty 2>/dev/null || \ + echo "unknown") ; \ + cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \ + VB_SOURCE=$(vboot_dir) defconfig + +build: config + echo " MAKE $(project_name) $(TAG-y)" + cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \ + VB_SOURCE=$(vboot_dir) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" depthcharge_unified + +clean: + test -d $(output_dir) && rm -rf $(output_dir) || exit 0 + +distclean: + rm -rf $(project_dir) + +.PHONY: checkout config build clean distclean clone fetch diff --git a/payloads/external/depthcharge/Makefile.inc b/payloads/external/depthcharge/Makefile.inc deleted file mode 100644 index 4e76687..0000000 --- a/payloads/external/depthcharge/Makefile.inc +++ /dev/null @@ -1,71 +0,0 @@ -# release-R50-7978.B -STABLE_COMMIT_ID=124af94fa5599a0698e59bf3d73675eb52fc6879 - -project_name=depthcharge -project_dir=$(CURDIR)/depthcharge -project_git_repo=https://chromium.googlesource.com/chromiumos/platform/depthcharge -project_config_file=$(project_dir)/.config -output_dir=$(project_dir)/build -libpayload_dir=$(abspath $(CURDIR)/../../libpayload) -libpayload_install_dir=$(output_dir)/lp_$(BOARD) -vboot_dir=$(abspath $(CURDIR)/../../../3rdparty/vboot) - -TAG-$(DEPTHCHARGE_MASTER)=origin/master -TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID) - -unexport KCONFIG_AUTOHEADER -unexport KCONFIG_AUTOCONFIG -unexport KCONFIG_DEPENDENCIES -unexport KCONFIG_SPLITCONFIG -unexport KCONFIG_TRISTATE -unexport KCONFIG_NEGATIVES -unexport src srck obj objk - -BOARD:=$(notdir $(CONFIG_MAINBOARD_DIR)) - -all: build - -$(project_dir): - echo " Cloning $(project_name) from Git" - git clone $(project_git_repo) - -fetch: $(project_dir) - cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ] || \ - [ "$(TAG-y)" = "origin/master" ]; then \ - echo " Fetching new commits from the $(project_name) git repo"; \ - git fetch; fi - -checkout: fetch - echo " Checking out $(project_name) revision $(TAG-y)" - cd $(project_dir) ; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y) - -$(libpayload_install_dir): $(project_dir) - test -f $(libpayload_dir)/configs/config.$(BOARD) || \ - (echo "Error: $(libpayload_dir)/configs/config.$(BOARD) is not present" && \ - false) - cp $(libpayload_dir)/configs/config.$(BOARD) $(libpayload_dir)/.config - $(MAKE) -C $(libpayload_dir) olddefconfig - $(MAKE) -C $(libpayload_dir) - $(MAKE) -C $(libpayload_dir) install DESTDIR=$(libpayload_install_dir) -# rm -f $(libpayload_dir)/.config - -config: $(libpayload_install_dir) checkout - echo " CONFIG project_name $(TAG-y)" - export VERSION=$$(cd depthcharge && \ - git describe --tags --long --dirty 2>/dev/null || \ - echo "unknown") ; \ - cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \ - VB_SOURCE=$(vboot_dir) defconfig - -build: config - echo " MAKE $(project_name) $(TAG-y)" - cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \ - VB_SOURCE=$(vboot_dir) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" depthcharge_unified - -clean: - test -d $(output_dir) && rm -rf $(output_dir) || exit 0 - -distclean: - rm -rf $(project_dir) - -.PHONY: checkout config build clean distclean clone fetch

1 0

New patch to review for coreboot: MAINTAINERS: Add maintainer for Pineview & x4x chipsets & boards
by Martin Roth 17 Mar '16

17 Mar '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14129 -gerrit commit 086afbdb29f7c2d43e06e99bca082f165a9662a0 Author: Martin Roth <martinroth(a)google.com> Date: Thu Mar 17 12:01:27 2016 -0600 MAINTAINERS: Add maintainer for Pineview & x4x chipsets & boards Change-Id: I3c34f6e69b3760a10e67bdc41c8ef0e629beb881 Signed-off-by: Martin Roth <martinroth(a)google.com> --- MAINTAINERS | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index a3b6762..69369d5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -144,6 +144,26 @@ M: Alexander Couzens <lynxis(a)fe80.eu> S: Maintained F: src/mainboard/lenovo/ +INTEL PINEVIEW CHIPSET +M: Damien Zammit <damien(a)zamaudio.com> +S: Maintained +F: src/northbridge/intel/pineview/ + +INTEL D510MO MAINBOARD +M: Damien Zammit <damien(a)zamaudio.com> +S: Maintained +F: src/mainboard/intel/d510mo + +INTEL X4X CHIPSET +M: Damien Zammit <damien(a)zamaudio.com> +S: Maintained +F: src/northbridge/intel/x4x/ + +GIGABYTE GA-G41M-ES2L MAINBOARD +M: Damien Zammit <damien(a)zamaudio.com> +S: Maintained +F: src/mainboard/gigabyte/ga-g41m-es2l + GOOGLE PANTHER MAINBOARD M: Stefan Reinauer <stefan.reinauer(a)coreboot.org> S: Supported

1 0

New patch to review for coreboot: MAINTAINERS: Add maintainer to lint scripts, board status & payloads
by Martin Roth 17 Mar '16

17 Mar '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14128 -gerrit commit 5529b46c8885909324f81c94ac4b974c4b8f465c Author: Martin Roth <martinroth(a)google.com> Date: Thu Mar 17 12:03:00 2016 -0600 MAINTAINERS: Add maintainer to lint scripts, board status & payloads Change-Id: I3efd4116da1ffda2dbc768d1a447141d8ec76f81 Signed-off-by: Martin Roth <martinroth(a)google.com> --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4930a2a..a3b6762 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -329,6 +329,7 @@ F: src/southbridge/via/ LINT SCRIPTS M: Patrick Georgi <patrick(a)georgi-clan.de> +M: Martin Roth <gaumless(a)gmail.com> S: Supported F: util/lint/ @@ -352,6 +353,8 @@ F: util/kconfig/ F: util/sconfig/ BOARD STATUS +M: Martin Roth <gaumless(a)gmail.com> +S: Supported F: util/board_status/ BINARY OBJECTS @@ -402,6 +405,7 @@ F: payloads/coreinfo/ EXTERNAL PAYLOADS INTEGRATION M: Stefan Reinauer <stefan.reinauer(a)coreboot.org> +M: Martin Roth <gaumless(a)gmail.com> F: payloads/external VERIFIED BOOT 2

1 0

New patch to review for coreboot: MAINTAINERS: Add maintainer for Braswell SOC & Reference board
by Martin Roth 17 Mar '16

17 Mar '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14127 -gerrit commit 3c48d34cf00390f3d2e9b36015464a48260f97da Author: Martin Roth <martinroth(a)google.com> Date: Thu Mar 17 12:02:12 2016 -0600 MAINTAINERS: Add maintainer for Braswell SOC & Reference board Change-Id: If3b49c3056abe6e1c1a14578d6c62a866bc6834d Signed-off-by: Martin Roth <martinroth(a)google.com> --- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index ee6bf91..4930a2a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -208,6 +208,17 @@ M: York Yang <york.yang(a)intel.com> S: Supported F: src/drivers/intel/fsp1_1/ +INTEL STRAGO MAINBOARD +M: Hannah Williams <hannah.williams(a)intel.com> +S: Supported +F: /src/mainboard/intel/strago/ + +INTEL BRASWELL SOC +M: Hannah Williams <hannah.williams(a)intel.com> +S: Supported +F: /src/soc/intel/braswell +F: /src/vendorcode/intel/fsp/fsp1_1/braswell + ASUS KFSN4-DRE & KFSN4-DRE_K8 MAINBOARDS M: Timothy Pearson <tpearson(a)raptorengineeringinc.com> S: Supported

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit March 2016