diff --git a/cpu/stm32/include/vendor/Makefile b/cpu/stm32/include/vendor/Makefile
index 8690f774ef..88c04466df 100644
--- a/cpu/stm32/include/vendor/Makefile
+++ b/cpu/stm32/include/vendor/Makefile
@@ -23,6 +23,7 @@ PKG_LICENSE=Apache-2
 # Store the cloned repositories under the stm32 directory to prevent downloads
 # for each builds.
 PKG_SOURCE_DIR = $(RIOTBASE)/cpu/stm32/include/vendor/cmsis/$(CPU_FAM)
+PKG_PATCH_DIR = $(CURDIR)/patches/$(CPU_FAM)
 
 include $(RIOTBASE)/pkg/pkg.mk
 
diff --git a/cpu/stm32/include/vendor/patches/f0/0001-stm32f0xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/f0/0001-stm32f0xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..d8e8e4b48d
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/f0/0001-stm32f0xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From 86e104c707fed103d6fa92ba9a44f0502aa82933 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32f0xx: remove ErrorStatus
+
+---
+ Include/stm32f0xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32f0xx.h b/Include/stm32f0xx.h
+index 621a5fa..61faaf9 100644
+--- a/Include/stm32f0xx.h
++++ b/Include/stm32f0xx.h
+@@ -169,12 +169,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum 
+-{
+-  SUCCESS = 0U,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/f1/0001-stm32f1xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/f1/0001-stm32f1xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..9f62e444aa
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/f1/0001-stm32f1xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From 95ab50cfd3a3e5dcb10978f1957136e7dcfe78ca Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 15:33:09 +0200
+Subject: [PATCH] stm32f1xx: remove ErrorStatus
+
+---
+ Include/stm32f1xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32f1xx.h b/Include/stm32f1xx.h
+index 2f47c00..7f7b757 100644
+--- a/Include/stm32f1xx.h
++++ b/Include/stm32f1xx.h
+@@ -161,12 +161,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum
+-{
+-  SUCCESS = 0U,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/f2/0001-stm32f2xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/f2/0001-stm32f2xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..3610da180a
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/f2/0001-stm32f2xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From 524058e187edb2b8ce5bd150d29261cfa34a6201 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32f2xx: remove ErrorStatus
+
+---
+ Include/stm32f2xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32f2xx.h b/Include/stm32f2xx.h
+index b56e1e1..0f86517 100644
+--- a/Include/stm32f2xx.h
++++ b/Include/stm32f2xx.h
+@@ -132,12 +132,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum 
+-{
+-  SUCCESS = 0U,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/f3/0001-stm32f3xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/f3/0001-stm32f3xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..28e213a739
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/f3/0001-stm32f3xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From 23eff8ffe148e23931c6da226eb207185a55879b Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32f3xx: remove ErrorStatus
+
+---
+ Include/stm32f3xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32f3xx.h b/Include/stm32f3xx.h
+index 447e6c4..52306f4 100644
+--- a/Include/stm32f3xx.h
++++ b/Include/stm32f3xx.h
+@@ -174,12 +174,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum 
+-{
+-  SUCCESS = 0U,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/f4/0001-stm32f4xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/f4/0001-stm32f4xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..03aa4915e7
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/f4/0001-stm32f4xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From 4050cfd0d878fcfbd6e968eb53d82ba18b2393c0 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32f4xx: remove ErrorStatus
+
+---
+ Include/stm32f4xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32f4xx.h b/Include/stm32f4xx.h
+index 911183b..342fe97 100644
+--- a/Include/stm32f4xx.h
++++ b/Include/stm32f4xx.h
+@@ -211,12 +211,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum
+-{
+-  SUCCESS = 0U,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/f7/0001-stm32f7xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/f7/0001-stm32f7xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..0524e187dc
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/f7/0001-stm32f7xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From 47ae0d20e61b4cb8ac96d08f4bccc727d98b98ae Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32f7xx: remove ErrorStatus
+
+---
+ Include/stm32f7xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32f7xx.h b/Include/stm32f7xx.h
+index 84f9de4..2c02749 100644
+--- a/Include/stm32f7xx.h
++++ b/Include/stm32f7xx.h
+@@ -166,12 +166,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum
+-{
+-  SUCCESS = 0U,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/g0/0001-stm32g0xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/g0/0001-stm32g0xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..f9c89c63d2
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/g0/0001-stm32g0xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From f9a82cd82510f7bf825d94b8911a26ade13c5039 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32g0xx: remove ErrorStatus
+
+---
+ Include/stm32g0xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32g0xx.h b/Include/stm32g0xx.h
+index 8af3dc3..141e9e3 100644
+--- a/Include/stm32g0xx.h
++++ b/Include/stm32g0xx.h
+@@ -134,12 +134,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum
+-{
+-  SUCCESS = 0,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/g4/0001-stm32g4xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/g4/0001-stm32g4xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..83afa98add
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/g4/0001-stm32g4xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From b79de2d132b4c6ee769f9ed22998b5d081569760 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32g4xx: remove ErrorStatus
+
+---
+ Include/stm32g4xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32g4xx.h b/Include/stm32g4xx.h
+index 3ff61d8..0c4854e 100644
+--- a/Include/stm32g4xx.h
++++ b/Include/stm32g4xx.h
+@@ -141,12 +141,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum
+-{
+-  SUCCESS = 0,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/l0/0001-stm32l0xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/l0/0001-stm32l0xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..2a61f10335
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/l0/0001-stm32l0xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From 90e047a25c686ac7f05b5c7a0d7a03e66b9f9655 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32l0xx: remove ErrorStatus
+
+---
+ Include/stm32l0xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32l0xx.h b/Include/stm32l0xx.h
+index c37e141..1c7e531 100644
+--- a/Include/stm32l0xx.h
++++ b/Include/stm32l0xx.h
+@@ -183,12 +183,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum 
+-{
+-  SUCCESS = 0,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/l1/0001-stm32l1xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/l1/0001-stm32l1xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..a42a55adc4
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/l1/0001-stm32l1xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From 185f7bb7d4c8638da0e5aeda9ccaaf8f5108ebdd Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32l1xx: remove ErrorStatus
+
+---
+ Include/stm32l1xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32l1xx.h b/Include/stm32l1xx.h
+index 762015c..645e4bb 100644
+--- a/Include/stm32l1xx.h
++++ b/Include/stm32l1xx.h
+@@ -187,12 +187,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum 
+-{
+-  SUCCESS = 0,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/l4/0001-stm32l4xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/l4/0001-stm32l4xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..dab55ec497
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/l4/0001-stm32l4xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From f9e113b189935b9873dc0765213db80af581062b Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32l4xx: remove ErrorStatus
+
+---
+ Include/stm32l4xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32l4xx.h b/Include/stm32l4xx.h
+index 619e8c0..206c480 100644
+--- a/Include/stm32l4xx.h
++++ b/Include/stm32l4xx.h
+@@ -196,12 +196,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum
+-{
+-  SUCCESS = 0,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/l5/0001-stm32l5xx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/l5/0001-stm32l5xx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..1d16cfa6c9
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/l5/0001-stm32l5xx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From ef2c61f1ea41c8bf8e63d749e681b791b3f84537 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32l5xx: remove ErrorStatus
+
+---
+ Include/stm32l5xx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32l5xx.h b/Include/stm32l5xx.h
+index 6a1f21b..76a1470 100644
+--- a/Include/stm32l5xx.h
++++ b/Include/stm32l5xx.h
+@@ -122,12 +122,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum
+-{
+-  SUCCESS = 0,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/wb/0001-stm32wbxx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/wb/0001-stm32wbxx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..8ec15b8493
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/wb/0001-stm32wbxx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From 2a012fb2a0af27f65ddc62853d5813e049639b00 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 16:19:00 +0200
+Subject: [PATCH] stm32wbxx: remove ErrorStatus
+
+---
+ Include/stm32wbxx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32wbxx.h b/Include/stm32wbxx.h
+index 3af8492..e531dec 100644
+--- a/Include/stm32wbxx.h
++++ b/Include/stm32wbxx.h
+@@ -118,12 +118,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum
+-{
+-  SUCCESS = 0,
+-  ERROR = !SUCCESS
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+
diff --git a/cpu/stm32/include/vendor/patches/wl/0001-stm32wlxx-remove-ErrorStatus.patch b/cpu/stm32/include/vendor/patches/wl/0001-stm32wlxx-remove-ErrorStatus.patch
new file mode 100644
index 0000000000..608d2cc44f
--- /dev/null
+++ b/cpu/stm32/include/vendor/patches/wl/0001-stm32wlxx-remove-ErrorStatus.patch
@@ -0,0 +1,29 @@
+From 44bfee08fa5b31474704e2b451e3b866f4bcc671 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
+Date: Wed, 25 Aug 2021 18:40:48 +0200
+Subject: [PATCH] stm32wlxx: remove ErrorStatus
+
+---
+ Include/stm32wlxx.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Include/stm32wlxx.h b/Include/stm32wlxx.h
+index 01e41ba..c241fd1 100644
+--- a/Include/stm32wlxx.h
++++ b/Include/stm32wlxx.h
+@@ -128,12 +128,6 @@ typedef enum
+ } FunctionalState;
+ #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+ 
+-typedef enum
+-{
+-  ERROR = 0,
+-  SUCCESS = !ERROR
+-} ErrorStatus;
+-
+ /**
+   * @}
+   */
+-- 
+2.30.2
+