diff options
| author | Che-Liang Chiou <clchiou@chromium.org> | 2011-07-25 15:03:57 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:07 -0700 |
| commit | a0f700ab4b06f7c8d87d336324f5813c9a31c684 (patch) | |
| tree | 8fe7bf39c8807290e7a60dd2d2a976063ca1b8e6 | |
| parent | e15ae271675d02be118708ebb4498ffc7924e3f2 (diff) | |
CHROMIUM: move VbExNvStorageRead/Write to board-specific directory
As ARM accesses non-volatile storage from eMMC and x86 from CMOS, the
accessor functions that export to vboot_reference are really not
board-independent and so should be put at a board-dependent module.
BUG=none
TEST=make
Change-Id: Idbd4d70372770597aa8897524ee6a1ffe173bfea
Reviewed-on: http://gerrit.chromium.org/gerrit/4646
Tested-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | board/nvidia/chromeos/Makefile | 2 | ||||
| -rw-r--r-- | board/nvidia/vbexport/Makefile | 30 | ||||
| -rw-r--r-- | board/nvidia/vbexport/nvstorage.c (renamed from lib/vbexport/nvstorage.c) | 0 | ||||
| -rw-r--r-- | lib/vbexport/Makefile | 1 |
5 files changed, 33 insertions, 3 deletions
@@ -217,7 +217,8 @@ LIBS += lib/zlib/libz.o LIBS += lib/chromeos/libchromeos.a LIBS += lib/vbexport/libvbexport.a LIBS += lib/vboot/libvboot.a -LIBS += board/$(VENDOR)/chromeos/libchromeos_hardware_interface.a +LIBS += board/$(VENDOR)/chromeos/libchromeos_board.a +LIBS += board/$(VENDOR)/vbexport/libvbexport_board.a LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ "board/$(VENDOR)/common/lib$(VENDOR).o"; fi) LIBS += $(CPUDIR)/lib$(CPU).o diff --git a/board/nvidia/chromeos/Makefile b/board/nvidia/chromeos/Makefile index efa3fd4540c..5bbae8c752f 100644 --- a/board/nvidia/chromeos/Makefile +++ b/board/nvidia/chromeos/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/config.mk -LIB = $(obj)libchromeos_hardware_interface.a +LIB = $(obj)libchromeos_board.a COBJS-$(CONFIG_CHROMEOS) += cros_gpio.o COBJS-$(CONFIG_CHROMEOS) += power_management.o diff --git a/board/nvidia/vbexport/Makefile b/board/nvidia/vbexport/Makefile new file mode 100644 index 00000000000..327f0b2e41b --- /dev/null +++ b/board/nvidia/vbexport/Makefile @@ -0,0 +1,30 @@ +# +# 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. +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)libvbexport_board.a + +COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += nvstorage.o + +COBJS := $(COBJS-y) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/lib/vbexport/nvstorage.c b/board/nvidia/vbexport/nvstorage.c index e9f49c4f855..e9f49c4f855 100644 --- a/lib/vbexport/nvstorage.c +++ b/board/nvidia/vbexport/nvstorage.c diff --git a/lib/vbexport/Makefile b/lib/vbexport/Makefile index c59cd8e87cf..378e043ad24 100644 --- a/lib/vbexport/Makefile +++ b/lib/vbexport/Makefile @@ -17,7 +17,6 @@ COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += display.o COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += keyboard.o COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += load_firmware.o COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += misc.o -COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += nvstorage.o COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += tlcl_stub.o COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += utility.o |