UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build for N0100 and legacy N0110

Browse Source
This commit is contained in:
Yaya-Cout
2025-01-03 18:32:20 +01:00
parent d6831e46bf
commit 0c3506d85d
6 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ion/src/device/bootloader/Makefile
View File

@@ -3,6 +3,7 @@ ion_device_src += $(addprefix ion/src/device/bootloader/drivers/, \
board.cpp \ board.cpp \
cache.cpp \ cache.cpp \
external_flash_tramp.cpp \ external_flash_tramp.cpp \
storage.cpp \
led.cpp \ led.cpp \
power.cpp \ power.cpp \
reset.cpp \ reset.cpp \

2
ion/src/device/bootloader/bootloader_common.ld
View File

@@ -58,7 +58,7 @@ SECTIONS {
} > FLASH } > FLASH
.recovery_boot : { .recovery_boot : {
. = ORIGIN(FLASH) + USERLAND_OFFSET + 0x100; . = ORIGIN(FLASH) + USERLAND_OFFSET + 0x80;
KEEP(*(.recovery_boot)); KEEP(*(.recovery_boot));
} >FLASH } >FLASH

10
ion/src/device/bootloader/drivers/storage.cpp Normal file
View File

@@ -0,0 +1,10 @@
#include <ion/storage.h>
namespace Ion {
// TODO: Check if the storage is initialized at runtime and not at compile time:
// As far as I can see, it break build for N0110 legacy internal storage and
// N0100 due to lack of storage, so it's probably wasting space.
uint32_t __attribute__((section(".static_storage"))) staticStorageArea[sizeof(Storage)/sizeof(uint32_t)] = {0};
}

1
ion/src/device/n0110/flash.ld
View File

@@ -71,6 +71,7 @@ SECTIONS {
*(.text.__assert) *(.text.__assert)
*(.text.memcpy) *(.text.memcpy)
*(.text.memset) *(.text.memset)
*(.text.__udivmoddi4)
/* /*
*(.text.strlen) *(.text.strlen)
*(.text.strncmp) *(.text.strncmp)

4
ion/src/device/shared/ram.ld
View File

@@ -23,10 +23,10 @@ MEMORY {
* overwritten (for instance, vtables that live in the .rodata section). */ * overwritten (for instance, vtables that live in the .rodata section). */
/* The image is quite large too! /* The image is quite large too!
* So we put the stack to 18K so there's still space * So we put the stack to 17K so there's still space
* for our image, if not LD will throw an error. */ * for our image, if not LD will throw an error. */
STACK_SIZE = 18K; STACK_SIZE = 17K;
SECTIONS { SECTIONS {
.isr_vector_table ORIGIN(RAM_BUFFER) : { .isr_vector_table ORIGIN(RAM_BUFFER) : {

4
ion/src/shared/storage.cpp
View File

@@ -6,7 +6,9 @@
namespace Ion { namespace Ion {
uint32_t __attribute__((section(".static_storage"))) staticStorageArea[sizeof(Storage)/sizeof(uint32_t)] = {0}; // Declaration for N0110 with bootloader is in ion/src/device/bootloader/drivers/storage.cpp
// to fix LD build
__attribute__((weak)) uint32_t staticStorageArea[sizeof(Storage)/sizeof(uint32_t)] = {0};
Storage * Storage::sharedStorage() { Storage * Storage::sharedStorage() {
static Storage * storage = new (staticStorageArea) Storage(); static Storage * storage = new (staticStorageArea) Storage();