Skip to content

Commit a39df51

Browse files
dpgeorgedpgeorge
committed
stmhal: Update Makefile and board configs to compile with relocated hal.
1 parent e4d4340 commit a39df51

17 files changed

Lines changed: 172 additions & 164 deletions

‎stmhal/Makefile‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
1919
include ../py/py.mk
2020

2121
CMSIS_DIR=cmsis
22-
HAL_DIR=hal
22+
HAL_DIR=hal/$(MCU_SERIES)
2323
USBDEV_DIR=usbdev
2424
#USBHOST_DIR=usbhost
2525
FATFS_DIR=lib/fatfs
@@ -158,35 +158,35 @@ SRC_S = \
158158
startup_stm32f40xx.s \
159159
gchelper.s \
160160

161-
SRC_HAL = $(addprefix $(HAL_DIR)/src/,\
162-
stm32f4xx_hal.c \
163-
stm32f4xx_hal_adc.c \
164-
stm32f4xx_hal_adc_ex.c \
165-
stm32f4xx_hal_can.c \
166-
stm32f4xx_hal_cortex.c \
167-
stm32f4xx_hal_dac.c \
168-
stm32f4xx_hal_dac_ex.c \
169-
stm32f4xx_hal_dma.c \
170-
stm32f4xx_hal_flash.c \
171-
stm32f4xx_hal_flash_ex.c \
172-
stm32f4xx_hal_gpio.c \
173-
stm32f4xx_hal_i2c.c \
174-
stm32f4xx_hal_pcd.c \
175-
stm32f4xx_hal_pcd_ex.c \
176-
stm32f4xx_hal_pwr.c \
177-
stm32f4xx_hal_pwr_ex.c \
178-
stm32f4xx_hal_rcc.c \
179-
stm32f4xx_hal_rcc_ex.c \
180-
stm32f4xx_hal_rng.c \
181-
stm32f4xx_hal_rtc.c \
182-
stm32f4xx_hal_rtc_ex.c \
183-
stm32f4xx_hal_sd.c \
184-
stm32f4xx_hal_spi.c \
185-
stm32f4xx_hal_tim.c \
186-
stm32f4xx_hal_tim_ex.c \
187-
stm32f4xx_hal_uart.c \
188-
stm32f4xx_ll_sdmmc.c \
189-
stm32f4xx_ll_usb.c \
161+
SRC_HAL = $(addprefix $(HAL_DIR)/src/stm32$(MCU_SERIES)xx_,\
162+
hal.c \
163+
hal_adc.c \
164+
hal_adc_ex.c \
165+
hal_can.c \
166+
hal_cortex.c \
167+
hal_dac.c \
168+
hal_dac_ex.c \
169+
hal_dma.c \
170+
hal_flash.c \
171+
hal_flash_ex.c \
172+
hal_gpio.c \
173+
hal_i2c.c \
174+
hal_pcd.c \
175+
hal_pcd_ex.c \
176+
hal_pwr.c \
177+
hal_pwr_ex.c \
178+
hal_rcc.c \
179+
hal_rcc_ex.c \
180+
hal_rng.c \
181+
hal_rtc.c \
182+
hal_rtc_ex.c \
183+
hal_sd.c \
184+
hal_spi.c \
185+
hal_tim.c \
186+
hal_tim_ex.c \
187+
hal_uart.c \
188+
ll_sdmmc.c \
189+
ll_usb.c \
190190
)
191191

192192
SRC_USBDEV = $(addprefix $(USBDEV_DIR)/,\
@@ -250,7 +250,7 @@ OBJ += $(BUILD)/pins_$(BOARD).o
250250
# to be compiled with -O0, then edit stm32f405.ld (in the .isr_vector section)
251251
# and comment out the following 2 lines.
252252
$(BUILD)/$(FATFS_DIR)/ff.o: COPT += -Os
253-
$(BUILD)/$(HAL_DIR)/src/stm32f4xx_hal_sd.o: COPT += -Os
253+
$(BUILD)/$(HAL_DIR)/src/stm32$(MCU_SERIES)xx_hal_sd.o: COPT += -Os
254254

255255
all: $(BUILD)/firmware.dfu $(BUILD)/firmware.hex
256256

‎stmhal/boards/CERB40/mpconfigboard.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
MCU_SERIES = f4
12
AF_FILE = boards/stm32f405_af.csv
23
LD_FILE = boards/stm32f405.ld

‎stmhal/boards/CERB40/stm32f4xx_hal_conf.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,25 @@
5656
#define HAL_MODULE_ENABLED
5757
#define HAL_ADC_MODULE_ENABLED
5858
#define HAL_CAN_MODULE_ENABLED
59-
#define HAL_CRC_MODULE_ENABLED
60-
#define HAL_CRYP_MODULE_ENABLED
59+
/* #define HAL_CRC_MODULE_ENABLED */
60+
/* #define HAL_CRYP_MODULE_ENABLED */
6161
#define HAL_DAC_MODULE_ENABLED
6262
//#define HAL_DCMI_MODULE_ENABLED
6363
#define HAL_DMA_MODULE_ENABLED
6464
/* #define HAL_DMA2D_MODULE_ENABLED */
6565
//#define HAL_ETH_MODULE_ENABLED
6666
#define HAL_FLASH_MODULE_ENABLED
67-
#define HAL_NAND_MODULE_ENABLED
68-
#define HAL_NOR_MODULE_ENABLED
69-
#define HAL_PCCARD_MODULE_ENABLED
70-
#define HAL_SRAM_MODULE_ENABLED
67+
/* #define HAL_NAND_MODULE_ENABLED */
68+
/* #define HAL_NOR_MODULE_ENABLED */
69+
/* #define HAL_PCCARD_MODULE_ENABLED */
70+
/* #define HAL_SRAM_MODULE_ENABLED */
7171
/* #define HAL_SDRAM_MODULE_ENABLED */
72-
#define HAL_HASH_MODULE_ENABLED
72+
/* #define HAL_HASH_MODULE_ENABLED */
7373
#define HAL_GPIO_MODULE_ENABLED
7474
#define HAL_I2C_MODULE_ENABLED
75-
#define HAL_I2S_MODULE_ENABLED
76-
#define HAL_IWDG_MODULE_ENABLED
77-
#define HAL_LTDC_MODULE_ENABLED
75+
/* #define HAL_I2S_MODULE_ENABLED */
76+
/* #define HAL_IWDG_MODULE_ENABLED */
77+
/* #define HAL_LTDC_MODULE_ENABLED */
7878
#define HAL_PWR_MODULE_ENABLED
7979
#define HAL_RCC_MODULE_ENABLED
8080
#define HAL_RNG_MODULE_ENABLED
@@ -84,13 +84,13 @@
8484
#define HAL_SPI_MODULE_ENABLED
8585
#define HAL_TIM_MODULE_ENABLED
8686
#define HAL_UART_MODULE_ENABLED
87-
#define HAL_USART_MODULE_ENABLED
88-
#define HAL_IRDA_MODULE_ENABLED
89-
#define HAL_SMARTCARD_MODULE_ENABLED
90-
#define HAL_WWDG_MODULE_ENABLED
87+
/* #define HAL_USART_MODULE_ENABLED */
88+
/* #define HAL_IRDA_MODULE_ENABLED */
89+
/* #define HAL_SMARTCARD_MODULE_ENABLED */
90+
/* #define HAL_WWDG_MODULE_ENABLED */
9191
#define HAL_CORTEX_MODULE_ENABLED
9292
#define HAL_PCD_MODULE_ENABLED
93-
#define HAL_HCD_MODULE_ENABLED
93+
/* #define HAL_HCD_MODULE_ENABLED */
9494

9595

9696
/* ########################## HSE/HSI Values adaptation ##################### */

‎stmhal/boards/ESPRUINO_PICO/mpconfigboard.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
MCU_SERIES = f4
12
AF_FILE = boards/stm32f401_af.csv
23
LD_FILE = boards/stm32f401.ld

‎stmhal/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,25 @@
5656
#define HAL_MODULE_ENABLED
5757
#define HAL_ADC_MODULE_ENABLED
5858
#define HAL_CAN_MODULE_ENABLED
59-
#define HAL_CRC_MODULE_ENABLED
60-
#define HAL_CRYP_MODULE_ENABLED
59+
/* #define HAL_CRC_MODULE_ENABLED */
60+
/* #define HAL_CRYP_MODULE_ENABLED */
6161
#define HAL_DAC_MODULE_ENABLED
62-
#define HAL_DCMI_MODULE_ENABLED
62+
/* #define HAL_DCMI_MODULE_ENABLED */
6363
#define HAL_DMA_MODULE_ENABLED
6464
/* #define HAL_DMA2D_MODULE_ENABLED */
65-
#define HAL_ETH_MODULE_ENABLED
65+
/* #define HAL_ETH_MODULE_ENABLED */
6666
#define HAL_FLASH_MODULE_ENABLED
67-
#define HAL_NAND_MODULE_ENABLED
68-
#define HAL_NOR_MODULE_ENABLED
69-
#define HAL_PCCARD_MODULE_ENABLED
70-
#define HAL_SRAM_MODULE_ENABLED
67+
/* #define HAL_NAND_MODULE_ENABLED */
68+
/* #define HAL_NOR_MODULE_ENABLED */
69+
/* #define HAL_PCCARD_MODULE_ENABLED */
70+
/* #define HAL_SRAM_MODULE_ENABLED */
7171
/* #define HAL_SDRAM_MODULE_ENABLED */
72-
#define HAL_HASH_MODULE_ENABLED
72+
/* #define HAL_HASH_MODULE_ENABLED */
7373
#define HAL_GPIO_MODULE_ENABLED
7474
#define HAL_I2C_MODULE_ENABLED
75-
#define HAL_I2S_MODULE_ENABLED
76-
#define HAL_IWDG_MODULE_ENABLED
77-
#define HAL_LTDC_MODULE_ENABLED
75+
/* #define HAL_I2S_MODULE_ENABLED */
76+
/* #define HAL_IWDG_MODULE_ENABLED */
77+
/* #define HAL_LTDC_MODULE_ENABLED */
7878
#define HAL_PWR_MODULE_ENABLED
7979
#define HAL_RCC_MODULE_ENABLED
8080
#define HAL_RNG_MODULE_ENABLED
@@ -84,13 +84,13 @@
8484
#define HAL_SPI_MODULE_ENABLED
8585
#define HAL_TIM_MODULE_ENABLED
8686
#define HAL_UART_MODULE_ENABLED
87-
#define HAL_USART_MODULE_ENABLED
88-
#define HAL_IRDA_MODULE_ENABLED
89-
#define HAL_SMARTCARD_MODULE_ENABLED
90-
#define HAL_WWDG_MODULE_ENABLED
87+
/* #define HAL_USART_MODULE_ENABLED */
88+
/* #define HAL_IRDA_MODULE_ENABLED */
89+
/* #define HAL_SMARTCARD_MODULE_ENABLED */
90+
/* #define HAL_WWDG_MODULE_ENABLED */
9191
#define HAL_CORTEX_MODULE_ENABLED
9292
#define HAL_PCD_MODULE_ENABLED
93-
#define HAL_HCD_MODULE_ENABLED
93+
/* #define HAL_HCD_MODULE_ENABLED */
9494

9595

9696
/* ########################## HSE/HSI Values adaptation ##################### */

‎stmhal/boards/HYDRABUS/mpconfigboard.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
MCU_SERIES = f4
12
AF_FILE = boards/stm32f405_af.csv
23
LD_FILE = boards/stm32f405.ld

‎stmhal/boards/HYDRABUS/stm32f4xx_hal_conf.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,25 @@
5656
#define HAL_MODULE_ENABLED
5757
#define HAL_ADC_MODULE_ENABLED
5858
#define HAL_CAN_MODULE_ENABLED
59-
#define HAL_CRC_MODULE_ENABLED
60-
#define HAL_CRYP_MODULE_ENABLED
59+
/* #define HAL_CRC_MODULE_ENABLED */
60+
/* #define HAL_CRYP_MODULE_ENABLED */
6161
#define HAL_DAC_MODULE_ENABLED
62-
#define HAL_DCMI_MODULE_ENABLED
62+
/* #define HAL_DCMI_MODULE_ENABLED */
6363
#define HAL_DMA_MODULE_ENABLED
6464
/* #define HAL_DMA2D_MODULE_ENABLED */
65-
#define HAL_ETH_MODULE_ENABLED
65+
/* #define HAL_ETH_MODULE_ENABLED */
6666
#define HAL_FLASH_MODULE_ENABLED
67-
#define HAL_NAND_MODULE_ENABLED
68-
#define HAL_NOR_MODULE_ENABLED
69-
#define HAL_PCCARD_MODULE_ENABLED
70-
#define HAL_SRAM_MODULE_ENABLED
67+
/* #define HAL_NAND_MODULE_ENABLED */
68+
/* #define HAL_NOR_MODULE_ENABLED */
69+
/* #define HAL_PCCARD_MODULE_ENABLED */
70+
/* #define HAL_SRAM_MODULE_ENABLED */
7171
/* #define HAL_SDRAM_MODULE_ENABLED */
72-
#define HAL_HASH_MODULE_ENABLED
72+
/* #define HAL_HASH_MODULE_ENABLED */
7373
#define HAL_GPIO_MODULE_ENABLED
7474
#define HAL_I2C_MODULE_ENABLED
75-
#define HAL_I2S_MODULE_ENABLED
76-
#define HAL_IWDG_MODULE_ENABLED
77-
#define HAL_LTDC_MODULE_ENABLED
75+
/* #define HAL_I2S_MODULE_ENABLED */
76+
/* #define HAL_IWDG_MODULE_ENABLED */
77+
/* #define HAL_LTDC_MODULE_ENABLED */
7878
#define HAL_PWR_MODULE_ENABLED
7979
#define HAL_RCC_MODULE_ENABLED
8080
#define HAL_RNG_MODULE_ENABLED
@@ -84,13 +84,13 @@
8484
#define HAL_SPI_MODULE_ENABLED
8585
#define HAL_TIM_MODULE_ENABLED
8686
#define HAL_UART_MODULE_ENABLED
87-
#define HAL_USART_MODULE_ENABLED
88-
#define HAL_IRDA_MODULE_ENABLED
89-
#define HAL_SMARTCARD_MODULE_ENABLED
90-
#define HAL_WWDG_MODULE_ENABLED
87+
/* #define HAL_USART_MODULE_ENABLED */
88+
/* #define HAL_IRDA_MODULE_ENABLED */
89+
/* #define HAL_SMARTCARD_MODULE_ENABLED */
90+
/* #define HAL_WWDG_MODULE_ENABLED */
9191
#define HAL_CORTEX_MODULE_ENABLED
9292
#define HAL_PCD_MODULE_ENABLED
93-
#define HAL_HCD_MODULE_ENABLED
93+
/* #define HAL_HCD_MODULE_ENABLED */
9494

9595

9696
/* ########################## HSE/HSI Values adaptation ##################### */

‎stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
MCU_SERIES = f4
12
AF_FILE = boards/stm32f405_af.csv
23
LD_FILE = boards/stm32f405.ld

‎stmhal/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,25 @@
5656
#define HAL_MODULE_ENABLED
5757
#define HAL_ADC_MODULE_ENABLED
5858
#define HAL_CAN_MODULE_ENABLED
59-
#define HAL_CRC_MODULE_ENABLED
60-
#define HAL_CRYP_MODULE_ENABLED
59+
/* #define HAL_CRC_MODULE_ENABLED */
60+
/* #define HAL_CRYP_MODULE_ENABLED */
6161
#define HAL_DAC_MODULE_ENABLED
62-
#define HAL_DCMI_MODULE_ENABLED
62+
/* #define HAL_DCMI_MODULE_ENABLED */
6363
#define HAL_DMA_MODULE_ENABLED
6464
/* #define HAL_DMA2D_MODULE_ENABLED */
65-
#define HAL_ETH_MODULE_ENABLED
65+
/* #define HAL_ETH_MODULE_ENABLED */
6666
#define HAL_FLASH_MODULE_ENABLED
67-
#define HAL_NAND_MODULE_ENABLED
68-
#define HAL_NOR_MODULE_ENABLED
69-
#define HAL_PCCARD_MODULE_ENABLED
70-
#define HAL_SRAM_MODULE_ENABLED
67+
/* #define HAL_NAND_MODULE_ENABLED */
68+
/* #define HAL_NOR_MODULE_ENABLED */
69+
/* #define HAL_PCCARD_MODULE_ENABLED */
70+
/* #define HAL_SRAM_MODULE_ENABLED */
7171
/* #define HAL_SDRAM_MODULE_ENABLED */
72-
#define HAL_HASH_MODULE_ENABLED
72+
/* #define HAL_HASH_MODULE_ENABLED */
7373
#define HAL_GPIO_MODULE_ENABLED
7474
#define HAL_I2C_MODULE_ENABLED
75-
#define HAL_I2S_MODULE_ENABLED
76-
#define HAL_IWDG_MODULE_ENABLED
77-
#define HAL_LTDC_MODULE_ENABLED
75+
/* #define HAL_I2S_MODULE_ENABLED */
76+
/* #define HAL_IWDG_MODULE_ENABLED */
77+
/* #define HAL_LTDC_MODULE_ENABLED */
7878
#define HAL_PWR_MODULE_ENABLED
7979
#define HAL_RCC_MODULE_ENABLED
8080
#define HAL_RNG_MODULE_ENABLED
@@ -84,13 +84,13 @@
8484
#define HAL_SPI_MODULE_ENABLED
8585
#define HAL_TIM_MODULE_ENABLED
8686
#define HAL_UART_MODULE_ENABLED
87-
#define HAL_USART_MODULE_ENABLED
88-
#define HAL_IRDA_MODULE_ENABLED
89-
#define HAL_SMARTCARD_MODULE_ENABLED
90-
#define HAL_WWDG_MODULE_ENABLED
87+
/* #define HAL_USART_MODULE_ENABLED */
88+
/* #define HAL_IRDA_MODULE_ENABLED */
89+
/* #define HAL_SMARTCARD_MODULE_ENABLED */
90+
/* #define HAL_WWDG_MODULE_ENABLED */
9191
#define HAL_CORTEX_MODULE_ENABLED
9292
#define HAL_PCD_MODULE_ENABLED
93-
#define HAL_HCD_MODULE_ENABLED
93+
/* #define HAL_HCD_MODULE_ENABLED */
9494

9595

9696
/* ########################## HSE/HSI Values adaptation ##################### */

‎stmhal/boards/PYBV10/mpconfigboard.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
MCU_SERIES = f4
12
AF_FILE = boards/stm32f405_af.csv
23
LD_FILE = boards/stm32f405.ld

0 commit comments

Comments
 (0)