From 33e9017478ebe3181ca5d882ad44ef779a6ef563 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Sat, 20 Jul 2013 16:25:01 -0700
Subject: [PATCH] fix(cros_make_image_bootable): no more bootkernel

the bootkernel is going away and we will just have a single kernel for
all of the things. This is because of the kxec on xen problem.
---
 bin/cros_make_image_bootable | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/cros_make_image_bootable b/bin/cros_make_image_bootable
index bde3c549d4..386ef38604 100755
--- a/bin/cros_make_image_bootable
+++ b/bin/cros_make_image_bootable
@@ -240,12 +240,13 @@ make_image_bootable() {
   esp_size=$((esp_size * 512))  # sectors to bytes
   local bootloader_to_flags="--to_offset=${esp_offset} --to_size=${esp_size}"
 
-  # Update partition 12
+  # Update ESP partition
+  # NOTE: Boot kernel is identical to regular kernel for now
   ${SCRIPTS_DIR}/update_bootloaders.sh \
     --arch=${FLAGS_arch} \
     --to="${bootloader_to}" \
     --from="${FLAGS_rootfs_mountpoint}"/boot \
-    --vmlinuz_boot_kernel="${FLAGS_rootfs_mountpoint}"/boot/vmlinuz-boot_kernel \
+    --vmlinuz_boot_kernel="${FLAGS_rootfs_mountpoint}"/boot/vmlinuz \
     --vmlinuz="${FLAGS_rootfs_mountpoint}"/boot/vmlinuz \
     ${bootloader_to_flags}