From 8f15c94df01ae903a7c937c2baa3c42abaf0fc17 Mon Sep 17 00:00:00 2001
From: Owen Williams <williams.owen@gmail.com>
Date: Mon, 9 Nov 2020 22:32:55 +0000
Subject: [PATCH 1/2] adding disco b_g431b_esc1

---
 boards/disco_b_g431b_esc1.json | 45 ++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 boards/disco_b_g431b_esc1.json

diff --git a/boards/disco_b_g431b_esc1.json b/boards/disco_b_g431b_esc1.json
new file mode 100644
index 00000000..ae8f481e
--- /dev/null
+++ b/boards/disco_b_g431b_esc1.json
@@ -0,0 +1,45 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32G4xx -DSTM32G431xx -DSTM32G431CBU",
+    "f_cpu": "170000000L",
+    "mcu": "stm32g431cbu6",
+    "product_line": "STM32G431xx",
+    "variant": "DISCO_B_G431B_ESC1"
+  },
+  "connectivity": [
+    "can"
+  ],
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32G431CB",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_board": "stm32g4discovery",
+    "svd_path": "STM32G431xx.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "libopencm3",
+    "zephyr"
+  ],
+  "name": "B-G431B-ESC1 Discovery",
+  "upload": {
+    "maximum_ram_size": 32768,
+    "maximum_size": 131072,
+    "protocol": "mbed",
+    "protocols": [
+      "jlink",
+      "blackmagic",
+      "stlink",
+      "mbed"
+    ]
+  },
+  "url": "https://www.st.com/en/evaluation-tools/b-g431b-esc1.html",
+  "vendor": "ST"
+}

From 4a04c8909d7f88f5d81d98a1efd3b84f3b88e29d Mon Sep 17 00:00:00 2001
From: Valerii Koval <valeros@users.noreply.github.com>
Date: Tue, 18 May 2021 17:37:18 +0300
Subject: [PATCH 2/2] Update B-G431B-ESC1 Discovery manifest

---
 boards/disco_b_g431b_esc1.json | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/boards/disco_b_g431b_esc1.json b/boards/disco_b_g431b_esc1.json
index ae8f481e..1661b7a5 100644
--- a/boards/disco_b_g431b_esc1.json
+++ b/boards/disco_b_g431b_esc1.json
@@ -1,42 +1,47 @@
+disco_b_g431b_esc1
+
 {
   "build": {
     "core": "stm32",
     "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32G4xx -DSTM32G431xx -DSTM32G431CBU",
+    "extra_flags": "-DSTM32G4xx -DSTM32G431xx",
     "f_cpu": "170000000L",
+    "framework_extra_flags": {
+      "arduino": "-DCUSTOM_PERIPHERAL_PINS"
+    },
     "mcu": "stm32g431cbu6",
     "product_line": "STM32G431xx",
-    "variant": "DISCO_B_G431B_ESC1"
+    "variant": "STM32G4xx/G431C(6-8-B)U_G441CBU"
   },
   "connectivity": [
     "can"
   ],
   "debug": {
-    "default_tools": [
-      "stlink"
-    ],
+    "default_tools": [
+      "stlink"
+    ],
     "jlink_device": "STM32G431CB",
-    "onboard_tools": [
-      "stlink"
-    ],
-    "openocd_board": "stm32g4discovery",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_target": "stm32g4x",
     "svd_path": "STM32G431xx.svd"
   },
   "frameworks": [
     "arduino",
     "cmsis",
-    "libopencm3",
-    "zephyr"
+    "stm32cube"
   ],
-  "name": "B-G431B-ESC1 Discovery",
+  "name": "ST B-G431B-ESC1 Discovery",
   "upload": {
     "maximum_ram_size": 32768,
     "maximum_size": 131072,
-    "protocol": "mbed",
+    "protocol": "stlink",
     "protocols": [
+      "stlink",
       "jlink",
+      "cmsis-dap",
       "blackmagic",
-      "stlink",
       "mbed"
     ]
   },