Set default firmware dir and only wait for fel in stage 1

This commit is contained in:
Wynter Woods 2015-12-02 16:33:52 -08:00
parent bd2a3956e2
commit 76f4a4c29f
1 changed files with 12 additions and 12 deletions

View File

@ -59,6 +59,7 @@ while true; do
esac esac
done done
BUILDROOT_OUTPUT_DIR="${BUILDROOT_OUTPUT_DIR:-$(pwd)/.firmware}"
echo "BUILDROOT_OUTPUT_DIR = $BUILDROOT_OUTPUT_DIR" echo "BUILDROOT_OUTPUT_DIR = $BUILDROOT_OUTPUT_DIR"
if ${RUN_ALL_STAGES}; then if ${RUN_ALL_STAGES}; then
@ -97,7 +98,7 @@ SPARSE_UBI="${TMPDIR}/rootfs.ubi.sparse"
UBI_MEM_ADDR=0x4b000000 UBI_MEM_ADDR=0x4b000000
echo "Temporary directory: ${TMPDIR}" echo "Temporary directory: ${TMPDIR}"
if [ ! -d "$TMPDIR" ]; then if [ ! -d "${TMPDIR}" ]; then
echo "Making directory: ${TMPDIR}" echo "Making directory: ${TMPDIR}"
mkdir -p "${TMPDIR}" mkdir -p "${TMPDIR}"
fi fi
@ -188,22 +189,21 @@ assert_error() {
fi fi
} }
echo == preparing images ==
prepare_images
prepare_uboot_script
echo == upload the SPL to SRAM and execute it ==
if ! wait_for_fel; then
echo "ERROR: please make sure CHIP is connected and jumpered in FEL mode"
fi
if ${stage[0]}; then if ${stage[0]}; then
echo == preparing images ==
prepare_images
prepare_uboot_script
echo == upload the SPL to SRAM and execute it ==
if ! wait_for_fel; then
echo "ERROR: please make sure CHIP is connected and jumpered in FEL mode"
fi
${FEL} spl "${SPL}" ${FEL} spl "${SPL}"
assert_error 128 assert_error 128
sleep 1 # wait for DRAM initialization to complete
fi fi
sleep 1 # wait for DRAM initialization to complete
if ${stage[1]}; then if ${stage[1]}; then
echo == upload spl == echo == upload spl ==