cw
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sync with zc706 repos

This commit is contained in:
Sebastien Bourdeauducq 2020-04-28 19:46:33 +08:00
parent b123e15b3c
commit 22531b14c0
6 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -150,7 +150,7 @@ dependencies = [
[[package]] [[package]]
name = "libasync" name = "libasync"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#614b1ef350edd8576fc71292fc89cf79a1810aba" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#83ff37e10e721c436246fbf4a945af9516121d00"
dependencies = [ dependencies = [
"embedded-hal", "embedded-hal",
"libcortex_a9", "libcortex_a9",
@ -162,7 +162,7 @@ dependencies = [
[[package]] [[package]]
name = "libboard_zynq" name = "libboard_zynq"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#614b1ef350edd8576fc71292fc89cf79a1810aba" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#83ff37e10e721c436246fbf4a945af9516121d00"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"embedded-hal", "embedded-hal",
@ -177,7 +177,7 @@ dependencies = [
[[package]] [[package]]
name = "libcortex_a9" name = "libcortex_a9"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#614b1ef350edd8576fc71292fc89cf79a1810aba" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#83ff37e10e721c436246fbf4a945af9516121d00"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"libregister", "libregister",
@ -186,7 +186,7 @@ dependencies = [
[[package]] [[package]]
name = "libregister" name = "libregister"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#614b1ef350edd8576fc71292fc89cf79a1810aba" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#83ff37e10e721c436246fbf4a945af9516121d00"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"vcell", "vcell",
@ -196,7 +196,7 @@ dependencies = [
[[package]] [[package]]
name = "libsupport_zynq" name = "libsupport_zynq"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#614b1ef350edd8576fc71292fc89cf79a1810aba" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#83ff37e10e721c436246fbf4a945af9516121d00"
dependencies = [ dependencies = [
"compiler_builtins", "compiler_builtins",
"libboard_zynq", "libboard_zynq",

49
runtime/link.x
View File

@ -1,8 +1,5 @@
ENTRY(_boot_cores); ENTRY(_boot_cores);
STACK_SIZE = 0x8000;
HEAP_SIZE = 0x1000000;
/* Provide some defaults */ /* Provide some defaults */
PROVIDE(Reset = _boot_cores); PROVIDE(Reset = _boot_cores);
PROVIDE(UndefinedInstruction = Reset); PROVIDE(UndefinedInstruction = Reset);
@ -15,7 +12,7 @@ PROVIDE(FIQ = Reset);
MEMORY MEMORY
{ {
SDRAM : ORIGIN = 0x00100000, LENGTH = 0x1FF00000 SDRAM : ORIGIN = 0x00100000, LENGTH = 0x1FF00000
} }
SECTIONS SECTIONS
@ -37,35 +34,41 @@ SECTIONS
*(.data .data.*); *(.data .data.*);
} > SDRAM } > SDRAM
.bss (NOLOAD) : ALIGN(0x4000) .bss (NOLOAD) : ALIGN(4)
{ {
/* Aligned to 16 kB */ __bss_start = .;
KEEP(*(.bss.l1_table)); KEEP(*(.bss.l1_table));
*(.bss .bss.*); *(.bss .bss.*);
. = ALIGN(4); . = ALIGN(4);
__bss_end = .;
} > SDRAM } > SDRAM
__bss_start = ADDR(.bss);
__bss_end = ADDR(.bss) + SIZEOF(.bss);
.heap (NOLOAD) : ALIGN(0x1000) .heap (NOLOAD) : ALIGN(8)
{ {
. += HEAP_SIZE; __heap_start = .;
. += 0x1000000;
__heap_end = .;
} > SDRAM } > SDRAM
__heap_start = ADDR(.heap);
__heap_end = ADDR(.heap) + SIZEOF(.heap);
.stack (NOLOAD) : ALIGN(0x1000) .stack1 (NOLOAD) : ALIGN(8)
{ {
. += STACK_SIZE; __stack1_end = .;
. += 0x1000000;
__stack1_start = .;
} > SDRAM } > SDRAM
__stack_end = ADDR(.stack);
__stack_start = ADDR(.stack) + SIZEOF(.stack);
/DISCARD/ : .stack0 (NOLOAD) : ALIGN(8)
{ {
/* Unused exception related info that only wastes space */ __stack0_end = .;
*(.ARM.exidx); . += 0x1000000;
*(.ARM.exidx.*); __stack0_start = .;
*(.ARM.extab.*); } > SDRAM
}
/DISCARD/ :
{
/* Unused exception related info that only wastes space */
*(.ARM.exidx);
*(.ARM.exidx.*);
*(.ARM.extab.*);
}
} }

2
runtime/src/comms.rs
View File

@ -194,7 +194,7 @@ pub fn main(timer: GlobalTimer) {
Sockets::init(32); Sockets::init(32);
let control: Rc<RefCell<kernel::Control>> = Rc::new(RefCell::new(kernel::Control::start(8192))); let control: Rc<RefCell<kernel::Control>> = Rc::new(RefCell::new(kernel::Control::start()));
task::spawn(async move { task::spawn(async move {
loop { loop {
let stream = TcpStream::accept(1381, 2048, 2048).await.unwrap(); let stream = TcpStream::accept(1381, 2048, 2048).await.unwrap();

7
runtime/src/kernel.rs
View File

@ -21,15 +21,14 @@ static CHANNEL_0TO1: Mutex<Option<sync_channel::Receiver<Message>>> = Mutex::new
static CHANNEL_1TO0: Mutex<Option<sync_channel::Sender<Message>>> = Mutex::new(None); static CHANNEL_1TO0: Mutex<Option<sync_channel::Sender<Message>>> = Mutex::new(None);
pub struct Control { pub struct Control {
core1: Core1<Vec<u32>>, core1: Core1,
pub tx: sync_channel::Sender<Message>, pub tx: sync_channel::Sender<Message>,
pub rx: sync_channel::Receiver<Message>, pub rx: sync_channel::Receiver<Message>,
} }
impl Control { impl Control {
pub fn start(stack_size: usize) -> Self { pub fn start() -> Self {
let stack = vec![0; stack_size / 4]; let core1 = Core1::start();
let core1 = Core1::start(stack);
let (core0_tx, core1_rx) = sync_channel(4); let (core0_tx, core1_rx) = sync_channel(4);
let (core1_tx, core0_rx) = sync_channel(4); let (core1_tx, core0_rx) = sync_channel(4);

45
szl/link.x
View File

@ -1,7 +1,5 @@
ENTRY(_boot_cores); ENTRY(_boot_cores);
STACK_SIZE = 0x8000;
/* Provide some defaults */ /* Provide some defaults */
PROVIDE(Reset = _boot_cores); PROVIDE(Reset = _boot_cores);
PROVIDE(UndefinedInstruction = Reset); PROVIDE(UndefinedInstruction = Reset);
@ -14,9 +12,9 @@ PROVIDE(FIQ = Reset);
MEMORY MEMORY
{ {
/* 256 kB On-Chip Memory */ /* 256 kB On-Chip Memory */
OCM : ORIGIN = 0, LENGTH = 0x30000 OCM : ORIGIN = 0, LENGTH = 0x30000
OCM3 : ORIGIN = 0xFFFF0000, LENGTH = 0x10000 OCM3 : ORIGIN = 0xFFFF0000, LENGTH = 0x10000
} }
SECTIONS SECTIONS
@ -38,27 +36,34 @@ SECTIONS
*(.data .data.*); *(.data .data.*);
} > OCM } > OCM
.bss (NOLOAD) : ALIGN(0x4000) .bss (NOLOAD) : ALIGN(4)
{ {
/* Aligned to 16 kB */ __bss_start = .;
KEEP(*(.bss.l1_table)); KEEP(*(.bss.l1_table));
*(.bss .bss.*); *(.bss .bss.*);
. = ALIGN(4); . = ALIGN(4);
__bss_end = .;
} > OCM } > OCM
__bss_start = ADDR(.bss);
__bss_end = ADDR(.bss) + SIZEOF(.bss);
.stack (NOLOAD) : ALIGN(0x1000) { .stack1 (NOLOAD) : ALIGN(8)
. += STACK_SIZE; {
__stack1_end = .;
. += 0x4000;
__stack1_start = .;
} > OCM } > OCM
__stack_end = ADDR(.stack);
__stack_start = ADDR(.stack) + SIZEOF(.stack);
/DISCARD/ : .stack0 (NOLOAD) : ALIGN(8)
{ {
/* Unused exception related info that only wastes space */ __stack0_end = .;
*(.ARM.exidx); . += 0x4000;
*(.ARM.exidx.*); __stack0_start = .;
*(.ARM.extab.*); } > OCM
}
/DISCARD/ :
{
/* Unused exception related info that only wastes space */
*(.ARM.exidx);
*(.ARM.exidx.*);
*(.ARM.extab.*);
}
} }

5
szl/src/main.rs
View File

@ -14,8 +14,6 @@ use libboard_zynq::{
use libsupport_zynq::{boot, logger}; use libsupport_zynq::{boot, logger};
static mut STACK_CORE1: [u32; 512] = [0; 512];
extern "C" { extern "C" {
fn unlzma_simple(buf: *const u8, in_len: i32, fn unlzma_simple(buf: *const u8, in_len: i32,
output: *mut u8, output: *mut u8,
@ -49,8 +47,7 @@ pub fn main_core0() {
if result < 0 { if result < 0 {
error!("decompression failed"); error!("decompression failed");
} else { } else {
let core1_stack = unsafe { &mut STACK_CORE1[..] }; boot::Core1::start();
boot::Core1::start(core1_stack);
info!("executing payload"); info!("executing payload");
unsafe { unsafe {
(mem::transmute::<*mut u8, fn()>(ddr.ptr::<u8>()))(); (mem::transmute::<*mut u8, fn()>(ddr.ptr::<u8>()))();