summaryrefslogtreecommitdiff
path: root/utility
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-07-25 08:48:47 -0600
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2013-08-28 18:30:35 +0000
commit1d3c804b6b9d2ffb6953a7ee98fabfd548915ad7 (patch)
tree428381095859110fd91e382f79174f34d60171a6 /utility
parent317e1b49449d23148c4233b508d0a1f14696eafc (diff)
downloadvboot-1d3c804b6b9d2ffb6953a7ee98fabfd548915ad7.tar.gz
Implementation of Region API
At present reading data from storage in Vboot is a little fragmented. For the firmware image, we expect the boot loader to handle this. For the disk we have a block-level API. For the GBB (which also sits in the firmware image) we expect the entire thing to be read before Vboot is called. Add the concept of a region, and an API to read from a region. At present, and most pressing, is reading from a GBB region. In the future this could be extended to other parts of the firmware or even the disk. Move all access to the GBB into this API so that the boot loader can provide either a GBB region in one large contiguous chunk, or a function to deal with read requests from vboot. The call to VbExRegionRead() is behind a flag since not all boot loaders support it yet. The main change for boot loaders which don't support this new API is that vboot will do more behind the scenes. For example, it will allocate memory for chunks of data that it reads from the GBB, rather than just accessing it directly. This approach is considerably simpler than trying to pass char ** everywhere and have vboot decide whether something needs to be allocated or not. The tests are updated, mainly to include setting up a GBB structure accessible from VbCommonParams, which is now required by the firmware and kernel functions. In normal operation this is set up at the start of VbLoadFIrmware() and VbSelectAndLoadKernel() but for tests which call children of these functions directly, the GBB structure must be set up manually by the test. BUG=chrome-os-partner:21115 BRANCH=none TEST=manual FEATURES=test sudo -E emerge vboot_reference Change-Id: I2c19e9dc2ed602d0642bbf4f7d27f79fe9fad873 Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/63336 Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'utility')
-rw-r--r--utility/load_kernel_test.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/utility/load_kernel_test.c b/utility/load_kernel_test.c
index 307b8ee2..8e6c5191 100644
--- a/utility/load_kernel_test.c
+++ b/utility/load_kernel_test.c
@@ -27,6 +27,7 @@
/* Global variables for stub functions */
static LoadKernelParams lkp;
+static VbCommonParams cparams;
static VbNvContext vnc;
static FILE *image_file = NULL;
@@ -94,6 +95,7 @@ int main(int argc, char* argv[]) {
Memset(&vnc, 0, sizeof(VbNvContext));
VbNvSetup(&vnc);
lkp.nv_context = &vnc;
+ Memset(&cparams, 0, sizeof(VbCommonParams));
/* Parse options */
opterr = 0;
@@ -157,6 +159,7 @@ int main(int argc, char* argv[]) {
lkp.gbb_size = sizeof(GoogleBinaryBlockHeader) + key_size;
lkp.gbb_data = (void*)malloc(lkp.gbb_size);
gbb = (GoogleBinaryBlockHeader*)lkp.gbb_data;
+ cparams.gbb = gbb;
Memset(gbb, 0, lkp.gbb_size);
Memcpy(gbb->signature, GBB_SIGNATURE, GBB_SIGNATURE_SIZE);
gbb->major_version = GBB_MAJOR_VER;
@@ -214,7 +217,7 @@ int main(int argc, char* argv[]) {
lkp.kernel_buffer_size = KERNEL_BUFFER_SIZE;
/* Call LoadKernel() */
- rv = LoadKernel(&lkp);
+ rv = LoadKernel(&lkp, &cparams);
printf("LoadKernel() returned %d\n", rv);
if (VBERROR_SUCCESS == rv) {