Skip to content

Commit d35ac42

Browse files
committed
Revert "Update HAL patch"
This reverts commit 8d062a5.
1 parent e4d6803 commit d35ac42

File tree

2 files changed

+38
-26
lines changed

2 files changed

+38
-26
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From d7d9cd95fe4cf23e3ed5aadd8023bfcae40303f1 Mon Sep 17 00:00:00 2001
2+
From: Frederic Pillon <[email protected]>
3+
Date: Sat, 4 Apr 2020 15:00:12 +0200
4+
Subject: [PATCH 1/1] [G4] Fix LL FMC build issue introduce in HAL version
5+
v1.1.1
6+
7+
Guard have been removed while they should not.
8+
9+
Signed-off-by: Frederic Pillon <[email protected]>
10+
---
11+
system/Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_fmc.c | 4 ++--
12+
1 file changed, 2 insertions(+), 2 deletions(-)
13+
14+
diff --git a/system/Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_fmc.c b/system/Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_fmc.c
15+
index 12439fe3..6272a9d7 100644
16+
--- a/system/Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_fmc.c
17+
+++ b/system/Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_ll_fmc.c
18+
@@ -63,7 +63,7 @@
19+
* @brief FMC driver modules
20+
* @{
21+
*/
22+
-
23+
+#if defined (HAL_SRAM_MODULE_ENABLED) || defined(HAL_NOR_MODULE_ENABLED) || defined(HAL_NAND_MODULE_ENABLED)
24+
/* Private typedef -----------------------------------------------------------*/
25+
/* Private define ------------------------------------------------------------*/
26+
27+
@@ -766,7 +766,7 @@ HAL_StatusTypeDef FMC_NAND_GetECC(FMC_NAND_TypeDef *Device, uint32_t *ECCval, ui
28+
/**
29+
* @}
30+
*/
31+
-
32+
+#endif /* HAL_SRAM_MODULE_ENABLED || HAL_NOR_MODULE_ENABLED || HAL_NAND_MODULE_ENABLED */
33+
/**
34+
* @}
35+
*/
36+
--
37+
2.25.1.windows.1
38+

Diff for: CI/utils/patch/HAL/G4/0001-G4-Fix-LL-FMC-build-issue.patch

-26
This file was deleted.

0 commit comments

Comments
 (0)