Skip to content

Commit 23a3ea0

Browse files
fixing the remaining parts after the rename
1 parent c62fc55 commit 23a3ea0

File tree

15 files changed

+5
-16
lines changed

15 files changed

+5
-16
lines changed

targets/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_conf.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#define HAL_CRC_MODULE_ENABLED
5555
#define HAL_CRYP_MODULE_ENABLED
5656

57-
#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071CxCTx)
57+
#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071xx)
5858
#define HAL_DAC_MODULE_ENABLED
5959
#endif /* !TARGET_STM32L031K6 && !TARGET_STM32L011K4 && !TARGET_STML0CXCTX */
6060

@@ -68,7 +68,7 @@
6868
#define HAL_GPIO_MODULE_ENABLED
6969
#define HAL_I2C_MODULE_ENABLED
7070

71-
#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071CxCTx)
71+
#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071xx)
7272
#define HAL_I2S_MODULE_ENABLED
7373
#endif /* !TARGET_STM32L031K6 && !TARGET_STM32L011K4 && !TARGET_STML0CXCTX */
7474

@@ -78,15 +78,15 @@
7878
#define HAL_PWR_MODULE_ENABLED
7979
#define HAL_RCC_MODULE_ENABLED
8080

81-
#if !defined (TARGET_STML071CxCTx)
81+
#if !defined (TARGET_STML071xx)
8282
#define HAL_RNG_MODULE_ENABLED
8383
#endif /* !TARGET_STML0CXCTX */
8484

8585
#define HAL_RTC_MODULE_ENABLED
8686
#define HAL_SPI_MODULE_ENABLED
8787
#define HAL_TIM_MODULE_ENABLED
8888

89-
#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071CxCTx)
89+
#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071xx)
9090
#define HAL_TSC_MODULE_ENABLED
9191
#endif /* !TARGET_STM32L031K6 && !TARGET_STM32L011K4 && !TARGET_STML0CXCTX */
9292

@@ -98,7 +98,7 @@
9898
#define HAL_WWDG_MODULE_ENABLED
9999
#define HAL_CORTEX_MODULE_ENABLED
100100

101-
#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071CxCTx)
101+
#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071xx)
102102
#define HAL_PCD_MODULE_ENABLED
103103
#endif /* !TARGET_STM32L031K6 && !TARGET_STM32L011K4 && !TARGET_STML0CXCTX */
104104

targets/targets.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2411,15 +2411,7 @@
24112411
"inherits": [
24122412
"MCU_STM32G0"
24132413
],
2414-
<<<<<<< HEAD
24152414
"public": false,
2416-
=======
2417-
"core": "Cortex-M7FD",
2418-
"mbed_rom_start": "0x08000000",
2419-
"mbed_rom_size": "0x200000",
2420-
"mbed_ram_start": "0x24000000",
2421-
"mbed_ram_size": "0x80000",
2422-
>>>>>>> 017a98b738... fixing the issues
24232415
"extra_labels_add": [
24242416
"STM32G071xx"
24252417
],
@@ -2803,9 +2795,6 @@
28032795
"STM32L0",
28042796
"STML071xx"
28052797
],
2806-
"overrides": {
2807-
"lpticker_delay_ticks": 0
2808-
},
28092798
"device_has_remove": [
28102799
"ANALOGOUT",
28112800
"TRNG"

0 commit comments

Comments
 (0)