diff options
| author | Hsin-Te Yuan <yuanhsinte@google.com> | 2022-07-12 10:52:13 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-29 09:47:12 +0000 |
| commit | 18cb85b52d689b4cfbd49c6384ae2088b78af1e0 (patch) | |
| tree | 2c7e7aca1e50a81e05aa7c302db29554f0a82c70 /Makefile | |
| parent | 81b8d3faabad2f16bfd08efa6920bdaaeb637ce8 (diff) | |
| download | vboot-18cb85b52d689b4cfbd49c6384ae2088b78af1e0.tar.gz | |
2load_kernel.c: Expose load kernel as vb2_api
Move VbTryLoadKernel() and VbTryLoadMiniOsKernel() to depthcharge.
In addition, expose LoadKernel() and LoadMiniOsKernel() as
vb2api_load_kernel() and vb2api_load_minos_kernel(), respectively.
Since we remove VbTryLoadKernel() in vb2api_normal_boot(), rename
vb2api_normal_boot() to check_kernel_version() and call it in
vb2api_kernel_finalize().
Also, rename VbSelectAndLoadKernelParams, VbDiskInfo, and
VbExDiskHandle_t as vb2_kernel_params, vb2_disk_info, and
vb2ex_disk_handle_t, respectively.
BUG=b:172339016
BRANCH=none
TEST=make runtests
TEST=FW_NAME=tomato emerge-cherry depthcharge
Cq-Depend: chromium:3758201
Signed-off-by: Hsin-Te Yuan <yuanhsinte@google.com>
Change-Id: Iaf182ca81797fee24c6104dac9d4770ff75c7fb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3755923
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -376,6 +376,7 @@ FWLIB_SRCS = \ firmware/2lib/2gbb.c \ firmware/2lib/2hmac.c \ firmware/2lib/2kernel.c \ + firmware/2lib/2load_kernel.c \ firmware/2lib/2misc.c \ firmware/2lib/2nvstorage.c \ firmware/2lib/2packed_key.c \ @@ -395,8 +396,6 @@ FWLIB_SRCS = \ firmware/lib/cgptlib/cgptlib_internal.c \ firmware/lib/cgptlib/crc32.c \ firmware/lib/gpt_misc.c \ - firmware/lib/vboot_api_kernel.c \ - firmware/lib/vboot_kernel.c \ firmware/lib20/api_kernel.c \ firmware/lib20/kernel.c @@ -714,9 +713,6 @@ TEST_NAMES = \ tests/gpt_misc_tests \ tests/sha_benchmark \ tests/subprocess_tests \ - tests/vboot_api_kernel_tests \ - tests/vboot_kernel_tests \ - tests/vboot_kernel2_tests \ tests/verify_kernel ifeq ($(filter-out 0,${MOCK_TPM})$(filter-out 0,${TPM2_MODE}),) @@ -747,7 +743,8 @@ TEST2X_NAMES = \ tests/vb2_host_key_tests \ tests/vb2_host_nvdata_flashrom_tests \ tests/vb2_kernel_tests \ - tests/vb2_kernel2_tests \ + tests/vb2_load_kernel_tests \ + tests/vb2_load_kernel2_tests \ tests/vb2_misc_tests \ tests/vb2_misc2_tests \ tests/vb2_nvstorage_tests \ @@ -1286,9 +1283,6 @@ ifeq ($(filter-out 0,${MOCK_TPM})$(filter-out 0,${TPM2_MODE}),) # tlcl_tests only works when MOCK_TPM is disabled ${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests endif - ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_kernel_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_kernel2_tests .PHONY: run2tests run2tests: install_for_test @@ -1302,8 +1296,9 @@ run2tests: install_for_test ${RUNTEST} ${BUILD_RUN}/tests/vb2_firmware_tests ${RUNTEST} ${BUILD_RUN}/tests/vb2_gbb_tests ${RUNTEST} ${BUILD_RUN}/tests/vb2_host_key_tests + ${RUNTEST} ${BUILD_RUN}/tests/vb2_load_kernel_tests + ${RUNTEST} ${BUILD_RUN}/tests/vb2_load_kernel2_tests ${RUNTEST} ${BUILD_RUN}/tests/vb2_kernel_tests - ${RUNTEST} ${BUILD_RUN}/tests/vb2_kernel2_tests ${RUNTEST} ${BUILD_RUN}/tests/vb2_misc_tests ${RUNTEST} ${BUILD_RUN}/tests/vb2_misc2_tests ${RUNTEST} ${BUILD_RUN}/tests/vb2_nvstorage_tests |