commit 5deb67f22507481cf5cb8f991976a9969fa90a22
author Bill Richardson <wfrichar@chromium.org> Fri Jul 23 17:22:25 2010 -0700
committer Bill Richardson <wfrichar@chromium.org> Fri Jul 23 17:22:25 2010 -0700
tree 840e532476dac2596488f4e3221bf6f97924e8e0
parent e272940ec513ec00c295aecdfb6e799c07261d90

Make LoadKernel() pass back the kernel partition's UniqueGuid.

LoadKernel already returns the partition number for the selected kernel.
This change makes it also return the GPT Entry's UniqueGuid, which will
eventually be passed to the kernel itself, so the kernel can determine which
of several possible devices it has booted from. It doesn't know for certain
because the BIOS and the kernel may enumerate the devices in a different
order.

BUG=chromium-os:4984

Review URL: http://codereview.chromium.org/3056014

firmware/lib/vboot_kernel.c

diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c
index c045380..0420f25 100644
--- a/firmware/lib/vboot_kernel.c
+++ b/firmware/lib/vboot_kernel.c
@@ -10,12 +10,12 @@
 
 #include "boot_device.h"
 #include "cgptlib.h"
+#include "cgptlib_internal.h"
 #include "load_kernel_fw.h"
 #include "rollback_index.h"
 #include "utility.h"
 #include "vboot_common.h"
 
-
 #define KBUF_SIZE 65536  /* Bytes to read at start of kernel partition */
 
 
@@ -131,7 +131,6 @@
 
   /* Sanity Checks */
   if (!params ||
-      !params->header_sign_key_blob ||
       !params->bytes_per_lba ||
       !params->ending_lba ||
       !params->kernel_buffer ||
@@ -350,6 +349,7 @@
        * Adjust here, until cgptlib is fixed. */
       good_partition = gpt.current_kernel + 1;
       params->partition_number = gpt.current_kernel + 1;
+      GetCurrentKernelUniqueGuid(&gpt, &params->partition_guid);
       params->bootloader_address = preamble->bootloader_address;
       params->bootloader_size = preamble->bootloader_size;
       /* If we're in developer or recovery mode, there's no rollback