From b07b4b9c71fd54a923fa914a046fcf7183d65c22 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Thu, 4 Jan 2018 17:58:01 -0800 Subject: firmware: Stop using vboot1 cparams internally Now that vb2_shared_data / vb2_context provides all the same data to lower-level kernel verification code that cparams did, stop passing cparams down to those functions. No change in functionality. BUG=chromium:611535 BRANCH=none TEST=make -j runtests; build bob firmware and boot it Change-Id: I86eb1801ee96d8b56404b74843a8d09e3122567f Signed-off-by: Randall Spangler Reviewed-on: https://chromium-review.googlesource.com/852814 Commit-Ready: ChromeOS CL Exonerator Bot Reviewed-by: Stefan Reinauer --- tests/vboot_kernel_tests.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tests/vboot_kernel_tests.c') diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c index c6798d2c..14bffc91 100644 --- a/tests/vboot_kernel_tests.c +++ b/tests/vboot_kernel_tests.c @@ -67,7 +67,6 @@ static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data; static LoadKernelParams lkp; static VbKeyBlockHeader kbh; static VbKernelPreambleHeader kph; -static VbCommonParams cparams; static struct RollbackSpaceFwmp fwmp; static uint8_t mock_disk[MOCK_SECTOR_SIZE * MOCK_SECTOR_COUNT]; static GptHeader *mock_gpt_primary = @@ -145,8 +144,6 @@ static void ResetMocks(void) VbSharedDataInit(shared, sizeof(shared_data)); shared->kernel_version_tpm = 0x20001; - memset(&cparams, '\0', sizeof(cparams)); - memset(&lkp, 0, sizeof(lkp)); lkp.bytes_per_lba = 512; lkp.streaming_lba_count = 1024; @@ -570,7 +567,7 @@ static void ReadWriteGptTest(void) static void TestLoadKernel(int expect_retval, char *test_name) { - TEST_EQ(LoadKernel(&ctx, &lkp, &cparams), expect_retval, test_name); + TEST_EQ(LoadKernel(&ctx, &lkp), expect_retval, test_name); } /** -- cgit v1.2.1