VBoot Reference: Make kernel_config a 4K byte block, and move it after the verified boot block.

src/platform/vboot_reference/tests/kernel_splicing_tests.c

 /* Copyright (c) 2010 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.
  *
  * Splicing tests for the kernel image verification library.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
@@ skipping 45 matching lines @@
           "KernelImage kernel_data Original");
   TEST_EQ(VerifyKernelImage(firmware_key, image2, 0),
           VERIFY_KERNEL_SUCCESS,
           "KernelImage kernel_data Original");
 
   /* Splice kernel_data + kernel signature from [image1]
    * and put it into [image2]. */
   Memcpy(image2->kernel_signature, image1->kernel_signature,
          siglen_map[0]);
   Memcpy(image2->kernel_data, image1->kernel_data,
-         image2->options.kernel_len);
+         image2->kernel_len);
 
   TEST_EQ(VerifyKernelImage(firmware_key, image2, 0),
           VERIFY_KERNEL_SIGNATURE_FAILED,
           "KernelImage kernel_data Splicing");
   kernel_blob = GetKernelBlob(image2, &len);
   TEST_EQ(VerifyKernel(firmware_key_blob, kernel_blob, 0),
           VERIFY_KERNEL_SIGNATURE_FAILED,
           "Kernel Blob kernel_data Splicing");
 }
 
 int main(int argc, char* argv[])
 {
   int error_code = 0;
   VerifyKernelSplicingTest();
   if (!gTestSuccess)
     error_code = 255;
   return error_code;
 }