From 32a6526d25d4bf9a1c137fc3d275d1c68935d184 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Mon, 27 Jun 2011 10:49:11 -0700 Subject: Verified boot wrapper - add stub implementations for host This is part 2 of the wrapper API refactor. It adds stub implementations for the host, and changes the host-side utilities to use them. Firmware implementation is unchanged in this CL (other than a few updates to macros). BUG=chromium_os:16997 TEST=make && make runtests Change-Id: I63989bd11de1f2239ddae256beaccd31bfb5acef Reviewed-on: http://gerrit.chromium.org/gerrit/3256 Reviewed-by: Stefan Reinauer Tested-by: Randall Spangler --- utility/load_kernel_test.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'utility/load_kernel_test.c') diff --git a/utility/load_kernel_test.c b/utility/load_kernel_test.c index 73a3626a..6b0f9a88 100644 --- a/utility/load_kernel_test.c +++ b/utility/load_kernel_test.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2011 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. */ @@ -14,13 +14,12 @@ #include #include -#include "load_firmware_fw.h" -#include "load_kernel_fw.h" #include "boot_device.h" #include "gbb_header.h" #include "host_common.h" +#include "load_firmware_fw.h" +#include "load_kernel_fw.h" #include "rollback_index.h" -#include "utility.h" #include "vboot_common.h" #include "vboot_kernel.h" @@ -52,7 +51,6 @@ int BootDeviceReadLBA(uint64_t lba_start, uint64_t lba_count, void *buffer) { return 0; } - int BootDeviceWriteLBA(uint64_t lba_start, uint64_t lba_count, const void *buffer) { printf("Write(%" PRIu64 ", %" PRIu64 ")\n", lba_start, lba_count); @@ -153,7 +151,7 @@ int main(int argc, char* argv[]) { /* Initialize the GBB */ lkp.gbb_size = sizeof(GoogleBinaryBlockHeader) + key_size; - lkp.gbb_data = (void*)Malloc(lkp.gbb_size); + lkp.gbb_data = (void*)malloc(lkp.gbb_size); gbb = (GoogleBinaryBlockHeader*)lkp.gbb_data; Memset(gbb, 0, lkp.gbb_size); Memcpy(gbb->signature, GBB_SIGNATURE, GBB_SIGNATURE_SIZE); @@ -171,7 +169,7 @@ int main(int argc, char* argv[]) { } /* Initialize the shared data area */ - lkp.shared_data_blob = Malloc(VB_SHARED_DATA_REC_SIZE); + lkp.shared_data_blob = malloc(VB_SHARED_DATA_REC_SIZE); lkp.shared_data_size = VB_SHARED_DATA_REC_SIZE; shared = (VbSharedDataHeader*)lkp.shared_data_blob; if (0 != VbSharedDataInit(shared, lkp.shared_data_size)) { @@ -187,7 +185,7 @@ int main(int argc, char* argv[]) { } /* Free the key blob, now that we're done with it */ - Free(key_blob); + free(key_blob); /* Needs to skip the address check, since we're putting it somewhere on the * heap instead of its actual target address in the firmware. */ @@ -217,7 +215,7 @@ int main(int argc, char* argv[]) { printf("Ending LBA: %" PRIu64 "\n", lkp.ending_lba); /* Allocate a buffer for the kernel */ - lkp.kernel_buffer = Malloc(KERNEL_BUFFER_SIZE); + lkp.kernel_buffer = malloc(KERNEL_BUFFER_SIZE); if(!lkp.kernel_buffer) { fprintf(stderr, "Unable to allocate kernel buffer.\n"); return 1; @@ -254,6 +252,6 @@ int main(int argc, char* argv[]) { } fclose(image_file); - Free(lkp.kernel_buffer); + free(lkp.kernel_buffer); return rv != LOAD_KERNEL_SUCCESS; } -- cgit v1.2.1