diff options
author | Che-Liang Chiou <clchiou@chromium.org> | 2011-05-09 11:42:02 +0800 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:39:20 -0700 |
commit | fc8594e72004eef00d69845a0061a59cf269f742 (patch) | |
tree | d1983299c5c6c79441e94b26a808abcc8522c726 /board/nvidia | |
parent | 3a269b4769092aaebf88bf54a477d563127c8ef4 (diff) |
Remove TPM functions and x86-specific CPU state
The removed TPM functions are implemented in verified boot reference
library (vboot_reference), and so this commit removes the implementation
of these functions in u-boot.
This commit also removes codes that are related to x86-specific CPU
state (S3 resume).
BUG=none
TEST=CROSS_COMPILE=armv7a-cros-linux-gnueabi- ./MAKEALL chromeos
Cherry-pick: 75707bc
Change-Id: Id4a967b9dd16549bb26adbe27ce96caa713bfe30
Reviewed-on: http://gerrit.chromium.org/gerrit/515
Tested-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
Diffstat (limited to 'board/nvidia')
-rw-r--r-- | board/nvidia/chromeos/Makefile | 2 | ||||
-rw-r--r-- | board/nvidia/chromeos/gpio.c | 2 | ||||
-rw-r--r-- | board/nvidia/chromeos/tpm_driver.c | 20 |
3 files changed, 1 insertions, 23 deletions
diff --git a/board/nvidia/chromeos/Makefile b/board/nvidia/chromeos/Makefile index e68d1f1d26..b1d3bd1b70 100644 --- a/board/nvidia/chromeos/Makefile +++ b/board/nvidia/chromeos/Makefile @@ -38,9 +38,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)libchromeos_hardware_interface.a -COBJS-$(CONFIG_CHROMEOS) += cpu_state.o COBJS-$(CONFIG_CHROMEOS) += gpio.o -COBJS-$(CONFIG_CHROMEOS) += tpm_driver.o COBJS := $(COBJS-y) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/nvidia/chromeos/gpio.c b/board/nvidia/chromeos/gpio.c index 8111b6b1d9..64a93f4a9b 100644 --- a/board/nvidia/chromeos/gpio.c +++ b/board/nvidia/chromeos/gpio.c @@ -39,7 +39,7 @@ #include <common.h> #include "../../common/lcd/gpinit/gpinit.h" -#include <chromeos/hardware_interface.h> +#include <chromeos/gpio.h> #define GPIO_ACTIVE_HIGH 0 #define GPIO_ACTIVE_LOW 1 diff --git a/board/nvidia/chromeos/tpm_driver.c b/board/nvidia/chromeos/tpm_driver.c deleted file mode 100644 index f3e7916e9c..0000000000 --- a/board/nvidia/chromeos/tpm_driver.c +++ /dev/null @@ -1,20 +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. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - */ - -/* Implementation of per-board TPM driver functions */ - -#include <chromeos/hardware_interface.h> - -/* TODO Replace dummy functions below with real implementation. */ - -/* Returns 0 if success, nonzero if error. */ -int initialize_tpm(void) { return 0; } -int lock_tpm(void) { return 0; } -int lock_tpm_rewritable_firmware_index(void) { return 0; } |