make_netboot: Fix path to netboot firmware

Now that netboot firmware is named 'nv_image-xxx.bin', let's change it
in make_netboot.sh.

Also, update_firmware_vars.py is already included in factory_setup.
There is no need to copy it to factory_shim. Remove it.

BUG=chrome-os-partner:17471
TEST=Run make_netboot and see nv_image copied.

Change-Id: I513c0377d63e2088b36275ab79ea06c6652e4bb4
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/42093
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
This commit is contained in:
Vic Yang 2013-01-27 16:00:11 +08:00 committed by ChromeBot
parent 61772d46aa
commit e72689e500

View File

@ -58,12 +58,12 @@ mkdir -p netboot
# env modification is available.
# TODO(nsanders): ARM generic doesn't build chromeos-u-boot package.
# When ARM generic goes away, delete the test.
if [ -r "${SYSROOT}/firmware/legacy_image.bin" ]; then
echo "Copying netboot firmware legacy_image.bin"
cp "${SYSROOT}/firmware/legacy_image.bin" "netboot"
cp "${GCLIENT_ROOT}/chroot/usr/bin/update_firmware_vars.py" "netboot"
if ls "${SYSROOT}"/firmware/nv_image-*.bin >/dev/null 2>&1; then
echo "Copying netboot firmware nv_image-*.bin"
cp -v "${SYSROOT}"/firmware/nv_image-*.bin "netboot"
else
echo "Skipping legacy fw: ${SYSROOT}/firmware/legacy_image.bin not present?"
echo "Skipping netboot firmware: " \
"${SYSROOT}/firmware/nv_image-*.bin not present?"
fi
# Prepare to mount rootfs.