Skip to content

Commit 119931e

Browse files
0xc01700xc0170
authored
Merge pull request #12478 from OpenNuvoton/nuvoton_m2351_minor
M2351: Fix some minor issues
2 parents 3f4e2a6 + 34d3d43 commit 119931e

File tree

3 files changed

+32
-36
lines changed

3 files changed

+32
-36
lines changed

‎targets/TARGET_NUVOTON/TARGET_M2351/device/startup_M2351.c

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,16 @@ WEAK_ALIAS_FUNC(GPC_IRQHandler, Default_Handler) // 18: GPIO Port C
134134
WEAK_ALIAS_FUNC(GPD_IRQHandler, Default_Handler) // 19: GPIO Port D
135135
WEAK_ALIAS_FUNC(GPE_IRQHandler, Default_Handler) // 20: GPIO Port E
136136
WEAK_ALIAS_FUNC(GPF_IRQHandler, Default_Handler) // 21: GPIO Port F
137-
WEAK_ALIAS_FUNC(QSPI0_IRQHandler, Default_Handler) // 22: SPI0
138-
WEAK_ALIAS_FUNC(SPI0_IRQHandler, Default_Handler) // 23: SPI1
139-
WEAK_ALIAS_FUNC(BRAKE0_IRQHandler, Default_Handler) // 24:
140-
WEAK_ALIAS_FUNC(EPWM0_P0_IRQHandler, Default_Handler) // 25:
141-
WEAK_ALIAS_FUNC(EPWM0_P1_IRQHandler, Default_Handler) // 26:
142-
WEAK_ALIAS_FUNC(EPWM0_P2_IRQHandler, Default_Handler) // 27:
143-
WEAK_ALIAS_FUNC(BRAKE1_IRQHandler, Default_Handler) // 28:
144-
WEAK_ALIAS_FUNC(EPWM1_P0_IRQHandler, Default_Handler) // 29:
145-
WEAK_ALIAS_FUNC(EPWM1_P1_IRQHandler, Default_Handler) // 30:
146-
WEAK_ALIAS_FUNC(EPWM1_P2_IRQHandler, Default_Handler) // 31:
137+
WEAK_ALIAS_FUNC(QSPI0_IRQHandler, Default_Handler) // 22: QSPI0
138+
WEAK_ALIAS_FUNC(SPI0_IRQHandler, Default_Handler) // 23: SPI0
139+
WEAK_ALIAS_FUNC(BRAKE0_IRQHandler, Default_Handler) // 24: BRAKE0
140+
WEAK_ALIAS_FUNC(EPWM0_P0_IRQHandler, Default_Handler) // 25: EPWM0P0
141+
WEAK_ALIAS_FUNC(EPWM0_P1_IRQHandler, Default_Handler) // 26: EPWM0P1
142+
WEAK_ALIAS_FUNC(EPWM0_P2_IRQHandler, Default_Handler) // 27: EPWM0P2
143+
WEAK_ALIAS_FUNC(BRAKE1_IRQHandler, Default_Handler) // 28: BRAKE1
144+
WEAK_ALIAS_FUNC(EPWM1_P0_IRQHandler, Default_Handler) // 29: EPWM1P0
145+
WEAK_ALIAS_FUNC(EPWM1_P1_IRQHandler, Default_Handler) // 30: EPWM1P1
146+
WEAK_ALIAS_FUNC(EPWM1_P2_IRQHandler, Default_Handler) // 31: EPWM1P2
147147
WEAK_ALIAS_FUNC(TMR0_IRQHandler, Default_Handler) // 32: Timer 0
148148
WEAK_ALIAS_FUNC(TMR1_IRQHandler, Default_Handler) // 33: Timer 1
149149
WEAK_ALIAS_FUNC(TMR2_IRQHandler, Default_Handler) // 34: Timer 2
@@ -152,14 +152,14 @@ WEAK_ALIAS_FUNC(UART0_IRQHandler, Default_Handler) // 36: UART0
152152
WEAK_ALIAS_FUNC(UART1_IRQHandler, Default_Handler) // 37: UART1
153153
WEAK_ALIAS_FUNC(I2C0_IRQHandler, Default_Handler) // 38: I2C0
154154
WEAK_ALIAS_FUNC(I2C1_IRQHandler, Default_Handler) // 39: I2C1
155-
WEAK_ALIAS_FUNC(PDMA0_IRQHandler, Default_Handler) // 40: Peripheral DMA
155+
WEAK_ALIAS_FUNC(PDMA0_IRQHandler, Default_Handler) // 40: Peripheral DMA 0
156156
WEAK_ALIAS_FUNC(DAC_IRQHandler, Default_Handler) // 41: DAC
157-
WEAK_ALIAS_FUNC(EADC0_IRQHandler, Default_Handler) // 42: ADC0 interrupt source 0
158-
WEAK_ALIAS_FUNC(EADC1_IRQHandler, Default_Handler) // 43: ADC0 interrupt source 1
157+
WEAK_ALIAS_FUNC(EADC0_IRQHandler, Default_Handler) // 42: EADC Source 0
158+
WEAK_ALIAS_FUNC(EADC1_IRQHandler, Default_Handler) // 43: EADC Source 1
159159
WEAK_ALIAS_FUNC(ACMP01_IRQHandler, Default_Handler) // 44: ACMP0 and ACMP1
160160
// 45: Reserved
161-
WEAK_ALIAS_FUNC(EADC2_IRQHandler, Default_Handler) // 46: ADC0 interrupt source 2
162-
WEAK_ALIAS_FUNC(EADC3_IRQHandler, Default_Handler) // 47: ADC0 interrupt source 3
161+
WEAK_ALIAS_FUNC(EADC2_IRQHandler, Default_Handler) // 46: EADC Source 2
162+
WEAK_ALIAS_FUNC(EADC3_IRQHandler, Default_Handler) // 47: EADC Source 3
163163
WEAK_ALIAS_FUNC(UART2_IRQHandler, Default_Handler) // 48: UART2
164164
WEAK_ALIAS_FUNC(UART3_IRQHandler, Default_Handler) // 49: UART3
165165
// 50: Reserved
@@ -199,10 +199,8 @@ WEAK_ALIAS_FUNC(ECAP0_IRQHandler, Default_Handler) // 86:
199199
WEAK_ALIAS_FUNC(ECAP1_IRQHandler, Default_Handler) // 87:
200200
WEAK_ALIAS_FUNC(GPH_IRQHandler, Default_Handler) // 88:
201201
WEAK_ALIAS_FUNC(EINT7_IRQHandler, Default_Handler) // 89:
202-
// 90~95: Reserved
203-
WEAK_ALIAS_FUNC(SPI5_IRQHandler, Default_Handler) // 96:
204-
WEAK_ALIAS_FUNC(DSRC_IRQHandler, Default_Handler) // 97:
205-
WEAK_ALIAS_FUNC(PDMA1_IRQHandler, Default_Handler) // 98:
202+
// 90~97: Reserved
203+
WEAK_ALIAS_FUNC(PDMA1_IRQHandler, Default_Handler) // 98: Peripheral DMA 1
206204
// 99:
207205
// 100: Reserved
208206
WEAK_ALIAS_FUNC(TRNG_IRQHandler, Default_Handler) // 101:
@@ -280,13 +278,13 @@ const uint32_t __vector_handlers[] = {
280278
(uint32_t) QSPI0_IRQHandler, // 22: QSPI0
281279
(uint32_t) SPI0_IRQHandler, // 23: SPI0
282280
(uint32_t) BRAKE0_IRQHandler, // 24:
283-
(uint32_t) EPWM0_P0_IRQHandler, // 25:
284-
(uint32_t) EPWM0_P1_IRQHandler, // 26:
285-
(uint32_t) EPWM0_P2_IRQHandler, // 27:
281+
(uint32_t) EPWM0_P0_IRQHandler, // 25:
282+
(uint32_t) EPWM0_P1_IRQHandler, // 26:
283+
(uint32_t) EPWM0_P2_IRQHandler, // 27:
286284
(uint32_t) BRAKE1_IRQHandler, // 28:
287-
(uint32_t) EPWM1_P0_IRQHandler, // 29:
288-
(uint32_t) EPWM1_P1_IRQHandler, // 30:
289-
(uint32_t) EPWM1_P2_IRQHandler, // 31:
285+
(uint32_t) EPWM1_P0_IRQHandler, // 29:
286+
(uint32_t) EPWM1_P1_IRQHandler, // 30:
287+
(uint32_t) EPWM1_P2_IRQHandler, // 31:
290288
(uint32_t) TMR0_IRQHandler, // 32: Timer 0
291289
(uint32_t) TMR1_IRQHandler, // 33: Timer 1
292290
(uint32_t) TMR2_IRQHandler, // 34: Timer 2
@@ -295,14 +293,14 @@ const uint32_t __vector_handlers[] = {
295293
(uint32_t) UART1_IRQHandler, // 37: UART1
296294
(uint32_t) I2C0_IRQHandler, // 38: I2C0
297295
(uint32_t) I2C1_IRQHandler, // 39: I2C1
298-
(uint32_t) PDMA0_IRQHandler, // 40: Peripheral DMA
296+
(uint32_t) PDMA0_IRQHandler, // 40: Peripheral DMA 0
299297
(uint32_t) DAC_IRQHandler, // 41: DAC
300-
(uint32_t) EADC0_IRQHandler, // 42: ADC0 interrupt source 0
301-
(uint32_t) EADC1_IRQHandler, // 43: ADC0 interrupt source 1
298+
(uint32_t) EADC0_IRQHandler, // 42: EADC source 0
299+
(uint32_t) EADC1_IRQHandler, // 43: EADC source 1
302300
(uint32_t) ACMP01_IRQHandler, // 44: ACMP0 and ACMP1
303301
(uint32_t) Default_Handler, // 45: Reserved
304-
(uint32_t) EADC2_IRQHandler, // 46: ADC0 interrupt source 2
305-
(uint32_t) EADC3_IRQHandler, // 47: ADC0 interrupt source 3
302+
(uint32_t) EADC2_IRQHandler, // 46: EADC source 2
303+
(uint32_t) EADC3_IRQHandler, // 47: EADC source 3
306304
(uint32_t) UART2_IRQHandler, // 48: UART2
307305
(uint32_t) UART3_IRQHandler, // 49: UART3
308306
(uint32_t) Default_Handler, // 50: Reserved
@@ -351,9 +349,9 @@ const uint32_t __vector_handlers[] = {
351349
(uint32_t) Default_Handler, // 93:
352350
(uint32_t) Default_Handler, // 94:
353351
(uint32_t) Default_Handler, // 95:
354-
(uint32_t) SPI5_IRQHandler, // 96:
355-
(uint32_t) DSRC_IRQHandler, // 97:
356-
(uint32_t) PDMA1_IRQHandler, // 98:
352+
(uint32_t) Default_Handler, // 96:
353+
(uint32_t) Default_Handler, // 97:
354+
(uint32_t) PDMA1_IRQHandler, // 98: Peripheral DMA 1
357355
(uint32_t) SCU_IRQHandler, // 99:
358356
(uint32_t) Default_Handler, // 100:
359357
(uint32_t) TRNG_IRQHandler, // 101:

‎targets/TARGET_NUVOTON/TARGET_M2351/device/system_M2351.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,6 @@ void NSC_Init(int32_t i32Region)
259259
u32Base = NU_TZ_NSC_REGION_START;
260260
u32Limit = (NU_TZ_NSC_REGION_START + NU_TZ_NSC_REGION_SIZE - 1);
261261

262-
/* SAU region 3 is dedicated for NSC */
263-
i32Region = 3;
264262
SAU->RNR = (i32Region & SAU_RNR_REGION_Msk);
265263
SAU->RBAR = (u32Base & SAU_RBAR_BADDR_Msk);
266264
SAU->RLAR = (u32Limit & SAU_RLAR_LADDR_Msk) |

‎targets/TARGET_NUVOTON/TARGET_M2351/rtc_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* We need RTC to be secure for security concern.
3535
*
3636
* On M2351, configured to secure
37-
* On M2351, hard-wired to secure
37+
* On M2354, hard-wired to secure
3838
*/
3939
#if defined(SCU_INIT_PNSSET2_VAL) && (SCU_INIT_PNSSET2_VAL & (1 << 1))
4040
#error("Limited by BSP/RTC, we can only support secure RTC.")

0 commit comments

Comments
 (0)