M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-19 08:26:30 +08:00
Code Issues Projects Releases Wiki Activity

Updated EEM FMC Carrier support for v1.1

Browse Source 
Signed-off-by: Mikołaj Sowiński <mikolaj.sowinski@rd.technosystem.pl>
This commit is contained in:
Mikołaj Sowiński 2024-05-13 16:21:52 +02:00 committed by Sébastien Bourdeauducq
parent 7dff78e849
commit 16e4b616ca
3 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
artiq/firmware/satman/main.rs
View File

@ -669,6 +669,20 @@ pub extern fn main() -> i32 {
let mut io_expander; let mut io_expander;
#[cfg(soc_platform = "efc")] #[cfg(soc_platform = "efc")]
{ {
let p3v3_fmc_en_pin;
let vadj_fmc_en_pin;
#[cfg(hw_rev = "v1.0")]
{
p3v3_fmc_en_pin = 0;
vadj_fmc_en_pin = 1;
}
#[cfg(hw_rev = "v1.1")]
{
p3v3_fmc_en_pin = 1;
vadj_fmc_en_pin = 7;
}
io_expander = board_misoc::io_expander::IoExpander::new().unwrap(); io_expander = board_misoc::io_expander::IoExpander::new().unwrap();
io_expander.init().expect("I2C I/O expander initialization failed"); io_expander.init().expect("I2C I/O expander initialization failed");
@ -676,10 +690,10 @@ pub extern fn main() -> i32 {
io_expander.set_oe(0, 1 << 5 | 1 << 6 | 1 << 7).unwrap(); io_expander.set_oe(0, 1 << 5 | 1 << 6 | 1 << 7).unwrap();
// Enable VADJ and P3V3_FMC // Enable VADJ and P3V3_FMC
io_expander.set_oe(1, 1 << 0 | 1 << 1).unwrap(); io_expander.set_oe(1, 1 << p3v3_fmc_en_pin | 1 << vadj_fmc_en_pin).unwrap();
io_expander.set(1, 0, true); io_expander.set(1, p3v3_fmc_en_pin, true);
io_expander.set(1, 1, true); io_expander.set(1, vadj_fmc_en_pin, true);
io_expander.service().unwrap(); io_expander.service().unwrap();
} }
@ -812,6 +826,20 @@ pub extern fn main() -> i32 {
#[cfg(soc_platform = "efc")] #[cfg(soc_platform = "efc")]
fn enable_error_led() { fn enable_error_led() {
let p3v3_fmc_en_pin;
let vadj_fmc_en_pin;
#[cfg(hw_rev = "v1.0")]
{
p3v3_fmc_en_pin = 0;
vadj_fmc_en_pin = 1;
}
#[cfg(hw_rev = "v1.1")]
{
p3v3_fmc_en_pin = 1;
vadj_fmc_en_pin = 7;
}
let mut io_expander = board_misoc::io_expander::IoExpander::new().unwrap(); let mut io_expander = board_misoc::io_expander::IoExpander::new().unwrap();
// Keep LEDs enabled // Keep LEDs enabled
@ -820,10 +848,10 @@ fn enable_error_led() {
io_expander.set(0, 7, true); io_expander.set(0, 7, true);
// Keep VADJ and P3V3_FMC enabled // Keep VADJ and P3V3_FMC enabled
io_expander.set_oe(1, 1 << 0 | 1 << 1).unwrap(); io_expander.set_oe(1, 1 << p3v3_fmc_en_pin | 1 << vadj_fmc_en_pin).unwrap();
io_expander.set(1, 0, true); io_expander.set(1, p3v3_fmc_en_pin, true);
io_expander.set(1, 1, true); io_expander.set(1, vadj_fmc_en_pin, true);
io_expander.service().unwrap(); io_expander.service().unwrap();
} }

15
artiq/frontend/artiq_flash.py
View File

@ -261,12 +261,19 @@ def main():
"storage": ("spi0", 0x440000), "storage": ("spi0", 0x440000),
"firmware": ("spi0", 0x450000), "firmware": ("spi0", 0x450000),
}, },
"efc": { "efc1v0": {
"programmer": partial(ProgrammerXC7, board="efc", proxy="bscan_spi_xc7a100t.bit"), "programmer": partial(ProgrammerXC7, board="efc", proxy="bscan_spi_xc7a100t.bit"),
"gateware": ("spi0", 0x000000), "gateware": ("spi0", 0x000000),
"bootloader": ("spi0", 0x400000), "bootloader": ("spi0", 0x600000),
"storage": ("spi0", 0x440000), "storage": ("spi0", 0x640000),
"firmware": ("spi0", 0x450000), "firmware": ("spi0", 0x650000),
},
"efc1v1": {
"programmer": partial(ProgrammerXC7, board="efc", proxy="bscan_spi_xc7a200t.bit"),
"gateware": ("spi0", 0x000000),
"bootloader": ("spi0", 0x600000),
"storage": ("spi0", 0x640000),
"firmware": ("spi0", 0x650000),
}, },
"kc705": { "kc705": {
"programmer": partial(ProgrammerXC7, board="kc705", proxy="bscan_spi_xc7k325t.bit"), "programmer": partial(ProgrammerXC7, board="kc705", proxy="bscan_spi_xc7k325t.bit"),

6
artiq/gateware/targets/efc.py
View File

@ -29,9 +29,10 @@ class Satellite(BaseSoC, AMPSoC):
} }
mem_map.update(BaseSoC.mem_map) mem_map.update(BaseSoC.mem_map)
def __init__(self, gateware_identifier_str=None, **kwargs): def __init__(self, gateware_identifier_str=None, hw_rev="v1.1", **kwargs):
BaseSoC.__init__(self, BaseSoC.__init__(self,
cpu_type="vexriscv", cpu_type="vexriscv",
hw_rev=hw_rev,
cpu_bus_width=64, cpu_bus_width=64,
sdram_controller_type="minicon", sdram_controller_type="minicon",
l2_size=128*1024, l2_size=128*1024,
@ -243,12 +244,15 @@ def main():
builder_args(parser) builder_args(parser)
parser.set_defaults(output_dir="artiq_efc") parser.set_defaults(output_dir="artiq_efc")
parser.add_argument("-V", "--variant", default="shuttler") parser.add_argument("-V", "--variant", default="shuttler")
parser.add_argument("--hw-rev", choices=["v1.0", "v1.1"], default="v1.1",
help="Hardware revision")
parser.add_argument("--gateware-identifier-str", default=None, parser.add_argument("--gateware-identifier-str", default=None,
help="Override ROM identifier") help="Override ROM identifier")
args = parser.parse_args() args = parser.parse_args()
argdict = dict() argdict = dict()
argdict["gateware_identifier_str"] = args.gateware_identifier_str argdict["gateware_identifier_str"] = args.gateware_identifier_str
argdict["hw_rev"] = args.hw_rev
soc = Satellite(**argdict) soc = Satellite(**argdict)
build_artiq_soc(soc, builder_argdict(args)) build_artiq_soc(soc, builder_argdict(args))