Merge "scripts: Add rustfmt presubmit hook script"
diff --git a/download_iree_compiler.py b/download_iree_compiler.py index 7ecae06..43a6baf 100755 --- a/download_iree_compiler.py +++ b/download_iree_compiler.py
@@ -37,7 +37,7 @@ try: wget.download(download_url, out=out_file) break - except urllib.error.HTTPError as e: + except (urllib.error.HTTPError, ConnectionError) as e: if i == num_retries: raise print(f"{e}\nDownload failed. Retrying...")
diff --git a/kgdb.sh b/kgdb.sh index 47af2c0..6f0ab4e 100755 --- a/kgdb.sh +++ b/kgdb.sh
@@ -12,7 +12,7 @@ TARGET=riscv32-unknown-elf GDB="${ROOTDIR}"/cache/toolchain/bin/${TARGET}-gdb -PROGRAM=out/shodan_boot_rom/build-out/multihart_boot_rom/multihart_boot_rom_sim_verilator.elf +PROGRAM=out/shodan_boot_rom/multihart_boot_rom/multihart_boot_rom.elf REMOTE=localhost:3333 KATA_OUT=out/kata/${TARGET}/debug @@ -34,5 +34,6 @@ -ex "set pagination on" \ -ex "target remote ${REMOTE}" \ -ex "monitor cpu0 IsHalted false" \ - -ex "monitor cpu1 CreateSeL4 0xffffffef" \ - -ex "source sim/renode/tools/sel4_extensions/gdbscript.py" + -ex "monitor cpu1 CreateSeL4 0xffffffee" \ + -ex "source sim/renode/tools/sel4_extensions/gdbscript.py" \ + -ex "sel4 symbol-autoswitching false"
diff --git a/python-requirements.txt b/python-requirements.txt index 33538a6..c0e0ae9 100644 --- a/python-requirements.txt +++ b/python-requirements.txt
@@ -1,3 +1,7 @@ +# pin to v4.0.0 since newer pushes are broken +# TODO(jtgans): Remove this pinning once upstream is unborked. +fixtures==4.0.0 + camkes-deps hjson lit @@ -10,6 +14,7 @@ pyyaml requests robotframework==4.0.1 +scipy sel4-deps setuptools tempita
diff --git a/run-spike-springbok.sh b/run-spike-springbok.sh index 50a8a75..32d0ef8 100755 --- a/run-spike-springbok.sh +++ b/run-spike-springbok.sh
@@ -17,9 +17,9 @@ fi # spike CLI options: -# -m<a:m,b:n>: specifies the memory layout. Springbok currently has 1MB IMEM at -# 0x3200_0000 and 16MB DMEM at 0x3400_0000 +# -m<a:m,b:n>: specifies the memory layout. Springbok currently has 16MB TCM +# at 0x3400_0000 # --varch: specifies the v-ext configuration w.r.t. vlen and elen. # --pc: ELF entry point. Set at the beginning of IMEM. -"${OUT}/host/spike/bin/spike" -m0x32000000:0x100000,0x34000000:0x1000000 \ - --varch=vlen:512,elen:32 --pc=0x32000000 $@ +"${OUT}/host/spike/bin/spike" -m0x34000000:0x1000000 \ + --varch=vlen:512,elen:32 --pc=0x34000000 $@