software_dfu #46
13
src/dfu.rs
13
src/dfu.rs
|
@ -1,23 +1,30 @@
|
|||
use cortex_m_rt::{pre_init};
|
||||
|
||||
/// RAM location used to store DFU trigger message
|
||||
const DFU_MSG_ADDR: usize = 0x2001BC00;
|
||||
|
||||
|
||||
/// DFU trigger message
|
||||
sb10q
commented
Why not put it outside the functions so this declaration can be shared? Why not put it outside the functions so this declaration can be shared?
|
||||
const DFU_TRIG_MSG: usize = 0xDECAFBAD;
|
||||
|
||||
/// Set DFU trigger message
|
||||
pub unsafe fn trig_dfu() {
|
||||
let dfu_msg_addr = DFU_MSG_ADDR as *mut usize;
|
||||
*dfu_msg_addr = DFU_TRIG_MSG;
|
||||
}
|
||||
|
||||
/// Called by reset handler in lib.rs immediately after reset, checks if booting into dfu is needed
|
||||
#[pre_init]
|
||||
#[no_mangle]
|
||||
unsafe fn __pre_init() {
|
||||
sb10q
commented
see comment above see comment above
|
||||
|
||||
sb10q
commented
remove blank line remove blank line
|
||||
let dfu_msg_addr = DFU_MSG_ADDR as *mut usize;
|
||||
|
||||
// Check DFU trigger message
|
||||
if *dfu_msg_addr == DFU_TRIG_MSG{
|
||||
sb10q
commented
space before { space before {
|
||||
|
||||
sb10q
commented
remove blank line remove blank line
|
||||
// Reset message
|
||||
*dfu_msg_addr = 0x00000000;
|
||||
|
||||
// Enable system config controller clock
|
||||
const RCC_APB2ENR: *mut u32 = 0xE000_ED88 as *mut u32;
|
||||
const RCC_APB2ENR_ENABLE_SYSCFG_CLOCK: u32 = 0x00004000;
|
||||
|
||||
|
@ -26,6 +33,7 @@ unsafe fn __pre_init() {
|
|||
*RCC_APB2ENR | RCC_APB2ENR_ENABLE_SYSCFG_CLOCK,
|
||||
);
|
||||
|
||||
// Bypass BOOT pins and remap bootloader to 0x00000000
|
||||
const SYSCFG_MEMRMP: *mut u32 = 0x40013800 as *mut u32;
|
||||
const SYSCFG_MEMRMP_MAP_ROM: u32 = 0x00000001;
|
||||
|
||||
|
@ -34,8 +42,11 @@ unsafe fn __pre_init() {
|
|||
*SYSCFG_MEMRMP | SYSCFG_MEMRMP_MAP_ROM,
|
||||
);
|
||||
|
||||
// Set stack pointer to bootloader location
|
||||
asm!("LDR R0, =0x1FFF0000");
|
||||
asm!("LDR SP,[R0, #0]");
|
||||
|
||||
// Jump to bootloader
|
||||
asm!("LDR R0,[R0, #4]");
|
||||
asm!("BX R0");
|
||||
sb10q
commented
You can put all these lines into a single You can put all these lines into a single ``asm!`` macro, see https://doc.rust-lang.org/nightly/unstable-book/library-features/asm.html
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
This can and should be automatically obtained via a linker symbol. See this example:
https://git.m-labs.hk/M-Labs/artiq-zynq/src/branch/master/src/runtime/src/kernel/core1.rs#L31-L36
https://git.m-labs.hk/M-Labs/artiq-zynq/src/branch/master/src/runtime/link.x#L10
The linker currently does not actually do anything to the ram carved out for the dfu trigger message, and I beleive there's no symbol generated for that chunk of memory.
I think I'll have to find the linker script the project is using, fork a copy, generate a symbol for that addr and use it in our project somehow.
Indeed, but the linker script can be modified so that such a symbol is generated. This way there isn't any value that needs to be manually synchronized in two places. You may not even need to hardcode the address; the linker could place that variable automatically.
Though hardcoding is actually more reliable since after a firmware update the address could have changed otherwise... add a comment that explains that.
The linker script is the second link I gave you.
I think specifying a region that only contains the DFU msg would be reasonable. This way the address would not be changed after update.
I thought that linker script is for a zynq? I am not sure where the linker script currently being used is placed, think it is packaged with one of the rust modules.
Okay, you mean the thermostat linker script.
That
memory.x
you modified can be used, as you can see it already defines the_stack_start
symbol.The stack is on CCM, the message is placed in RAM. I can try placing the msg in CCM, not sure what the reset behavior of CCM is yet.
@pca006132 There's already a dedicated region specified in memory.x . Though the linker does not do anything with that region, and I don't think the linker generates a symbol for that space.
I also haven't found the linker script of the project just yet.
The linker script is defined in
cortex-m-rt
, https://github.com/rust-embedded/cortex-m-rt/blob/master/link.x.inBut I'm not familiar with that, not sure how to add new symbols.
@topquark12 what's wrong with simply adding
at the end of thermostat's
memory.x
?