From c9c16d94950005f7c7eca26a14937c45557d084b Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio <gdisirio@gmail.com> Date: Wed, 13 May 2015 13:15:29 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7980 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/STM32F0xx/platform.mk | 59 ++++++++++++---------- os/hal/ports/STM32/STM32F1xx/platform.mk | 5 ++ os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk | 5 ++ os/hal/ports/STM32/STM32F37x/platform.mk | 5 ++ os/hal/ports/STM32/STM32F3xx/platform.mk | 5 ++ os/hal/ports/STM32/STM32F4xx/platform.mk | 1 + os/hal/ports/STM32/STM32L1xx/platform.mk | 5 ++ 7 files changed, 58 insertions(+), 27 deletions(-) (limited to 'os') diff --git a/os/hal/ports/STM32/STM32F0xx/platform.mk b/os/hal/ports/STM32/STM32F0xx/platform.mk index 97d290968..5ffcdd35f 100644 --- a/os/hal/ports/STM32/STM32F0xx/platform.mk +++ b/os/hal/ports/STM32/STM32F0xx/platform.mk @@ -13,6 +13,9 @@ ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/ext_lld_isr.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c endif +ifneq ($(findstring HAL_USE_DAC TRUE,$(HALCONF)),) +PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c +endif ifneq ($(findstring HAL_USE_PAL TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c endif @@ -44,33 +47,35 @@ ifneq ($(findstring HAL_USE_USB TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/USBv1/usb_lld.c endif else -PLATFORMSRC = $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ - $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/stm32_dma.c \ - $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/hal_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/adc_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/ext_lld_isr.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2/rtc_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2/spi_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/icu_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/st_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv2/uart_lld.c \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/USBv1/usb_lld.c +PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ + $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/stm32_dma.c \ + $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/hal_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/adc_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/ext_lld_isr.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/dac_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2/rtc_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2/spi_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/gpt_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/icu_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/pwm_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/st_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv2/uart_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/USBv1/usb_lld.c endif # Required include directories -PLATFORMINC = $(CHIBIOS)/os/hal/ports/common/ARMCMx \ - $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx \ - $(CHIBIOS)/os/hal/ports/STM32/LLD \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2 \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2 \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2 \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2 \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1 \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv2 \ - $(CHIBIOS)/os/hal/ports/STM32/LLD/USBv1 +PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \ + $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx \ + $(CHIBIOS)/os/hal/ports/STM32/LLD \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1 \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2 \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2 \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2 \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2 \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1 \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv2 \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/USBv1 diff --git a/os/hal/ports/STM32/STM32F1xx/platform.mk b/os/hal/ports/STM32/STM32F1xx/platform.mk index d252f6c2e..193cdde62 100644 --- a/os/hal/ports/STM32/STM32F1xx/platform.mk +++ b/os/hal/ports/STM32/STM32F1xx/platform.mk @@ -22,6 +22,9 @@ endif ifneq ($(findstring HAL_USE_SDC TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/sdc_lld.c endif +ifneq ($(findstring HAL_USE_DAC TRUE,$(HALCONF)),) +PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c +endif ifneq ($(findstring HAL_USE_PAL TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv1/pal_lld.c endif @@ -59,6 +62,7 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/adc_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/ext_lld_isr.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/can_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/dac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/mac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/sdc_lld.c \ @@ -79,6 +83,7 @@ endif PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \ $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx \ $(CHIBIOS)/os/hal/ports/STM32/LLD \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv1 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv1 \ diff --git a/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk b/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk index 3b979ef6f..9c13abc71 100644 --- a/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk +++ b/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk @@ -22,6 +22,9 @@ endif ifneq ($(findstring HAL_USE_SDC TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/sdc_lld.c endif +ifneq ($(findstring HAL_USE_DAC TRUE,$(HALCONF)),) +PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c +endif ifneq ($(findstring HAL_USE_PAL TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv1/pal_lld.c endif @@ -59,6 +62,7 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/adc_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/ext_lld_isr.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/can_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/dac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/mac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/sdc_lld.c \ @@ -79,6 +83,7 @@ endif PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \ $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx \ $(CHIBIOS)/os/hal/ports/STM32/LLD \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv1 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv1 \ diff --git a/os/hal/ports/STM32/STM32F37x/platform.mk b/os/hal/ports/STM32/STM32F37x/platform.mk index 05dc2d25d..71b22fbfe 100644 --- a/os/hal/ports/STM32/STM32F37x/platform.mk +++ b/os/hal/ports/STM32/STM32F37x/platform.mk @@ -16,6 +16,9 @@ endif ifneq ($(findstring HAL_USE_CAN TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/can_lld.c endif +ifneq ($(findstring HAL_USE_DAC TRUE,$(HALCONF)),) +PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c +endif ifneq ($(findstring HAL_USE_PAL TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c endif @@ -53,6 +56,7 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/adc_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/ext_lld_isr.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/can_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/dac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c \ @@ -71,6 +75,7 @@ endif PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \ $(CHIBIOS)/os/hal/ports/STM32/STM32F37x \ $(CHIBIOS)/os/hal/ports/STM32/LLD \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2 \ diff --git a/os/hal/ports/STM32/STM32F3xx/platform.mk b/os/hal/ports/STM32/STM32F3xx/platform.mk index 80647e2b0..0258a04b3 100644 --- a/os/hal/ports/STM32/STM32F3xx/platform.mk +++ b/os/hal/ports/STM32/STM32F3xx/platform.mk @@ -16,6 +16,9 @@ endif ifneq ($(findstring HAL_USE_CAN TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/can_lld.c endif +ifneq ($(findstring HAL_USE_DAC TRUE,$(HALCONF)),) +PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c +endif ifneq ($(findstring HAL_USE_PAL TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c endif @@ -53,6 +56,7 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F3xx/adc_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/can_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/dac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c \ @@ -71,6 +75,7 @@ endif PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \ $(CHIBIOS)/os/hal/ports/STM32/STM32F3xx \ $(CHIBIOS)/os/hal/ports/STM32/LLD \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2 \ diff --git a/os/hal/ports/STM32/STM32F4xx/platform.mk b/os/hal/ports/STM32/STM32F4xx/platform.mk index 3b6566efe..27c5f0b89 100644 --- a/os/hal/ports/STM32/STM32F4xx/platform.mk +++ b/os/hal/ports/STM32/STM32F4xx/platform.mk @@ -65,6 +65,7 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/adc_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/ext_lld_isr.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/can_lld.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/dac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/mac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/sdc_lld.c \ diff --git a/os/hal/ports/STM32/STM32L1xx/platform.mk b/os/hal/ports/STM32/STM32L1xx/platform.mk index af4143abd..2d3dfb7d3 100644 --- a/os/hal/ports/STM32/STM32L1xx/platform.mk +++ b/os/hal/ports/STM32/STM32L1xx/platform.mk @@ -13,6 +13,9 @@ ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c endif +ifneq ($(findstring HAL_USE_DAC TRUE,$(HALCONF)),) +PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c +endif ifneq ($(findstring HAL_USE_PAL TRUE,$(HALCONF)),) PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c endif @@ -49,6 +52,7 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/hal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/adc_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/dac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c \ @@ -67,6 +71,7 @@ endif PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \ $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx \ $(CHIBIOS)/os/hal/ports/STM32/LLD \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1 \ $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2 \ -- cgit v1.2.3