From 55cfdec644d953ce31ef9a04ccbfeabfd2f6eb58 Mon Sep 17 00:00:00 2001 From: whitequark Date: Thu, 28 Dec 2017 14:38:56 +0000 Subject: [PATCH] firmware: enlarge bootloader partition to 4 sectors. --- artiq/firmware/libboard/config.rs | 2 +- artiq/frontend/artiq_flash.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/artiq/firmware/libboard/config.rs b/artiq/firmware/libboard/config.rs index aec58979b..665ccc462 100644 --- a/artiq/firmware/libboard/config.rs +++ b/artiq/firmware/libboard/config.rs @@ -37,7 +37,7 @@ mod imp { use spiflash; use super::Error; - // One flash sector immediately after the bootloader. + // One flash sector immediately before the firmware. const ADDR: usize = ::mem::FLASH_BOOT_ADDRESS - spiflash::PAGE_SIZE; const SIZE: usize = spiflash::PAGE_SIZE; diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py index 72d5fd11e..5e1d15a12 100755 --- a/artiq/frontend/artiq_flash.py +++ b/artiq/frontend/artiq_flash.py @@ -195,8 +195,8 @@ def main(): "variants": ["nist_clock", "nist_qc2"], "gateware": (0, 0x000000), "bootloader": (0, 0xaf0000), - "storage": (0, 0xb00000), - "runtime": (0, 0xb10000), + "storage": (0, 0xb30000), + "runtime": (0, 0xb40000), }, "sayma": { "programmer_factory": ProgrammerSayma, @@ -204,8 +204,8 @@ def main(): "variants": ["standalone"], "gateware": (0, 0x000000), "bootloader": (1, 0x000000), - "storage": (1, 0x010000), - "runtime": (1, 0x020000), + "storage": (1, 0x040000), + "runtime": (1, 0x050000), }, }[opts.target]