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

src/platform/vboot_reference/tests/test_common.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.
  *
  * Common functions used by tests.
  */
 
 #include "test_common.h"
 
 #include <stdio.h>
@@ skipping 142 matching lines @@
          RSAProcessedKeySize(image->kernel_sign_algorithm));
 
   /* Update correct header length. */
   image->header_len = GetKernelHeaderLen(image);
 
   /* Calculate SHA-512 digest on header and populate header_checksum. */
   CalculateKernelHeaderChecksum(image, image->header_checksum);
 
   /* Populate kernel options and data with dummy data. */
   image->kernel_version = kernel_version;
-  image->options.version[0] = 1;
-  image->options.version[1] = 0;
-  Memset(image->options.cmd_line, 0, sizeof(image->options.cmd_line));
-  image->options.kernel_len = kernel_len;
-  image->options.kernel_load_addr = 0;
-  image->options.kernel_entry_addr = 0;
+  Memset(image->kernel_config, 0, sizeof(image->kernel_config));
+  image->kernel_len = kernel_len;
   image->kernel_key_signature = image->kernel_signature = NULL;
   image->kernel_data = Malloc(kernel_len);
   Memset(image->kernel_data, kernel_data_fill_char, kernel_len);
 
   /* Generate and populate signatures. */
   if (!AddKernelKeySignature(image, firmware_key_file)) {
     debug("Couldn't create key signature.\n");
     KernelImageFree(image);
     return NULL;
   }
@@ skipping 51 matching lines @@
                                  kernel_key_version,
                                  kernel_version,
                                  1,  /* kernel length. */
                                  "testkeys/key_rsa1024.pem",
                                  "testkeys/key_rsa1024.pem",
                                  'K');
  if (!image)
    return NULL;
  if (is_corrupt) {
    /* Invalidate image. */
-   Memset(image->kernel_data, 'X', image->options.kernel_len);
+   Memset(image->kernel_data, 'X', image->kernel_len);
  }
  kernel_blob = GetKernelBlob(image, &len);
  KernelImageFree(image);
  return kernel_blob;
 }