ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6970 from stevew817/efm32_flash_bugfix 

Fixes to EFM32 port
pull/6752/merge
Cruz Monrreal 2018-05-29 10:38:30 -05:00 committed by GitHub
parent 206cab97ac c2bc20ef74
commit 1a0c2d0600
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFR32MG12/PeripheralPins.c
View File

@ -301,7 +301,6 @@ const PinMap PinMap_SPI_MOSI[] = {
{PF4, SPI_1, 28},
{PF5, SPI_1, 29},
{PF6, SPI_1, 30},
{PF7, SPI_1, 31},
#endif
#ifdef USART2_BASE
/* USART2 */
@ -318,6 +317,7 @@ const PinMap PinMap_SPI_MOSI[] = {
{PB8, SPI_2, 11},
{PB9, SPI_2, 12},
{PB10, SPI_2, 13},
{PF7, SPI_2, 20},
{PF8, SPI_2, 21},
{PF9, SPI_2, 22},
{PF10, SPI_2, 23},
@ -381,7 +381,6 @@ const PinMap PinMap_SPI_MISO[] = {
{PF4, SPI_1, 27},
{PF5, SPI_1, 28},
{PF6, SPI_1, 29},
{PF7, SPI_1, 30},
{PA0, SPI_1, 31},
#endif
#ifdef USART2_BASE
@ -399,6 +398,7 @@ const PinMap PinMap_SPI_MISO[] = {
{PB8, SPI_2, 10},
{PB9, SPI_2, 11},
{PB10, SPI_2, 12},
{PF7, SPI_2, 19},
{PF8, SPI_2, 20},
{PF9, SPI_2, 21},
{PF10, SPI_2, 22},
@ -462,7 +462,6 @@ const PinMap PinMap_SPI_CLK[] = {
{PF4, SPI_1, 26},
{PF5, SPI_1, 27},
{PF6, SPI_1, 28},
{PF7, SPI_1, 29},
{PA0, SPI_1, 30},
{PA1, SPI_1, 31},
#endif
@ -480,6 +479,7 @@ const PinMap PinMap_SPI_CLK[] = {
{PB8, SPI_2, 9},
{PB9, SPI_2, 10},
{PB10, SPI_2, 11},
{PF7, SPI_2, 18},
{PF8, SPI_2, 19},
{PF9, SPI_2, 20},
{PF10, SPI_2, 21},
@ -544,7 +544,6 @@ const PinMap PinMap_SPI_CS[] = {
{PF4, SPI_1, 25},
{PF5, SPI_1, 26},
{PF6, SPI_1, 27},
{PF7, SPI_1, 28},
#endif
#ifdef USART2_BASE
/* USART2 */
@ -559,6 +558,7 @@ const PinMap PinMap_SPI_CS[] = {
{PB8, SPI_2, 8},
{PB9, SPI_2, 9},
{PB10, SPI_2, 10},
{PF7, SPI_2, 17},
{PF8, SPI_2, 18},
{PF9, SPI_2, 19},
{PF10, SPI_2, 20},

16
targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFR32MG12/TARGET_TB_SENSE_12/PinNames.h
View File

@ -50,17 +50,17 @@ typedef enum {
/* Expansion headers */
EXP3 = PA8,
EXP4 = PC6,
EXP4 = PK0,
EXP5 = PA9,
EXP6 = PC7,
EXP7 = PF3,
EXP8 = PC8,
EXP9 = PF4,
EXP10 = PC9,
EXP6 = PK2,
EXP7 = PA6,
EXP8 = PF7,
EXP9 = PA7,
EXP10 = PA5,
EXP11 = PF5,
EXP12 = PA6,
EXP12 = PF3,
EXP13 = PF6,
EXP14 = PA7,
EXP14 = PF4,
EXP15 = PC11,
EXP16 = PC10,

4
targets/TARGET_Silicon_Labs/TARGET_EFM32/flash_api.c
View File

@ -112,14 +112,14 @@ uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
/** Get page size
*
* The page size defines the writable page size
* @param obj The flash object
* @param address The page starting address
* @return The size of a page
*/
uint32_t flash_get_page_size(const flash_t *obj)
{
(void)obj;
return FLASH_PAGE_SIZE;
return sizeof(uint32_t);
}
/** Get start address for the flash region

2
targets/targets.json
View File

@ -2902,7 +2902,7 @@
"EFM32": {
"inherits": ["Target"],
"extra_labels": ["Silicon_Labs", "EFM32"],
"macros": ["MBEDTLS_CONFIG_HW_SUPPORT", "MBED_TICKLESS"],
"macros": ["MBEDTLS_CONFIG_HW_SUPPORT", "MBED_TICKLESS", "EM_MSC_RUN_FROM_FLASH"],
"public": false
},
"EFM32GG990F1024": {