From 69f0a9c0f55f71867f97b6656adede58df099cfa Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Mon, 18 May 2015 07:42:20 +0000 Subject: [PATCH] Fixed STM32 .mk files. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7987 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/STM32F0xx/platform.mk | 2 +- os/hal/ports/STM32/STM32F1xx/platform.mk | 2 +- os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk | 2 +- os/hal/ports/STM32/STM32F37x/platform.mk | 2 +- os/hal/ports/STM32/STM32F3xx/platform.mk | 2 +- os/hal/ports/STM32/STM32F4xx/platform.mk | 1 - os/hal/ports/STM32/STM32L1xx/platform.mk | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/os/hal/ports/STM32/STM32F0xx/platform.mk b/os/hal/ports/STM32/STM32F0xx/platform.mk index 5ffcdd35f..0da61dc5a 100644 --- a/os/hal/ports/STM32/STM32F0xx/platform.mk +++ b/os/hal/ports/STM32/STM32F0xx/platform.mk @@ -52,8 +52,8 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.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/DACv1/dac_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 \ diff --git a/os/hal/ports/STM32/STM32F1xx/platform.mk b/os/hal/ports/STM32/STM32F1xx/platform.mk index 193cdde62..fa15a055f 100644 --- a/os/hal/ports/STM32/STM32F1xx/platform.mk +++ b/os/hal/ports/STM32/STM32F1xx/platform.mk @@ -62,10 +62,10 @@ 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 \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv1/pal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv1/rtc_lld.c \ diff --git a/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk b/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk index 9c13abc71..368ebc8a3 100644 --- a/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk +++ b/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk @@ -62,10 +62,10 @@ 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 \ + $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv1/pal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c \ diff --git a/os/hal/ports/STM32/STM32F37x/platform.mk b/os/hal/ports/STM32/STM32F37x/platform.mk index 71b22fbfe..c8d65981b 100644 --- a/os/hal/ports/STM32/STM32F37x/platform.mk +++ b/os/hal/ports/STM32/STM32F37x/platform.mk @@ -56,8 +56,8 @@ 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/DACv1/dac_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 \ diff --git a/os/hal/ports/STM32/STM32F3xx/platform.mk b/os/hal/ports/STM32/STM32F3xx/platform.mk index 0258a04b3..8dfd9cf13 100644 --- a/os/hal/ports/STM32/STM32F3xx/platform.mk +++ b/os/hal/ports/STM32/STM32F3xx/platform.mk @@ -56,8 +56,8 @@ 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/DACv1/dac_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 \ diff --git a/os/hal/ports/STM32/STM32F4xx/platform.mk b/os/hal/ports/STM32/STM32F4xx/platform.mk index 27c5f0b89..3b6566efe 100644 --- a/os/hal/ports/STM32/STM32F4xx/platform.mk +++ b/os/hal/ports/STM32/STM32F4xx/platform.mk @@ -65,7 +65,6 @@ 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 2d3dfb7d3..6f8e8d053 100644 --- a/os/hal/ports/STM32/STM32L1xx/platform.mk +++ b/os/hal/ports/STM32/STM32L1xx/platform.mk @@ -52,8 +52,8 @@ 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/DACv1/dac_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c \