From 5fffeee4124ec2a27baace5e5b8e473a18f32f16 Mon Sep 17 00:00:00 2001 From: Sonny Rao Date: Wed, 23 Nov 2011 00:53:24 +0000 Subject: Fix crossystem on amd64 boards Since x86 and amd64 boards use the same firmware and are otherwise identical use the same implementation for crossystem on both BUG=chromium-os:21386 TEST=emerge-x86-generic ; test crossystem works on Samsung Series 5 TEST=emerge-amd64-generic ; test crossystem works on Samsung Series 5 TEST=run unit tests on build machine with: RUNTESTS=1 make Change-Id: Ica516cca7ead6cb9cdfae0894bd532669ba3ba88 Reviewed-on: https://gerrit.chromium.org/gerrit/12059 Tested-by: Sonny Rao Reviewed-by: Randall Spangler Commit-Ready: Sonny Rao --- host/arch/amd64/lib/crossystem_arch.c | 58 +---------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) mode change 100644 => 120000 host/arch/amd64/lib/crossystem_arch.c diff --git a/host/arch/amd64/lib/crossystem_arch.c b/host/arch/amd64/lib/crossystem_arch.c deleted file mode 100644 index 08ae723a..00000000 --- a/host/arch/amd64/lib/crossystem_arch.c +++ /dev/null @@ -1,57 +0,0 @@ -/* 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. - */ -/* crossystem is only valid on devices, not on the host, but since - * it's part of the host library, we need a dummy implementation (all - * functions return errors) */ - -#include -#include -#include -#include -#include -#include - -#include "host_common.h" - -#include "crossystem.h" -#include "crossystem_arch.h" -#include "utility.h" -#include "vboot_common.h" -#include "vboot_nvstorage.h" -#include "vboot_struct.h" - -int VbReadNvStorage(VbNvContext* vnc) { - return -1; -} - - -int VbWriteNvStorage(VbNvContext* vnc) { - return -1; -} - - -VbSharedDataHeader* VbSharedDataRead(void) { - return NULL; -} - - -int VbGetArchPropertyInt(const char* name) { - return -1; -} - - -const char* VbGetArchPropertyString(const char* name, char* dest, int size) { - return NULL; -} - - -int VbSetArchPropertyInt(const char* name, int value) { - return -1; -} - - -int VbSetArchPropertyString(const char* name, const char* value) { - return -1; -} diff --git a/host/arch/amd64/lib/crossystem_arch.c b/host/arch/amd64/lib/crossystem_arch.c new file mode 120000 index 00000000..1f5d6522 --- /dev/null +++ b/host/arch/amd64/lib/crossystem_arch.c @@ -0,0 +1 @@ +../../x86/lib/crossystem_arch.c \ No newline at end of file -- cgit v1.2.1