commit a SoC version for pre-build

should show up as version 0.8 but probably a bug in the gitver
on the soc side, will chase that down later
This commit is contained in:
bunnie 2021-04-27 19:30:49 +08:00
parent 39eb916297
commit 9ec1de4c01
4 changed files with 19 additions and 15 deletions

3
.gitignore vendored
View file

@ -8,3 +8,6 @@
# Emacs # Emacs
*~ *~
# local utility shellscripts
update-precursors.sh

View file

@ -30,9 +30,9 @@ do
shift shift
;; ;;
-l|--loader-skip) -l|--loader-skip)
UPDATE_LOADER=0 UPDATE_LOADER=0
shift shift
;; ;;
-c|--copy-to) -c|--copy-to)
DEST_HOST=$2 DEST_HOST=$2
USE_USB=0 USE_USB=0
@ -69,9 +69,8 @@ do
IMAGE=av-test IMAGE=av-test
shift shift
;; ;;
-s|--socsvd) -p|--prebuild)
OVERRIDE_SVD=$2 OVERRIDE_SVD=precursors/soc.svd
shift
shift shift
;; ;;
-h|--help) -h|--help)
@ -135,6 +134,10 @@ then
fi fi
else else
if [ -n "$OVERRIDE_SVD" ]
then
FPGA_IMAGE=precursors/soc_csr.bin
fi
if [ -e "$FPGA_IMAGE" ] if [ -e "$FPGA_IMAGE" ]
then then
md5sum $FPGA_IMAGE md5sum $FPGA_IMAGE
@ -147,10 +150,8 @@ else
# there is a private key # there is a private key
echo "Copying to $DEST_HOST:$DESTDIR/ with public key $IDENTITY" 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 $KERNEL_IMAGE $FPGA_IMAGE $LOADER_IMAGE $DEST_HOST:$DESTDIR/
# scp -i $IDENTITY $CSR_CSV $DEST_HOST:$DESTDIR/soc-csr.csv
else else
echo "Copying to $DEST_HOST:$DESTDIR/ without public key" echo "Copying to $DEST_HOST:$DESTDIR/ without public key"
scp $KERNEL_IMAGE $FPGA_IMAGE $LOADER_IMAGE $DEST_HOST:$DESTDIR/ scp $KERNEL_IMAGE $FPGA_IMAGE $LOADER_IMAGE $DEST_HOST:$DESTDIR/
# scp $CSR_CSV $DEST_HOST:$DESTDIR/soc-csr.csv
fi fi
fi fi

View file

@ -3,7 +3,7 @@
<device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" > <device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" >
<vendor>litex</vendor> <vendor>litex</vendor>
<name>SOC</name> <name>SOC</name>
<description><![CDATA[Litex SoC 2021-04-27 00:24:37]]></description> <description><![CDATA[Litex SoC 2021-04-27 19:11:31]]></description>
<addressUnitBits>8</addressUnitBits> <addressUnitBits>8</addressUnitBits>
<width>32</width> <width>32</width>
@ -1070,10 +1070,10 @@ register to disable individual events.]]></description>
<register> <register>
<name>GIT_GITREV</name> <name>GIT_GITREV</name>
<description><![CDATA[First 32-bits of the git revision. This documentation was built from git rev <description><![CDATA[First 32-bits of the git revision. This documentation was built from git rev
``4878d3c3``, so this value is 1215878083, which should be enough to check out ``e820c7eb``, so this value is 3894462443, which should be enough to check out
the exact git version used to build this firmware.]]></description> the exact git version used to build this firmware.]]></description>
<addressOffset>0x0014</addressOffset> <addressOffset>0x0014</addressOffset>
<resetValue>0x4878d3c3</resetValue> <resetValue>0xe820c7eb</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]></description>
is ``1``, then the repository this was built from has one additional commit is ``1``, then the repository this was built from has one additional commit
beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description> beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description>
<addressOffset>0x0018</addressOffset> <addressOffset>0x0018</addressOffset>
<resetValue>0x1f</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -1104,7 +1104,7 @@ beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description>
<register> <register>
<name>GIT_DIRTY</name> <name>GIT_DIRTY</name>
<addressOffset>0x001c</addressOffset> <addressOffset>0x001c</addressOffset>
<resetValue>0x01</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -3086,7 +3086,7 @@ inject too fast.]]></description>
<name>SEED1</name> <name>SEED1</name>
<description><![CDATA[Bits 32-63 of `SEED_SEED`. Seed used for the build]]></description> <description><![CDATA[Bits 32-63 of `SEED_SEED`. Seed used for the build]]></description>
<addressOffset>0x0000</addressOffset> <addressOffset>0x0000</addressOffset>
<resetValue>0x77083f9a</resetValue> <resetValue>0x7da57e92</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -3101,7 +3101,7 @@ inject too fast.]]></description>
<name>SEED0</name> <name>SEED0</name>
<description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description> <description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description>
<addressOffset>0x0004</addressOffset> <addressOffset>0x0004</addressOffset>
<resetValue>0x9411178</resetValue> <resetValue>0x63e59e7b</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>

Binary file not shown.