summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorYoshiki Iguchi <yoshiki@chromium.org>2013-08-29 05:10:33 +0000
committerYoshiki Iguchi <yoshiki@chromium.org>2013-08-29 05:36:12 +0000
commit8fa13ad6f727d44fdc0ae1d2bde5f54b32dab9b9 (patch)
treee7b1cd139b4aaa06d61d2aa30b74c45c2eeaa1f3 /Makefile
parent1d3c804b6b9d2ffb6953a7ee98fabfd548915ad7 (diff)
downloadvboot-8fa13ad6f727d44fdc0ae1d2bde5f54b32dab9b9.tar.gz
Revert "Implementation of Region API"
This reverts commit 1d3c804b6b9d2ffb6953a7ee98fabfd548915ad7. This patch breaks cbuildbot on internal paladins bots. Change-Id: Icf7f9d9bbb56b092035888eaa3e249ffd23fac16 (cherry picked from commit 3a60335ebb1530e5fd9d5da3bc6214949bc59caf) Reviewed-on: https://chromium-review.googlesource.com/167451 Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org> Commit-Queue: Yoshiki Iguchi <yoshiki@chromium.org> Tested-by: Yoshiki Iguchi <yoshiki@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 3 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index b810a5f5..403b4d62 100644
--- a/Makefile
+++ b/Makefile
@@ -239,7 +239,6 @@ VBINIT_SRCS = \
firmware/lib/vboot_api_init.c \
firmware/lib/vboot_common_init.c \
firmware/lib/vboot_nvstorage.c \
- firmware/lib/region-init.c \
# Additional firmware library sources needed by VbSelectFirmware() call
VBSF_SRCS = \
@@ -253,8 +252,7 @@ VBSF_SRCS = \
firmware/lib/stateful_util.c \
firmware/lib/vboot_api_firmware.c \
firmware/lib/vboot_common.c \
- firmware/lib/vboot_firmware.c \
- firmware/lib/region-fw.c \
+ firmware/lib/vboot_firmware.c
# Additional firmware library sources needed by VbSelectAndLoadKernel() call
VBSLK_SRCS = \
@@ -266,8 +264,7 @@ VBSLK_SRCS = \
firmware/lib/vboot_api_kernel.c \
firmware/lib/vboot_audio.c \
firmware/lib/vboot_display.c \
- firmware/lib/vboot_kernel.c \
- firmware/lib/region-kernel.c \
+ firmware/lib/vboot_kernel.c
# Support real TPM unless BIOS sets MOCK_TPM
ifeq (${MOCK_TPM},)
@@ -292,8 +289,7 @@ ifeq (${FIRMWARE_ARCH},)
VBINIT_SRCS += \
firmware/stub/tpm_lite_stub.c \
firmware/stub/utility_stub.c \
- firmware/stub/vboot_api_stub_init.c \
- firmware/stub/vboot_api_stub_region.c
+ firmware/stub/vboot_api_stub_init.c
VBSF_SRCS += \
firmware/stub/vboot_api_stub_sf.c
@@ -537,10 +533,6 @@ TEST_NAMES = \
tests/vboot_nvstorage_test \
tests/futility/test_not_really
-ifdef REGION_READ
-TEST_NAMES += tests/vboot_region_tests
-endif
-
# TODO: port these tests to new API, if not already eqivalent
# functionality in other tests. These don't even compile at present.
#
@@ -650,10 +642,6 @@ ${FWLIB_OBJS}: CFLAGS += -DSAVE_LOCALE_IMMEDIATELY
${FWLIB_OBJS}: CFLAGS += -DCOPY_BMP_DATA
endif
-ifdef REGION_READ
-${FWLIB_OBJS}: CFLAGS += -DREGION_READ
-endif
-
ifeq (${FIRMWARE_ARCH},)
# Disable rollback TPM when compiling locally, since otherwise
# load_kernel_test attempts to talk to the TPM.