diff --git a/.gitignore b/.gitignore index 219ed2170..4200031e7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ # Emacs *~ + +# local utility shellscripts +update-precursors.sh diff --git a/buildpush.sh b/buildpush.sh index e8324ac86..8ae8497e5 100755 --- a/buildpush.sh +++ b/buildpush.sh @@ -30,9 +30,9 @@ do shift ;; -l|--loader-skip) - UPDATE_LOADER=0 - shift - ;; + UPDATE_LOADER=0 + shift + ;; -c|--copy-to) DEST_HOST=$2 USE_USB=0 @@ -69,9 +69,8 @@ do IMAGE=av-test shift ;; - -s|--socsvd) - OVERRIDE_SVD=$2 - shift + -p|--prebuild) + OVERRIDE_SVD=precursors/soc.svd shift ;; -h|--help) @@ -135,6 +134,10 @@ then fi else + if [ -n "$OVERRIDE_SVD" ] + then + FPGA_IMAGE=precursors/soc_csr.bin + fi if [ -e "$FPGA_IMAGE" ] then md5sum $FPGA_IMAGE @@ -147,10 +150,8 @@ else # there is a private key echo "Copying to $DEST_HOST:$DESTDIR/ with public key $IDENTITY" scp -i $IDENTITY $KERNEL_IMAGE $FPGA_IMAGE $LOADER_IMAGE $DEST_HOST:$DESTDIR/ - # scp -i $IDENTITY $CSR_CSV $DEST_HOST:$DESTDIR/soc-csr.csv else echo "Copying to $DEST_HOST:$DESTDIR/ without public key" scp $KERNEL_IMAGE $FPGA_IMAGE $LOADER_IMAGE $DEST_HOST:$DESTDIR/ - # scp $CSR_CSV $DEST_HOST:$DESTDIR/soc-csr.csv fi fi diff --git a/precursors/soc.svd b/precursors/soc.svd index ebf534784..e565855ee 100644 --- a/precursors/soc.svd +++ b/precursors/soc.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1070,10 +1070,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x4878d3c3 + 0xe820c7eb 32 @@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]> is ``1``, then the repository this was built from has one additional commit beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> 0x0018 - 0x1f + 0x00 32 @@ -1104,7 +1104,7 @@ beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> GIT_DIRTY 0x001c - 0x01 + 0x00 32 @@ -3086,7 +3086,7 @@ inject too fast.]]> SEED1 0x0000 - 0x77083f9a + 0x7da57e92 32 @@ -3101,7 +3101,7 @@ inject too fast.]]> SEED0 0x0004 - 0x9411178 + 0x63e59e7b 32 diff --git a/precursors/soc_csr.bin b/precursors/soc_csr.bin index b6556b613..014a09996 100644 Binary files a/precursors/soc_csr.bin and b/precursors/soc_csr.bin differ