diff --git a/buildpush.sh b/buildpush.sh index dbfa5651f..aa71eb5a1 100755 --- a/buildpush.sh +++ b/buildpush.sh @@ -9,6 +9,7 @@ FPGA_IMAGE=../betrusted-soc/build/gateware/encrypted.bin KERNEL_IMAGE=target/riscv32imac-unknown-none-elf/release/xous.img CSR_CSV=../betrusted-soc/build/csr.csv.1 USE_IDENITY=0 +USE_NIGHTLY= POSITIONAL=() while [[ $# -gt 0 ]] @@ -39,6 +40,10 @@ do CSR_CSV=../betrusted-soc/build/csr.csv shift ;; + -n|--nightly) + USE_NIGHTLY=+nightly + shift + ;; -h|--help) echo "$0 provisions betrusted. --kernel-skip skips the kernel, --fpga-skip skips the FPGA. --current-csr indicates to use the CSR for the new FPGA image to do the update (normally you want to use the one corresponding to the older, currently installed version)." echo "Alternatively, using --copy-to copies the files to a remote host and skips provisioning." @@ -62,7 +67,7 @@ DESTDIR=code/precursors # full rebuild, and not just an incremental rebuild. :-/ #touch services/log-server/src/main.rs # bump the build time in the log server -cargo xtask hw-image ../betrusted-soc/build/software/soc.svd +cargo $USE_NIGHTLY xtask hw-image ../betrusted-soc/build/software/soc.svd # only copy if changed, othrewise it seems to trigger extra build effort... rsync -a --no-times --checksum ../betrusted-soc/build/software/soc.svd svd2utra/examples/soc.svd diff --git a/emulation/renode.svd b/emulation/renode.svd index f45d74861..bb4c9e69d 100644 --- a/emulation/renode.svd +++ b/emulation/renode.svd @@ -1320,10 +1320,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x3ea245d3 + 0x14057e44 32 @@ -1340,7 +1340,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 - 0x02 + 0x06 32 @@ -1354,7 +1354,7 @@ beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> GIT_DIRTY 0x001c - 0x00 + 0x01 32 @@ -3030,7 +3030,7 @@ again until the interrupt is serviced.]]> SEED1 0x0000 - 0x59f86187 + 0x4066250a 32 @@ -3045,7 +3045,7 @@ again until the interrupt is serviced.]]> SEED0 0x0004 - 0x5df4998c + 0x7e58e3d5 32 @@ -3064,9 +3064,9 @@ again until the interrupt is serviced.]]> - ROMTEST + KEYROM 0xF0019000 - ROMTEST + KEYROM ADDRESS @@ -4221,10 +4221,79 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> + + RO_HEALTH_MONOBIT + 0x0048 + 0x00 + 32 + + + stat_error + 0 + [0:0] + 0 + + + + missed_sample + 1 + [1:1] + 1 + + + + + + RO_HEALTH_ONES + 0x004c + 0x00 + 32 + + + ones + 31 + [31:0] + 0 + + + + + + RO_HEALTH_SAMPLECOUNT + 0x0050 + 0x40000 + 32 + + + samplecount + 31 + [31:0] + 0 + + + + + + RO_HEALTH_SIGMA + 0x0054 + 0x200 + 32 + + + sigma + 31 + [31:0] + 0 + + + + 0 - 0x48 + 0x58 registers diff --git a/svd2utra/examples/soc.svd b/svd2utra/examples/soc.svd index f45d74861..bb4c9e69d 100644 --- a/svd2utra/examples/soc.svd +++ b/svd2utra/examples/soc.svd @@ -1320,10 +1320,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x3ea245d3 + 0x14057e44 32 @@ -1340,7 +1340,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 - 0x02 + 0x06 32 @@ -1354,7 +1354,7 @@ beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> GIT_DIRTY 0x001c - 0x00 + 0x01 32 @@ -3030,7 +3030,7 @@ again until the interrupt is serviced.]]> SEED1 0x0000 - 0x59f86187 + 0x4066250a 32 @@ -3045,7 +3045,7 @@ again until the interrupt is serviced.]]> SEED0 0x0004 - 0x5df4998c + 0x7e58e3d5 32 @@ -3064,9 +3064,9 @@ again until the interrupt is serviced.]]> - ROMTEST + KEYROM 0xF0019000 - ROMTEST + KEYROM ADDRESS @@ -4221,10 +4221,79 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> + + RO_HEALTH_MONOBIT + 0x0048 + 0x00 + 32 + + + stat_error + 0 + [0:0] + 0 + + + + missed_sample + 1 + [1:1] + 1 + + + + + + RO_HEALTH_ONES + 0x004c + 0x00 + 32 + + + ones + 31 + [31:0] + 0 + + + + + + RO_HEALTH_SAMPLECOUNT + 0x0050 + 0x40000 + 32 + + + samplecount + 31 + [31:0] + 0 + + + + + + RO_HEALTH_SIGMA + 0x0054 + 0x200 + 32 + + + sigma + 31 + [31:0] + 0 + + + + 0 - 0x48 + 0x58 registers diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 50f9d406a..4b288773a 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -79,10 +79,10 @@ fn build_hw_image(debug: bool, svd: Option) -> Result<(), DynError> { let kernel = build_kernel(debug)?; let mut init = vec![]; for pkg in &[ - //"shell", + "shell", //"gam", - "benchmark", - "benchmark-target", + //"benchmark", + //"benchmark-target", "graphics-server", "ticktimer-server", "log-server",