Merge #19904

19904: cpu/stm32: bump cmsis packages version r=benpicco a=aabadie Co-authored-by: Alexandre Abadie <alexandre.abadie@inria.fr>
RIOT-OS · Aug 28, 2023 · 9a06580 · 9a06580
2 parents da88c41 + b7d0080
commit 9a06580
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 57 deletions.
diff --git a/cpu/stm32/Makefile.cmsis b/cpu/stm32/Makefile.cmsis
@@ -3,36 +3,36 @@ PKG_NAME=stm32cmsis
 # The package URL depends on the family of the target STM32
 PKG_URL=https://github.com/STMicroelectronics/cmsis_device_$(CPU_FAM)
 
-# v2.3.6
-PKG_VERSION_f0=8b86197c7ab77ad029c34dc73cf6d4a1e12327d8
-# v4.3.3
-PKG_VERSION_f1=71ad5b3bf5cbb4d35cf8c8726c1b343871f0df0a
-# v2.2.5
-PKG_VERSION_f2=694c49f696d359f57f23153ab7acf3ac1a43f663
-# v2.3.6
-PKG_VERSION_f3=167eefd811de90a58c41e0a32071cdfecede389a
-# v2.6.7
-PKG_VERSION_f4=6fe2c1f498feda34ee422720ff8b3bd1b4656145
-# v1.2.6
-PKG_VERSION_f7=0abe04b1c85a848f1cec8dd4b2893dc8e3f07757
-# v1.4.1
-PKG_VERSION_g0=051d85f2f5a9b5d67d2fbb4e97861b2e8ec1ef89
-# v1.2.1
-PKG_VERSION_g4=3a3a8909720e37bece786f6011ba865951b369c8
-# v1.9.2
-PKG_VERSION_l0=532d96973e7b2ae5546a2c88cb216429f74f5f5d
-# v2.3.2
-PKG_VERSION_l1=1827333a7f7822282a6a46e4169596b5fb58cf61
-# v1.7.1
-PKG_VERSION_l4=26ed4846f831f730d852507e178061053e522daf
-# v1.0.4
-PKG_VERSION_l5=fcf61cd086e02c7a1cf7535ffe30622d1f5d36aa
-# v1.0.1
-PKG_VERSION_u5=147947d99f50554101d2a339ad19c2972c3ff161
-# v1.9.0
-PKG_VERSION_wb=3a801574163338b562f56e7eb503a955818f1a56
-# v1.1.0
-PKG_VERSION_wl=7bf548678b1132d829072ce86443c8036d538460
+# v2.3.7
+PKG_VERSION_f0=3973d99a89ac5fdf1f2593abc29a73d2981ce94a
+# v4.3.4
+PKG_VERSION_f1=49daecceeb4b251999a784995e8b8d714b59dbc2
+# v2.2.6
+PKG_VERSION_f2=30e6e50fb0bfc4456a468d74fc87b36465abaa5b
+# v2.3.7
+PKG_VERSION_f3=39da9163253cf49bf7c7ab9a9ced8a8ba943e87f
+# v2.6.8
+PKG_VERSION_f4=7ac69098b3e5f9b2d929acd4f087e92a7e59e0e9
+# v1.2.8
+PKG_VERSION_f7=25b0463439303b7a38f0d27b161f7d2f3c096e79
+# v1.4.3
+PKG_VERSION_g0=3a23e1224417f3f2d00300ecd620495e363f2094
+# v1.2.2
+PKG_VERSION_g4=371d9ecec9acc4d8b4baad36c8dc60cb9895baf7
+# v1.9.3
+PKG_VERSION_l0=69cd5999fd40ae6e546d4905b21635c6ca1bcb92
+# v2.3.3
+PKG_VERSION_l1=dafdef897e29b4f5934f1e2b9de9957410435476
+# v1.7.3
+PKG_VERSION_l4=013bf0e41256ffbc2b539676f2007d08b297a86a
+# v1.0.5
+PKG_VERSION_l5=a43f959bdb1e7449cbabe14356ca9309dbd48ad3
+# v1.3.0
+PKG_VERSION_u5=06d7edade7167b0eafdd550bf77cfc4fa98eae2e
+# v1.12.0
+PKG_VERSION_wb=d1b860584dfe24d40d455ae624ed14600dfa93c9
+# v1.2.0
+PKG_VERSION_wl=baa994d7bd83d7984675d6fce847cb7538118bf0
 
 PKG_VERSION=$(PKG_VERSION_$(CPU_FAM))
 PKG_LICENSE=Apache-2

diff --git a/cpu/stm32/include/vendor/patches/u5/0001-stm32u5xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/u5/0001-stm32u5xx-remove-ErrorStatus.patch
@@ -1,28 +1,17 @@
-From 872855adef525260f3f2f16c6525810a2dafe055 Mon Sep 17 00:00:00 2001
+From 4c75a6ccf6d6bed95d71c1d7ad3638553d62ff9d Mon Sep 17 00:00:00 2001
 From: Alexandre Abadie <alexandre.abadie@inria.fr>
-Date: Mon, 13 Dec 2021 14:48:19 +0100
+Date: Fri, 25 Aug 2023 09:37:16 +0200
 Subject: [PATCH 1/1] stm32u5xx: remove ErrorStatus
 
 ---
- Include/stm32u5xx.h | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
+ Include/stm32u5xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
 
 diff --git a/Include/stm32u5xx.h b/Include/stm32u5xx.h
-index e9c3cd8..5d58d36 100644
+index db03fce..3f8102d 100644
 --- a/Include/stm32u5xx.h
 +++ b/Include/stm32u5xx.h
-@@ -8,8 +8,8 @@
-   *          is using in the C source code, usually in main.c. This file contains:
-   *           - Configuration section that allows to select:
-   *              - The STM32U5xx device used in the target application
--  *              - To use or not the peripheral’s drivers in application code(i.e.
--  *                code will be based on direct access to peripheral’s registers
-+  *              - To use or not the peripheralï¿½s drivers in application code(i.e.
-+  *                code will be based on direct access to peripheralï¿½s registers
-   *                rather than drivers API), this option is controlled by
-   *                "#define USE_HAL_DRIVER"
-   *
-@@ -121,12 +121,6 @@ typedef enum
+@@ -156,12 +156,6 @@ typedef enum
  } FunctionalState;
  #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
 
@@ -36,5 +25,5 @@ index e9c3cd8..5d58d36 100644
    * @}
    */
 -- 
-2.32.0
+2.39.2
 
diff --git a/cpu/stm32/periph/ptp.c b/cpu/stm32/periph/ptp.c
@@ -33,14 +33,6 @@
 #define DEBUG_VERBOSE   0
 #include "debug.h"
 
-/* Workaround for typos in vendor files; drop when fixed upstream */
-#ifndef ETH_PTPTSCR_TSSSR
-#define ETH_PTPTSCR_TSSSR ETH_PTPTSSR_TSSSR
-#endif
-#ifndef ETH_PTPTSCR_TSSARFE
-#define ETH_PTPTSCR_TSSARFE ETH_PTPTSSR_TSSARFE
-#endif
-
 /* PTPSSIR is the number of nanoseconds to add onto the sub-second register
  * (the one counting the nanoseconds part of the timestamp with the
  * configuration we chose here). It is therefore the resolution of the clock
@@ -109,7 +101,7 @@ void ptp_init(void)
     ptp_clock_set(&initial_time);
     if (IS_USED(MODULE_PERIPH_ETH)) {
         /* enable timestamping of all received frames */
-        ETH->PTPTSCR |= ETH_PTPTSSR_TSSARFE;
+        ETH->PTPTSCR |= ETH_PTPTSCR_TSSARFE;
     }
     DEBUG("[periph_ptp] Initialized with PTPSAR = %" PRIu32 ", PTPSSIR = %" PRIu32 "\n",
           ptptsar, ptpssir);