riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/msp430_common: extend flashpage API

Browse Source
This commit is contained in:
Ollrogge 2021-10-25 15:03:50 +02:00
parent d38f6c68b5
commit 741943f021
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cpu/msp430_common/ldscripts/msp430_common.ld Normal file
View File

@ -0,0 +1,18 @@
/*
* Copyright (C) 2021 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
SECTIONS
{
/* Populate information about rom size */
_srom = ORIGIN(ROM);
_erom = ORIGIN(ROM) + LENGTH(ROM);
.end_fw (NOLOAD) : ALIGN(4) {
_end_fw = . ;
} > ROM
}

19
cpu/msp430_common/periph/flashpage.c
View File

@ -26,6 +26,13 @@
#include "irq.h" #include "irq.h"
#include "periph/flashpage.h" #include "periph/flashpage.h"
/**
* @brief Memory markers, defined in the linker script
* @{
*/
extern uint32_t _end_fw;
extern uint32_t _erom;
static inline int _unlock(void) static inline int _unlock(void)
{ {
int state; int state;
@ -97,3 +104,15 @@ void flashpage_write(void *target_addr, const void *data, size_t len)
/* lock flash and re-enable interrupts */ /* lock flash and re-enable interrupts */
_lock(state); _lock(state);
} }
unsigned flashpage_first_free(void)
{
return flashpage_page(&_end_fw) + 1;
}
/* MSP430 cpu's last page holds the interrupt vector, so flashpage_last_free
is the one before last */
unsigned flashpage_last_free(void)
{
return flashpage_page(&_erom) - 1;
}

1
makefiles/arch/msp430.inc.mk
View File

@ -16,6 +16,7 @@ ASFLAGS += $(CFLAGS_CPU) --defsym $(CPU_MODEL)=1 $(CFLAGS_DBG)
LINKFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG) $(CFLAGS_OPT) LINKFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG) $(CFLAGS_OPT)
LINKFLAGS += -Wl,--gc-sections -Wl,-L$(MSP430_SUPPORT_FILES)/include LINKFLAGS += -Wl,--gc-sections -Wl,-L$(MSP430_SUPPORT_FILES)/include
LINKFLAGS += -T $(MSP430_SUPPORT_FILES)/include/$(CPU_MODEL).ld LINKFLAGS += -T $(MSP430_SUPPORT_FILES)/include/$(CPU_MODEL).ld
LINKFLAGS += -T $(RIOTCPU)/msp430_common/ldscripts/msp430_common.ld
LINKFLAGS += $(RIOTCPU)/msp430_common/ldscripts/xfa.ld LINKFLAGS += $(RIOTCPU)/msp430_common/ldscripts/xfa.ld
OPTIONAL_CFLAGS_BLACKLIST += -fdiagnostics-color OPTIONAL_CFLAGS_BLACKLIST += -fdiagnostics-color