mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
Merge branch 'main' of github.com:betrusted-io/xous-core into rename-args.bin
This commit is contained in:
Sean Cross
commit
5624dedfef
9 changed files with 6111 additions and 25 deletions
|
|
@ -532,15 +532,7 @@ mod implementation {
|
|||
unsafe {
|
||||
core::arch::asm!(
|
||||
".word 0x500F",
|
||||
"nop",
|
||||
"nop",
|
||||
"nop",
|
||||
"nop",
|
||||
"fence",
|
||||
"nop",
|
||||
"nop",
|
||||
"nop",
|
||||
"nop",
|
||||
);
|
||||
}
|
||||
// augment with manual flushing, because the above instruction didn't seem to do the trick??
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ std = []
|
|||
#
|
||||
# Maintainer note: add checks in build.rs to ensure only one is selected.
|
||||
precursor-c809403 = []
|
||||
precursor-6156e49 = []
|
||||
precursor-a0912d6 = []
|
||||
precursor-c809403-perflib = []
|
||||
precursor-2753c12-dvt = []
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ fn main() {
|
|||
allow_single_target_feature!("precursor", "hosted", "renode");
|
||||
|
||||
#[cfg(feature="precursor")]
|
||||
allow_single_gitrev_feature!("precursor-c809403", "precursor-c809403-perflib", "precursor-2753c12-dvt", "precursor-6156e49");
|
||||
allow_single_gitrev_feature!("precursor-c809403", "precursor-c809403-perflib", "precursor-2753c12-dvt", "precursor-a0912d6");
|
||||
|
||||
// ----- select an SVD file based on a specific revision -----
|
||||
#[cfg(feature="precursor-c809403")]
|
||||
|
|
@ -79,10 +79,10 @@ fn main() {
|
|||
#[cfg(feature="precursor-c809403")]
|
||||
let generated_filename = "src/generated/precursor_c809403.rs";
|
||||
|
||||
#[cfg(feature="precursor-6156e49")]
|
||||
let svd_filename = "precursor/soc-6156e49.svd";
|
||||
#[cfg(feature="precursor-6156e49")]
|
||||
let generated_filename = "src/generated/precursor_6156e49.rs";
|
||||
#[cfg(feature="precursor-a0912d6")]
|
||||
let svd_filename = "precursor/soc-a0912d6.svd";
|
||||
#[cfg(feature="precursor-a0912d6")]
|
||||
let generated_filename = "src/generated/precursor_a0912d6.rs";
|
||||
|
||||
#[cfg(feature="precursor-c809403-perflib")]
|
||||
let svd_filename = "precursor/soc-perf-c809403.svd";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" >
|
||||
<vendor>litex</vendor>
|
||||
<name>SOC</name>
|
||||
<description><![CDATA[Litex SoC 2022-10-20 03:52:03]]></description>
|
||||
<description><![CDATA[Litex SoC 2022-10-20 04:39:22]]></description>
|
||||
|
||||
<addressUnitBits>8</addressUnitBits>
|
||||
<width>32</width>
|
||||
|
|
@ -1222,10 +1222,10 @@ register to disable individual events.]]></description>
|
|||
<register>
|
||||
<name>GIT_GITREV</name>
|
||||
<description><![CDATA[First 32-bits of the git revision. This documentation was built from git rev
|
||||
``6156e490``, so this value is 1633084560, which should be enough to check out
|
||||
``a0912d6d``, so this value is 2693868909, which should be enough to check out
|
||||
the exact git version used to build this firmware.]]></description>
|
||||
<addressOffset>0x0014</addressOffset>
|
||||
<resetValue>0x6156e490</resetValue>
|
||||
<resetValue>0xa0912d6d</resetValue>
|
||||
<size>32</size>
|
||||
<fields>
|
||||
<field>
|
||||
|
|
@ -1242,7 +1242,7 @@ the exact git version used to build this firmware.]]></description>
|
|||
is ``1``, then the repository this was built from has one additional commit
|
||||
beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description>
|
||||
<addressOffset>0x0018</addressOffset>
|
||||
<resetValue>0x01</resetValue>
|
||||
<resetValue>0x02</resetValue>
|
||||
<size>32</size>
|
||||
<fields>
|
||||
<field>
|
||||
|
|
@ -3577,7 +3577,7 @@ inject too fast.]]></description>
|
|||
<name>SEED1</name>
|
||||
<description><![CDATA[Bits 32-63 of `SEED_SEED`. Seed used for the build]]></description>
|
||||
<addressOffset>0x0000</addressOffset>
|
||||
<resetValue>0x4e6643ce</resetValue>
|
||||
<resetValue>0x6a8d93c4</resetValue>
|
||||
<size>32</size>
|
||||
<fields>
|
||||
<field>
|
||||
|
|
@ -3592,7 +3592,7 @@ inject too fast.]]></description>
|
|||
<name>SEED0</name>
|
||||
<description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description>
|
||||
<addressOffset>0x0004</addressOffset>
|
||||
<resetValue>0x4632a022</resetValue>
|
||||
<resetValue>0x239e72de</resetValue>
|
||||
<size>32</size>
|
||||
<fields>
|
||||
<field>
|
||||
Binary file not shown.
BIN
utralib/precursor/soc_csr-a0912d6.bin
Normal file
BIN
utralib/precursor/soc_csr-a0912d6.bin
Normal file
Binary file not shown.
|
|
@ -6,10 +6,10 @@ mod precursor_c809403;
|
|||
#[cfg(feature="precursor-c809403")]
|
||||
pub use precursor_c809403::*;
|
||||
|
||||
#[cfg(feature="precursor-6156e49")]
|
||||
mod precursor_6156e49;
|
||||
#[cfg(feature="precursor-6156e49")]
|
||||
pub use precursor_6156e49::*;
|
||||
#[cfg(feature="precursor-a0912d6")]
|
||||
mod precursor_a0912d6;
|
||||
#[cfg(feature="precursor-a0912d6")]
|
||||
pub use precursor_a0912d6::*;
|
||||
|
||||
#[cfg(feature="precursor-c809403-perflib")]
|
||||
mod precursor_perf_c809403;
|
||||
|
|
|
|||
6094
utralib/src/generated/precursor_a0912d6.rs
Normal file
6094
utralib/src/generated/precursor_a0912d6.rs
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -12,7 +12,7 @@ use std::env;
|
|||
|
||||
/// gitrev of the current precursor SoC version targeted by this build. This must
|
||||
/// be manually updated every time the SoC version is bumped.
|
||||
const PRECURSOR_SOC_VERSION: &str = "6156e49";
|
||||
const PRECURSOR_SOC_VERSION: &str = "a0912d6";
|
||||
|
||||
/*
|
||||
Some notes on kernel versions versus backups.
|
||||
|
|
|
|||
Loading…
Reference in a new issue