projects
/
gps-watch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bootloader: Import bootloader-final.ld.
[gps-watch.git]
/
src
/
bootloader
/
main.rs
diff --git
a/src/bootloader/main.rs
b/src/bootloader/main.rs
index d81da1532baa5b0b41f3a05f5f1adc7e1cf3d084..0d2954909572a02f26432aef8147c5894dfaff47 100644
(file)
--- a/
src/bootloader/main.rs
+++ b/
src/bootloader/main.rs
@@
-40,8
+40,12
@@
extern {
fn jump_to_application(address: u32);
}
fn jump_to_application(address: u32);
}
+#[cfg(bootloader_type = "intermediate")]
const APPLICATION_ADDR: u32 = 0x0;
const APPLICATION_ADDR: u32 = 0x0;
+#[cfg(bootloader_type = "final")]
+const APPLICATION_ADDR: u32 = 0x8000;
+
fn bootloader_requested() -> bool {
let start_ticks = systick::now();
fn bootloader_requested() -> bool {
let start_ticks = systick::now();