diff options
author | Gabe Black <gabeblack@chromium.org> | 2011-08-11 04:37:06 -0700 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:36 -0700 |
commit | 87d29940c710751191b82c18a49a79b490c03749 (patch) | |
tree | 0c92a818f19b2930b92d21fd7e50c0fb82ab93f0 /board/chromebook-x86 | |
parent | f461780a13efe560edf8a16c8df1e7e9b92d7035 (diff) |
Revert "Make the FMAP configuration decoding function board specific."
This reverts commit 23cefdce356de66442d858abf12c72afc8d33cac.
Since we changed our minds about loading FMAP information from CBFS, we can go
back to using the same mechanism on ARM and x86.
BUG=chrome-os-partner:5432
TEST=Built and booted on x86-alex and verified that the FMAP information showed
up in debugging output from vboot_twostop.
Change-Id: Id41c82ca24dbfa301559e24104b5e226ec9b7e03
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://gerrit.chromium.org/gerrit/5864
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'board/chromebook-x86')
-rw-r--r-- | board/chromebook-x86/chromeos/Makefile | 1 | ||||
-rw-r--r-- | board/chromebook-x86/chromeos/fmap.c | 21 |
2 files changed, 0 insertions, 22 deletions
diff --git a/board/chromebook-x86/chromeos/Makefile b/board/chromebook-x86/chromeos/Makefile index 4a74a221b65..a3eb6ec90f2 100644 --- a/board/chromebook-x86/chromeos/Makefile +++ b/board/chromebook-x86/chromeos/Makefile @@ -39,7 +39,6 @@ include $(TOPDIR)/config.mk LIB = $(obj)libchromeos_board.a COBJS-$(CONFIG_CHROMEOS) += cros_gpio.o -COBJS-$(CONFIG_CHROMEOS) += fmap.o COBJS-$(CONFIG_CHROMEOS) += power_management.o COBJS := $(COBJS-y) diff --git a/board/chromebook-x86/chromeos/fmap.c b/board/chromebook-x86/chromeos/fmap.c deleted file mode 100644 index 7101af8cbc6..00000000000 --- a/board/chromebook-x86/chromeos/fmap.c +++ /dev/null @@ -1,21 +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 fmap accessor functions */ - -#include <chromeos/fmap.h> -#include <common.h> - -int -decode_twostop_fmap(struct twostop_fmap *fmap) -{ - printf("decode_twostop_fmap used but not implemented.\n"); - return 0; -} |