commit 5125a4d6a0e184a8cd3988924b026340a96e3c83
author Vic (Chun-Ju) Yang <victoryang@chromium.org> Fri Apr 18 15:41:48 2014 +0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Apr 18 11:05:39 2014 +0000
tree 44c638755e7d5f4a73baf77385805dddfe64bdfb
parent 12122a6d41d4da5418036254821ce792d019e082

make_netboot: Generate both images for U-boot and Depthcharge

Developers and partners are often confused by how we prepare netboot
kernel for depthcharge. Let's have make_netboot.sh generate it directly.

BUG=None
TEST=make_netboot.sh for Squawks and check the two images.

Change-Id: I24654de756590b8c7daa01a6515235c27b596c42
Signed-off-by: Vic (Chun-Ju) Yang <victoryang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/195554
Reviewed-by: Ricky Liang <jcliang@chromium.org>
Tested-by: Ricky Liang <jcliang@chromium.org>

make_netboot.sh

diff --git a/make_netboot.sh b/make_netboot.sh
index b7cb337..6161cd4 100755
--- a/make_netboot.sh
+++ b/make_netboot.sh
@@ -69,15 +69,17 @@
 emerge_custom_kernel ${temp_build_path}
 
 # Place kernel image under 'netboot'
-echo "Generating netboot kernel vmlinux.uimg"
+echo "Generating netboot kernel vmlinux.uimg/vmlinux.bin"
 if [ "${ARCH}" = "arm" ]; then
   cp "${temp_build_path}"/boot/vmlinux.uimg netboot/
+  cp netboot/vmlinux.uimg netboot/vmlinux.bin
 else
   # U-boot put kernel image at 0x100000. We load it at 0x3000000 because
   # 0x3000000 is safe enough not to overlap with image at 0x100000.
   mkimage -A x86 -O linux -T kernel -n "Linux kernel" -C none \
       -d "${temp_build_path}"/boot/vmlinuz \
       -a 0x03000000 -e 0x03000000 netboot/vmlinux.uimg
+  cp "${temp_build_path}"/boot/vmlinuz netboot/vmlinux.bin
 fi
 
 sudo rm -rf "${temp_build_path}"