From 22267b3fa24f01dbf620adacf54a9f91892d537b Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 7 Jul 2019 11:58:03 +0000 Subject: [PATCH] Fixed bug #1036. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12877 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- demos/STM32/RT-STM32F746G-DISCOVERY/Makefile | 2 +- demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile | 2 +- demos/STM32/RT-STM32F756ZG-NUCLEO144/Makefile | 2 +- demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile | 2 +- demos/STM32/RT-STM32F769I-DISCOVERY/Makefile | 2 +- demos/STM32/RT-STM32H743I-NUCLEO144/Makefile | 2 +- os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h | 2 +- readme.txt | 1 + testhal/STM32/multi/CRYPTO/make/stm32f756zg_nucleo144.make | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile b/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile index 1c9ed8efa..7e4bcdaa0 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile @@ -86,7 +86,7 @@ endif PROJECT = ch # Target settings. -MCU = cortex-m4 +MCU = cortex-m7 # Imported source files and paths. CHIBIOS := ../../.. diff --git a/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile b/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile index 423ad5289..997d85748 100644 --- a/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32F746ZG-NUCLEO144/Makefile @@ -86,7 +86,7 @@ endif PROJECT = ch # Target settings. -MCU = cortex-m4 +MCU = cortex-m7 # Imported source files and paths. CHIBIOS := ../../.. diff --git a/demos/STM32/RT-STM32F756ZG-NUCLEO144/Makefile b/demos/STM32/RT-STM32F756ZG-NUCLEO144/Makefile index d5a030091..344c0d0ad 100644 --- a/demos/STM32/RT-STM32F756ZG-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32F756ZG-NUCLEO144/Makefile @@ -86,7 +86,7 @@ endif PROJECT = ch # Target settings. -MCU = cortex-m4 +MCU = cortex-m7 # Imported source files and paths. CHIBIOS := ../../.. diff --git a/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile b/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile index 6f04b43f3..3ae29f8f8 100644 --- a/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32F767ZI-NUCLEO144/Makefile @@ -86,7 +86,7 @@ endif PROJECT = ch # Target settings. -MCU = cortex-m4 +MCU = cortex-m7 # Imported source files and paths. CHIBIOS := ../../.. diff --git a/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile b/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile index 7659fb27c..4a4ee14e4 100644 --- a/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F769I-DISCOVERY/Makefile @@ -86,7 +86,7 @@ endif PROJECT = ch # Target settings. -MCU = cortex-m4 +MCU = cortex-m7 # Imported source files and paths. CHIBIOS := ../../.. diff --git a/demos/STM32/RT-STM32H743I-NUCLEO144/Makefile b/demos/STM32/RT-STM32H743I-NUCLEO144/Makefile index cc8317ee6..61879fd8c 100644 --- a/demos/STM32/RT-STM32H743I-NUCLEO144/Makefile +++ b/demos/STM32/RT-STM32H743I-NUCLEO144/Makefile @@ -86,7 +86,7 @@ endif PROJECT = ch # Target settings. -MCU = cortex-m4 +MCU = cortex-m7 # Imported source files and paths. CHIBIOS := ../../.. diff --git a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h index 8ae6148d3..c906524dd 100644 --- a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h +++ b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h @@ -456,7 +456,7 @@ /* Driver macros. */ /*===========================================================================*/ -#if (defined(STM32_SPI_DMA_REQUIRED) && +#if (defined(STM32_SPI_DMA_REQUIRED) && \ defined(STM32_SPI_BDMA_REQUIRED)) || defined(__DOXYGEN__) #define spi_lld_driver_fields \ /* Pointer to the SPIx registers block.*/ \ diff --git a/readme.txt b/readme.txt index 0a531ccff..2ec3078c5 100644 --- a/readme.txt +++ b/readme.txt @@ -102,6 +102,7 @@ - HAL: Added a new interface for range-finder devices (used by EX). - HAL: Added mcuconf.h updater tool for STM32F407 (backported to 19.1.1). - NIL: Integrated NIL 4.0. +- FIX: Fixed some M7 demos compile as M4 bug #1037)(backported to 19.1.3). - FIX: Fixed missing I2C4 RCC definitions for L4/L4+ (bug #1036) (backported to 19.1.3)(backported to 18.2.3). - FIX: Fixed missing delay after STM32 wait states setup (bug #1035) diff --git a/testhal/STM32/multi/CRYPTO/make/stm32f756zg_nucleo144.make b/testhal/STM32/multi/CRYPTO/make/stm32f756zg_nucleo144.make index 395eb6d85..f2bba530e 100644 --- a/testhal/STM32/multi/CRYPTO/make/stm32f756zg_nucleo144.make +++ b/testhal/STM32/multi/CRYPTO/make/stm32f756zg_nucleo144.make @@ -86,7 +86,7 @@ endif PROJECT = ch # Target settings. -MCU = cortex-m4 +MCU = cortex-m7 # Imported source files and paths. CHIBIOS := ../../../..