diff options
author | Aaron Durbin <adurbin@chromium.org> | 2015-12-08 17:00:23 -0600 |
---|---|---|
committer | Aaron Durbin <adurbin@chromium.org> | 2015-12-10 04:43:58 +0100 |
commit | 6d720f38e06d14cc8a89635f66dc124dcd5ac150 (patch) | |
tree | 874aecaf8f35d8db1740dabc7735e3e44cb9ca5e /src/lib/cbfs_boot_props.c | |
parent | bf3dbaf86d033becc231a48612d474fac9add1ee (diff) | |
download | coreboot-6d720f38e06d14cc8a89635f66dc124dcd5ac150.tar.xz |
cbfs/vboot: remove firmware component support
The Chrome OS verified boot path supported multiple CBFS
instances in the boot media as well as stand-alone assets
sitting in each vboot RW slot. Remove the support for the
stand-alone assets and always use CBFS accesses as the
way to retrieve data.
This is implemented by adding a cbfs_locator object which
is queried for locating the current CBFS. Additionally, it
is also signalled prior to when a program is about to be
loaded by coreboot for the subsequent stage/payload. This
provides the same opportunity as previous for vboot to
hook in and perform its logic.
BUG=chromium:445938
BRANCH=None
TEST=Built and ran on glados.
CQ-DEPEND=CL:307121,CL:31691,CL:31690
Change-Id: I6a3a15feb6edd355d6ec252c36b6f7885b383099
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/12689
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/lib/cbfs_boot_props.c')
-rw-r--r-- | src/lib/cbfs_boot_props.c | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/src/lib/cbfs_boot_props.c b/src/lib/cbfs_boot_props.c deleted file mode 100644 index 7ff3726c4b..0000000000 --- a/src/lib/cbfs_boot_props.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 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. - */ - -#include <boot_device.h> -#include <cbfs.h> -#include <console/console.h> -#include <endian.h> -#include <commonlib/region.h> - -/* This function is marked as weak to allow a particular platform to - * override the logic. This implementation should work for most devices. */ -int __attribute__((weak)) cbfs_boot_region_properties(struct cbfs_props *props) -{ - struct cbfs_header header; - const struct region_device *bdev; - int32_t rel_offset; - size_t offset; - - bdev = boot_device_ro(); - - if (bdev == NULL) - return -1; - - /* Find location of header using signed 32-bit offset from - * end of CBFS region. */ - offset = CONFIG_CBFS_SIZE - sizeof(int32_t); - if (rdev_readat(bdev, &rel_offset, offset, sizeof(int32_t)) < 0) - return -1; - - offset = CONFIG_CBFS_SIZE + rel_offset; - if (rdev_readat(bdev, &header, offset, sizeof(header)) < 0) - return -1; - - header.magic = ntohl(header.magic); - header.romsize = ntohl(header.romsize); - header.offset = ntohl(header.offset); - - if (header.magic != CBFS_HEADER_MAGIC) - return -1; - - props->offset = header.offset; - props->size = header.romsize; - props->size -= props->offset; - - printk(BIOS_SPEW, "CBFS @ %zx size %zx\n", props->offset, props->size); - - return 0; -} |