M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

bootloader: allow using without Ethernet.

This commit is contained in:
whitequark 2017-12-31 09:21:28 +00:00
parent 70ebe431fd
commit a371b25525
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/firmware/bootloader/main.rs
View File

@ -10,8 +10,9 @@ extern crate board;
use core::{ptr, slice}; use core::{ptr, slice};
use crc::crc32; use crc::crc32;
use byteorder::{ByteOrder, BigEndian}; use byteorder::{ByteOrder, BigEndian};
use smoltcp::wire::{EthernetAddress, IpAddress, IpCidr}; use board::{boot, cache};
use board::{boot, cache, clock, config, ethmac}; #[cfg(has_ethmac)]
use board::{clock, config, ethmac};
use board::uart_console::Console; use board::uart_console::Console;
fn check_integrity() -> bool { fn check_integrity() -> bool {
@ -139,7 +140,10 @@ fn flash_boot() {
} }
} }
#[cfg(has_ethmac)]
fn network_boot() { fn network_boot() {
use smoltcp::wire::{EthernetAddress, IpAddress, IpCidr};
println!("Initializing network..."); println!("Initializing network...");
let eth_addr = match config::read_str("mac", |r| r.map(|s| s.parse())) { let eth_addr = match config::read_str("mac", |r| r.map(|s| s.parse())) {
@ -197,6 +201,7 @@ pub extern fn main() -> i32 {
if startup() { if startup() {
println!(""); println!("");
flash_boot(); flash_boot();
#[cfg(has_ethmac)]
network_boot(); network_boot();
} else { } else {
println!("Halting."); println!("Halting.");

5
artiq/gateware/targets/sayma_amc_drtio_satellite.py
View File

@ -110,8 +110,11 @@ def main():
args = parser.parse_args() args = parser.parse_args()
soc = Satellite(**soc_sdram_argdict(args)) soc = Satellite(**soc_sdram_argdict(args))
firmware_dir = os.path.join(artiq_dir, "firmware")
builder = Builder(soc, **builder_argdict(args)) builder = Builder(soc, **builder_argdict(args))
builder.add_software_package("satman", os.path.join(artiq_dir, "firmware", "satman")) builder.software_packages = []
builder.add_software_package("bootloader", os.path.join(firmware_dir, "bootloader"))
builder.add_software_package("satman", os.path.join(firmware_dir, "satman"))
builder.build() builder.build()