Skip to content

Commit 561f8d4

Browse files
jeromecoutantjeromecoutant
committed
STM32H7 STM32Cube FW V1.5.0 => V1.7.0
1 parent 9936a53 commit 561f8d4

File tree

7 files changed

+468
-415
lines changed

7 files changed

+468
-415
lines changed

‎features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
"eth-rxbufnb": 2,
5050
"eth-txbufnb": 4
5151
},
52+
"STM32H7": {
53+
"eth-txbufnb": 10
54+
},
5255
"ARCH_MAX": {
5356
"eth-phy-address": 1
5457
}

‎targets/TARGET_STM/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This table summarizes the STM32Cube versions currently used :
1919
| F4 | 1.19.0 | https://github.com/STMicroelectronics/STM32CubeF4 |
2020
| F7 | 1.16.0 | https://github.com/STMicroelectronics/STM32CubeF7 |
2121
| G0 | 1.3.0 | https://github.com/STMicroelectronics/STM32CubeG0 |
22-
| H7 | 1.4.0 | https://github.com/STMicroelectronics/STM32CubeH7 |
22+
| H7 | 1.7.0 | https://github.com/STMicroelectronics/STM32CubeH7 |
2323
| L0 | 1.10.0 | https://github.com/STMicroelectronics/STM32CubeL0 |
2424
| L1 | 1.8.1 | https://github.com/STMicroelectronics/STM32CubeL1 |
2525
| L4 | 1.11.0 | https://github.com/STMicroelectronics/STM32CubeL4 |

‎targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/stm32h7xx_hal_conf.h

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@
4646
#define HAL_DFSDM_MODULE_ENABLED
4747
#define HAL_DMA_MODULE_ENABLED
4848
#define HAL_DMA2D_MODULE_ENABLED
49+
#define HAL_DTS_MODULE_ENABLED
4950
#define HAL_DSI_MODULE_ENABLED
5051
#define HAL_ETH_MODULE_ENABLED
5152
#define HAL_EXTI_MODULE_ENABLED
5253
#define HAL_FDCAN_MODULE_ENABLED
5354
#define HAL_FLASH_MODULE_ENABLED
55+
#define HAL_GFXMMU_MODULE_ENABLED
5456
#define HAL_GPIO_MODULE_ENABLED
5557
#define HAL_HASH_MODULE_ENABLED
5658
#define HAL_HCD_MODULE_ENABLED
@@ -69,8 +71,11 @@
6971
#define HAL_NAND_MODULE_ENABLED
7072
#define HAL_NOR_MODULE_ENABLED
7173
#define HAL_OPAMP_MODULE_ENABLED
74+
#define HAL_OSPI_MODULE_ENABLED
75+
#define HAL_OTFDEC_MODULE_ENABLED
7276
#define HAL_PCD_MODULE_ENABLED
7377
#define HAL_PWR_MODULE_ENABLED
78+
#define HAL_PSSI_MODULE_ENABLED
7479
#define HAL_QSPI_MODULE_ENABLED
7580
#define HAL_RAMECC_MODULE_ENABLED
7681
#define HAL_RCC_MODULE_ENABLED
@@ -135,7 +140,7 @@
135140
#endif /* LSE_STARTUP_TIMEOUT */
136141

137142
#if !defined (LSI_VALUE)
138-
#define LSI_VALUE 32000U /*!< LSI Typical Value in Hz*/
143+
#define LSI_VALUE (32000U) /*!< LSI Typical Value in Hz*/
139144
#endif /* LSI_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz
140145
The real value may vary depending on the variations
141146
in voltage and temperature.*/
@@ -171,6 +176,7 @@
171176
#define USE_HAL_DFSDM_REGISTER_CALLBACKS 0U /* DFSDM register callback disabled */
172177
#define USE_HAL_DMA2D_REGISTER_CALLBACKS 0U /* DMA2D register callback disabled */
173178
#define USE_HAL_DSI_REGISTER_CALLBACKS 0U /* DSI register callback disabled */
179+
#define USE_HAL_DTS_REGISTER_CALLBACKS 0U /* DTS register callback disabled */
174180
#define USE_HAL_ETH_REGISTER_CALLBACKS 0U /* ETH register callback disabled */
175181
#define USE_HAL_FDCAN_REGISTER_CALLBACKS 0U /* FDCAN register callback disabled */
176182
#define USE_HAL_NAND_REGISTER_CALLBACKS 0U /* NAND register callback disabled */
@@ -179,29 +185,38 @@
179185
#define USE_HAL_SRAM_REGISTER_CALLBACKS 0U /* SRAM register callback disabled */
180186
#define USE_HAL_HASH_REGISTER_CALLBACKS 0U /* HASH register callback disabled */
181187
#define USE_HAL_HCD_REGISTER_CALLBACKS 0U /* HCD register callback disabled */
188+
#define USE_HAL_GFXMMU_REGISTER_CALLBACKS 0U /* GFXMMU register callback disabled */
182189
#define USE_HAL_HRTIM_REGISTER_CALLBACKS 0U /* HRTIM register callback disabled */
183190
#define USE_HAL_I2C_REGISTER_CALLBACKS 0U /* I2C register callback disabled */
184191
#define USE_HAL_I2S_REGISTER_CALLBACKS 0U /* I2S register callback disabled */
192+
#define USE_HAL_IRDA_REGISTER_CALLBACKS 0U /* IRDA register callback disabled */
185193
#define USE_HAL_JPEG_REGISTER_CALLBACKS 0U /* JPEG register callback disabled */
186194
#define USE_HAL_LPTIM_REGISTER_CALLBACKS 0U /* LPTIM register callback disabled */
187195
#define USE_HAL_LTDC_REGISTER_CALLBACKS 0U /* LTDC register callback disabled */
188196
#define USE_HAL_MDIOS_REGISTER_CALLBACKS 0U /* MDIO register callback disabled */
197+
#define USE_HAL_MMC_REGISTER_CALLBACKS 0U /* MMC register callback disabled */
189198
#define USE_HAL_OPAMP_REGISTER_CALLBACKS 0U /* MDIO register callback disabled */
199+
#define USE_HAL_OSPI_REGISTER_CALLBACKS 0U /* OSPI register callback disabled */
200+
#define USE_HAL_OTFDEC_REGISTER_CALLBACKS 0U /* OTFDEC register callback disabled */
190201
#define USE_HAL_PCD_REGISTER_CALLBACKS 0U /* PCD register callback disabled */
191202
#define USE_HAL_QSPI_REGISTER_CALLBACKS 0U /* QSPI register callback disabled */
192203
#define USE_HAL_RNG_REGISTER_CALLBACKS 0U /* RNG register callback disabled */
193204
#define USE_HAL_RTC_REGISTER_CALLBACKS 0U /* RTC register callback disabled */
194205
#define USE_HAL_SAI_REGISTER_CALLBACKS 0U /* SAI register callback disabled */
206+
#define USE_HAL_SD_REGISTER_CALLBACKS 0U /* SD register callback disabled */
207+
#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0U /* SMARTCARD register callback disabled */
195208
#define USE_HAL_SPDIFRX_REGISTER_CALLBACKS 0U /* SPDIFRX register callback disabled */
196209
#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0U /* SMBUS register callback disabled */
197210
#define USE_HAL_SPI_REGISTER_CALLBACKS 0U /* SPI register callback disabled */
198211
#define USE_HAL_SWPMI_REGISTER_CALLBACKS 0U /* SWPMI register callback disabled */
199212
#define USE_HAL_TIM_REGISTER_CALLBACKS 0U /* TIM register callback disabled */
213+
#define USE_HAL_UART_REGISTER_CALLBACKS 0U /* UART register callback disabled */
214+
#define USE_HAL_USART_REGISTER_CALLBACKS 0U /* USART register callback disabled */
200215
#define USE_HAL_WWDG_REGISTER_CALLBACKS 0U /* WWDG register callback disabled */
201216

202217
/* ########################### Ethernet Configuration ######################### */
203-
#define ETH_TX_DESC_CNT 10 /* number of Ethernet Tx DMA descriptors */
204-
#define ETH_RX_DESC_CNT 4 /* number of Ethernet Rx DMA descriptors */
218+
#define ETH_TX_DESC_CNT MBED_CONF_STM32_EMAC_ETH_TXBUFNB /* number of Ethernet Tx DMA descriptors */
219+
#define ETH_RX_DESC_CNT MBED_CONF_STM32_EMAC_ETH_RXBUFNB /* number of Ethernet Rx DMA descriptors */
205220

206221
#define ETH_MAC_ADDR0 ((uint8_t)0x02)
207222
#define ETH_MAC_ADDR1 ((uint8_t)0x00)
@@ -259,6 +274,10 @@
259274
#include "stm32h7xx_hal_dfsdm.h"
260275
#endif /* HAL_DFSDM_MODULE_ENABLED */
261276

277+
#ifdef HAL_DTS_MODULE_ENABLED
278+
#include "stm32h7xx_hal_dts.h"
279+
#endif /* HAL_DTS_MODULE_ENABLED */
280+
262281
#ifdef HAL_ETH_MODULE_ENABLED
263282
#include "stm32h7xx_hal_eth.h"
264283
#endif /* HAL_ETH_MODULE_ENABLED */
@@ -303,6 +322,10 @@
303322
#include "stm32h7xx_hal_flash.h"
304323
#endif /* HAL_FLASH_MODULE_ENABLED */
305324

325+
#ifdef HAL_GFXMMU_MODULE_ENABLED
326+
#include "stm32h7xx_hal_gfxmmu.h"
327+
#endif /* HAL_GFXMMU_MODULE_ENABLED */
328+
306329
#ifdef HAL_HRTIM_MODULE_ENABLED
307330
#include "stm32h7xx_hal_hrtim.h"
308331
#endif /* HAL_HRTIM_MODULE_ENABLED */
@@ -359,6 +382,18 @@
359382
#include "stm32h7xx_hal_opamp.h"
360383
#endif /* HAL_OPAMP_MODULE_ENABLED */
361384

385+
#ifdef HAL_OSPI_MODULE_ENABLED
386+
#include "stm32h7xx_hal_ospi.h"
387+
#endif /* HAL_OSPI_MODULE_ENABLED */
388+
389+
#ifdef HAL_OTFDEC_MODULE_ENABLED
390+
#include "stm32h7xx_hal_otfdec.h"
391+
#endif /* HAL_OTFDEC_MODULE_ENABLED */
392+
393+
#ifdef HAL_PSSI_MODULE_ENABLED
394+
#include "stm32h7xx_hal_pssi.h"
395+
#endif /* HAL_PSSI_MODULE_ENABLED */
396+
362397
#ifdef HAL_PWR_MODULE_ENABLED
363398
#include "stm32h7xx_hal_pwr.h"
364399
#endif /* HAL_PWR_MODULE_ENABLED */
@@ -369,7 +404,7 @@
369404

370405
#ifdef HAL_RAMECC_MODULE_ENABLED
371406
#include "stm32h7xx_hal_ramecc.h"
372-
#endif /* HAL_HCD_MODULE_ENABLED */
407+
#endif /* HAL_RAMECC_MODULE_ENABLED */
373408

374409
#ifdef HAL_RNG_MODULE_ENABLED
375410
#include "stm32h7xx_hal_rng.h"
@@ -442,17 +477,6 @@
442477
/* Exported macro ------------------------------------------------------------*/
443478
#ifdef USE_FULL_ASSERT
444479
#include "stm32_assert.h" // MBED patch
445-
/**
446-
* @brief The assert_param macro is used for function's parameters check.
447-
* @param expr: If expr is false, it calls assert_failed function
448-
* which reports the name of the source file and the source
449-
* line number of the call that failed.
450-
* If expr is true, it returns no value.
451-
* @retval None
452-
*/
453-
//MBED PATCH #define assert_param(expr) ((expr) ? (void)0 : assert_failed((uint8_t *)__FILE__, __LINE__))
454-
/* Exported functions ------------------------------------------------------- */
455-
//MBED PATCH void assert_failed(uint8_t* file, uint32_t line);
456480
#else
457481
#define assert_param(expr) ((void)0U)
458482
#endif /* USE_FULL_ASSERT */

0 commit comments

Comments
 (0)