Skip to content

Commit bb7b97c

Browse files
author
Cruz Monrreal
authored
Merge pull request #7491 from evva-sfw/feature/EFM32_make_PeripheralPins_overridable
EFM32: fix weak PeripheralPins configuration
2 parents 541fc1f + 804edd5 commit bb7b97c

File tree

10 files changed

+115
-105
lines changed

10 files changed

+115
-105
lines changed

‎targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG/PeripheralPins.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222
******************************************************************************/
2323

2424
#include "PeripheralPins.h"
25+
#include "mbed_toolchain.h"
2526

2627
/************ADC***************/
2728
/* The third "function" value is used to select the correct ADC channel */
28-
const PinMap PinMap_ADC[] = {
29+
MBED_WEAK const PinMap PinMap_ADC[] = {
2930
#ifdef ADC0_BASE
3031
{PD0, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH0},
3132
{PD1, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH1},
@@ -40,7 +41,7 @@ const PinMap PinMap_ADC[] = {
4041
};
4142

4243
/************DAC***************/
43-
const PinMap PinMap_DAC[] = {
44+
MBED_WEAK const PinMap PinMap_DAC[] = {
4445
#ifdef DAC0_BASE
4546
{PB11, DAC_0, 0},
4647
{PB12, DAC_0, 1},
@@ -49,7 +50,7 @@ const PinMap PinMap_DAC[] = {
4950
};
5051

5152
/************I2C SCL***********/
52-
const PinMap PinMap_I2C_SCL[] = {
53+
MBED_WEAK const PinMap PinMap_I2C_SCL[] = {
5354
#ifdef I2C0_BASE
5455
/* I2C0 */
5556
{PA1, I2C_0, 0},
@@ -71,7 +72,7 @@ const PinMap PinMap_I2C_SCL[] = {
7172
};
7273

7374
/************I2C SDA***********/
74-
const PinMap PinMap_I2C_SDA[] = {
75+
MBED_WEAK const PinMap PinMap_I2C_SDA[] = {
7576
#ifdef I2C0_BASE
7677
/* I2C0 */
7778
{PA0, I2C_0, 0},
@@ -93,7 +94,7 @@ const PinMap PinMap_I2C_SDA[] = {
9394
};
9495

9596
/************PWM***************/
96-
const PinMap PinMap_PWM[] = {
97+
MBED_WEAK const PinMap PinMap_PWM[] = {
9798
#if defined(TIMER_ROUTE_CC0PEN) || defined(TIMER_ROUTEPEN_CC0PEN)
9899
/* PWM0 */
99100
{PA8, PWM_CH0, 0},
@@ -116,7 +117,7 @@ const PinMap PinMap_PWM[] = {
116117
};
117118

118119
/*************SPI**************/
119-
const PinMap PinMap_SPI_MOSI[] = {
120+
MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
120121
#ifdef USART0_BASE
121122
/* USART0 */
122123
{PE10, SPI_0, 0},
@@ -138,7 +139,7 @@ const PinMap PinMap_SPI_MOSI[] = {
138139
{NC , NC , NC}
139140
};
140141

141-
const PinMap PinMap_SPI_MISO[] = {
142+
MBED_WEAK const PinMap PinMap_SPI_MISO[] = {
142143
#ifdef USART0_BASE
143144
/* USART0 */
144145
{PE11, SPI_0, 0},
@@ -160,7 +161,7 @@ const PinMap PinMap_SPI_MISO[] = {
160161
{NC , NC , NC}
161162
};
162163

163-
const PinMap PinMap_SPI_CLK[] = {
164+
MBED_WEAK const PinMap PinMap_SPI_CLK[] = {
164165
#ifdef USART0_BASE
165166
/* USART0 */
166167
{PE12, SPI_0, 0},
@@ -182,7 +183,7 @@ const PinMap PinMap_SPI_CLK[] = {
182183
{NC , NC , NC}
183184
};
184185

185-
const PinMap PinMap_SPI_CS[] = {
186+
MBED_WEAK const PinMap PinMap_SPI_CS[] = {
186187
#ifdef USART0_BASE
187188
/* USART0 */
188189
{PE13, SPI_0, 0},
@@ -205,7 +206,7 @@ const PinMap PinMap_SPI_CS[] = {
205206
};
206207

207208
/************UART**************/
208-
const PinMap PinMap_UART_TX[] = {
209+
MBED_WEAK const PinMap PinMap_UART_TX[] = {
209210
#ifdef UART0_BASE
210211
/* UART0 */
211212
{PF6, UART_0, 0},
@@ -253,7 +254,7 @@ const PinMap PinMap_UART_TX[] = {
253254
{NC , NC , NC}
254255
};
255256

256-
const PinMap PinMap_UART_RX[] = {
257+
MBED_WEAK const PinMap PinMap_UART_RX[] = {
257258
#ifdef UART0_BASE
258259
/* UART0 */
259260
{PF7, UART_0, 0},

‎targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG11/PeripheralPins.c

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
******************************************************************************/
2323

2424
#include "PeripheralPins.h"
25+
#include "mbed_toolchain.h"
2526

2627
/************ADC***************/
2728
/* The third "function" value is used to select the correct ADC channel */
2829
#if DEVICE_ANALOGIN
29-
const PinMap PinMap_ADC[] = {
30+
MBED_WEAK const PinMap PinMap_ADC[] = {
3031
#if ADC0_BASE
3132
{PA0, ADC_0, adcPosSelAPORT3XCH8},
3233
{PA1, ADC_0, adcPosSelAPORT4XCH9},
@@ -70,7 +71,7 @@ const PinMap PinMap_ADC[] = {
7071

7172
/************I2C SCL***********/
7273
#if DEVICE_I2C
73-
const PinMap PinMap_I2C_SCL[] = {
74+
MBED_WEAK const PinMap PinMap_I2C_SCL[] = {
7475
/* I2C0 */
7576
#ifdef I2C0_BASE
7677
{PA1, I2C_0, 0},
@@ -106,7 +107,7 @@ const PinMap PinMap_I2C_SCL[] = {
106107
};
107108

108109
/************I2C SDA***********/
109-
const PinMap PinMap_I2C_SDA[] = {
110+
MBED_WEAK const PinMap PinMap_I2C_SDA[] = {
110111
/* I2C0 */
111112
#ifdef I2C0_BASE
112113
{PA0, I2C_0, 0},
@@ -146,7 +147,7 @@ const PinMap PinMap_I2C_SDA[] = {
146147

147148
/************PWM***************/
148149
#if DEVICE_PWMOUT
149-
const PinMap PinMap_PWM[] = {
150+
MBED_WEAK const PinMap PinMap_PWM[] = {
150151
{PC13, PWM_CH0, 0},
151152
{PE10, PWM_CH0, 1},
152153
{PB0, PWM_CH0, 2},
@@ -189,7 +190,7 @@ const PinMap PinMap_PWM[] = {
189190

190191
/*************SPI**************/
191192
#if DEVICE_SPI
192-
const PinMap PinMap_SPI_MOSI[] = {
193+
MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
193194
#ifdef USART0_BASE
194195
{PE10, SPI_0, 0},
195196
{PE7, SPI_0, 1},
@@ -245,7 +246,7 @@ const PinMap PinMap_SPI_MOSI[] = {
245246
{NC , NC , NC}
246247
};
247248

248-
const PinMap PinMap_SPI_MISO[] = {
249+
MBED_WEAK const PinMap PinMap_SPI_MISO[] = {
249250
#ifdef USART0_BASE
250251
{PE11, SPI_0, 0},
251252
{PE6, SPI_0, 1},
@@ -301,7 +302,7 @@ const PinMap PinMap_SPI_MISO[] = {
301302
{NC , NC , NC}
302303
};
303304

304-
const PinMap PinMap_SPI_CLK[] = {
305+
MBED_WEAK const PinMap PinMap_SPI_CLK[] = {
305306
#ifdef USART0_BASE
306307
/* USART0 */
307308
{PE12, SPI_0, 0},
@@ -358,7 +359,7 @@ const PinMap PinMap_SPI_CLK[] = {
358359
{NC , NC , NC}
359360
};
360361

361-
const PinMap PinMap_SPI_CS[] = {
362+
MBED_WEAK const PinMap PinMap_SPI_CS[] = {
362363
#ifdef USART0_BASE
363364
/* USART0 */
364365
{PE13, SPI_0, 0},
@@ -416,7 +417,7 @@ const PinMap PinMap_SPI_CS[] = {
416417
};
417418

418419
/************UART**************/
419-
const PinMap PinMap_UART_TX[] = {
420+
MBED_WEAK const PinMap PinMap_UART_TX[] = {
420421
#ifdef USART0_BASE
421422
{PE10, USART_0, 0},
422423
{PE7, USART_0, 1},
@@ -474,7 +475,7 @@ const PinMap PinMap_UART_TX[] = {
474475
#endif
475476

476477
#if DEVICE_SERIAL
477-
const PinMap PinMap_UART_RX[] = {
478+
MBED_WEAK const PinMap PinMap_UART_RX[] = {
478479
#ifdef USART0_BASE
479480
{PE11, USART_0, 0},
480481
{PE6, USART_0, 1},
@@ -532,7 +533,7 @@ const PinMap PinMap_UART_RX[] = {
532533
#endif
533534

534535
#if DEVICE_CAN
535-
const PinMap PinMap_CAN_TX[] = {
536+
MBED_WEAK const PinMap PinMap_CAN_TX[] = {
536537
#ifdef CAN0_BASE
537538
{PC1, CAN_0, 0},
538539
{PF2, CAN_0, 1},
@@ -555,7 +556,7 @@ const PinMap PinMap_CAN_TX[] = {
555556
#endif
556557
};
557558

558-
const PinMap PinMap_CAN_RX[] = {
559+
MBED_WEAK const PinMap PinMap_CAN_RX[] = {
559560
#ifdef CAN0_BASE
560561
{PC0, CAN_0, 0},
561562
{PF0, CAN_0, 1},

‎targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32HG/PeripheralPins.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@
2222
******************************************************************************/
2323

2424
#include "PeripheralPins.h"
25+
#include "mbed_toolchain.h"
2526

2627
/************ADC***************/
27-
const PinMap PinMap_ADC[] = {
28+
MBED_WEAK const PinMap PinMap_ADC[] = {
2829
#ifdef ADC0_BASE
2930
{PD4, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH4},
3031
{PD5, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH5},
@@ -35,7 +36,7 @@ const PinMap PinMap_ADC[] = {
3536
};
3637

3738
/************I2C SCL***********/
38-
const PinMap PinMap_I2C_SCL[] = {
39+
MBED_WEAK const PinMap PinMap_I2C_SCL[] = {
3940
#ifdef I2C0_BASE
4041
/* I2C0 */
4142
{PA1, I2C_0, 0},
@@ -49,7 +50,7 @@ const PinMap PinMap_I2C_SCL[] = {
4950
};
5051

5152
/************I2C SDA***********/
52-
const PinMap PinMap_I2C_SDA[] = {
53+
MBED_WEAK const PinMap PinMap_I2C_SDA[] = {
5354
#ifdef I2C0_BASE
5455
/* I2C0 */
5556
{PA0, I2C_0, 0},
@@ -62,7 +63,7 @@ const PinMap PinMap_I2C_SDA[] = {
6263
{NC , NC , NC}
6364
};
6465
/************PWM***************/
65-
const PinMap PinMap_PWM[] = {
66+
MBED_WEAK const PinMap PinMap_PWM[] = {
6667
#if defined(TIMER_ROUTE_CC0PEN) || defined(TIMER_ROUTEPEN_CC0PEN)
6768
/* PWM0 */
6869
{PA0, PWM_CH0, 0},
@@ -82,7 +83,7 @@ const PinMap PinMap_PWM[] = {
8283
};
8384

8485
/*************SPI**************/
85-
const PinMap PinMap_SPI_MOSI[] = {
86+
MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
8687
#ifdef USART0_BASE
8788
/* USART0 */
8889
{PE10, SPI_0, 0},
@@ -100,7 +101,7 @@ const PinMap PinMap_SPI_MOSI[] = {
100101
{NC , NC , NC}
101102
};
102103

103-
const PinMap PinMap_SPI_MISO[] = {
104+
MBED_WEAK const PinMap PinMap_SPI_MISO[] = {
104105
#ifdef USART0_BASE
105106
/* USART0 */
106107
{PE11, SPI_0, 0},
@@ -118,7 +119,7 @@ const PinMap PinMap_SPI_MISO[] = {
118119
{NC , NC , NC}
119120
};
120121

121-
const PinMap PinMap_SPI_CLK[] = {
122+
MBED_WEAK const PinMap PinMap_SPI_CLK[] = {
122123
#ifdef USART0_BASE
123124
/* USART0 */
124125
{PE12, SPI_0, 0},
@@ -136,7 +137,7 @@ const PinMap PinMap_SPI_CLK[] = {
136137
{NC , NC , NC}
137138
};
138139

139-
const PinMap PinMap_SPI_CS[] = {
140+
MBED_WEAK const PinMap PinMap_SPI_CS[] = {
140141
#ifdef USART0_BASE
141142
/* USART0 */
142143
{PE13, SPI_0, 0},
@@ -154,7 +155,7 @@ const PinMap PinMap_SPI_CS[] = {
154155
};
155156

156157
/************UART**************/
157-
const PinMap PinMap_UART_TX[] = {
158+
MBED_WEAK const PinMap PinMap_UART_TX[] = {
158159
#ifdef USART0_BASE
159160
/* USART0 */
160161
{PE10, USART_0, 0},
@@ -179,7 +180,7 @@ const PinMap PinMap_UART_TX[] = {
179180
{NC , NC , NC}
180181
};
181182

182-
const PinMap PinMap_UART_RX[] = {
183+
MBED_WEAK const PinMap PinMap_UART_RX[] = {
183184
#ifdef USART0_BASE
184185
/* USART0 */
185186
{PE11, USART_0, 0},

0 commit comments

Comments
 (0)