From 7c4328a65f87b2a7fd1b4a7dc0e8090561f4b408 Mon Sep 17 00:00:00 2001 From: Grant Grundler Date: Wed, 22 Jun 2011 10:24:42 -0700 Subject: [PATCH] Fix ARM generic build: no u-boot/legacy_image.bin built Additional fix needed on top of nsanders commit from yesterday: http://gerrit.chromium.org/gerrit/#change,2028 ARM generic doesn't build chromeos-u-boot and thus has no u-boot directory in the $SYSROOT. BUG=chromium-os:16833 TEST=archive_build.sh Change-Id: Ic8422419779dca1965c6832a4a0bd73078945e69 Signed-off-by: Grant Grundler Reviewed-on: http://gerrit.chromium.org/gerrit/3001 Reviewed-by: Anton Staaf Reviewed-by: Nick Sanders --- make_netboot.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/make_netboot.sh b/make_netboot.sh index 479145c173..890a8cc046 100755 --- a/make_netboot.sh +++ b/make_netboot.sh @@ -71,10 +71,16 @@ echo "Generating netboot kernel vmlinux.uimg" cp "${SYSROOT}/boot/vmlinux.uimg" "netboot" # Get netboot firmware. -echo "Generating netboot firmware" # TODO(nsanders): Set default IP here when userspace # env modification is available. -cp "${SYSROOT}/u-boot/legacy_image.bin" "netboot" +# TODO(nsanders): ARM generic doesn't build chromeos-u-boot package. +# When ARM generic goes away, delete the test. +if [ -r "${SYSROOT}/u-boot/legacy_image.bin" ] + echo "Copying netboot firmware legacy_image.bin" + cp "${SYSROOT}/u-boot/legacy_image.bin" "netboot" +else + echo "Skipping: ${SYSROOT}/u-boot/legacy_image.bin firmware not present?" +fi # Prepare to mount rootfs. umount_loop() {