From 686316b96e115e5b3fb0361df1bee20fca6d2ed7 Mon Sep 17 00:00:00 2001
From: Brad Campbell <bradjc5@gmail.com>
Date: Wed, 20 Mar 2024 22:06:27 -0400
Subject: [PATCH] boards: stm32f4: use openocd board

---
 boards/stm32f429idiscovery/Makefile    |  5 ++---
 boards/stm32f429idiscovery/openocd.cfg | 15 ---------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 boards/stm32f429idiscovery/openocd.cfg

diff --git a/boards/stm32f429idiscovery/Makefile b/boards/stm32f429idiscovery/Makefile
index 1f9a0f1f7e..5af464414f 100644
--- a/boards/stm32f429idiscovery/Makefile
+++ b/boards/stm32f429idiscovery/Makefile
@@ -10,7 +10,6 @@ PLATFORM=stm32f429idiscovery
 include ../Makefile.common
 
 OPENOCD=openocd
-OPENOCD_OPTIONS=-f openocd.cfg
 
 # Default target for installing the kernel.
 .PHONY: install
@@ -18,8 +17,8 @@ install: flash
 
 .PHONY: flash-debug
 flash-debug: $(TOCK_ROOT_DIRECTORY)target/$(TARGET)/debug/$(PLATFORM).bin
-	$(OPENOCD) $(OPENOCD_OPTIONS) -c "init; reset halt; program $< verify 0x08000000; reset; shutdown"
+	$(OPENOCD) -c "source [find board/stm32f429discovery.cfg]; init; reset halt; program $< verify 0x08000000; reset; shutdown"
 
 .PHONY: flash
 flash: $(TOCK_ROOT_DIRECTORY)target/$(TARGET)/release/$(PLATFORM).bin
-	$(OPENOCD) $(OPENOCD_OPTIONS) -c "init; reset halt; program $< verify 0x08000000; reset; shutdown"
+	$(OPENOCD) -c "source [find board/stm32f429discovery.cfg]; init; reset halt; program $< verify 0x08000000; reset; shutdown"
diff --git a/boards/stm32f429idiscovery/openocd.cfg b/boards/stm32f429idiscovery/openocd.cfg
deleted file mode 100644
index 317baf499f..0000000000
--- a/boards/stm32f429idiscovery/openocd.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# Licensed under the Apache License, Version 2.0 or the MIT License.
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-# Copyright Tock Contributors 2023.
-
-#interface
-interface hla
-hla_layout stlink
-hla_device_desc "ST-LINK/V2-1"
-hla_vid_pid 0x0483 0x374b
-
-# The chip has 128KB sram, but we will still use 64KB
-set WORKAREASIZE 0x10000
-
-source [find target/stm32f4x.cfg]
-