From 1c88665aaecc0b23c92792743ebab1f0da1c5ab4 Mon Sep 17 00:00:00 2001
From: graham sanderson <graham.sanderson@raspberrypi.com>
Date: Sat, 28 Mar 2026 15:34:45 -0500
Subject: [PATCH] remove EXEC2

---
 picoboot_connection/picoboot_connection.c       | 13 -------------
 picoboot_connection/picoboot_connection.h       |  1 -
 picoboot_connection/picoboot_connection_cxx.cpp |  4 ----
 picoboot_connection/picoboot_connection_cxx.h   |  1 -
 4 files changed, 19 deletions(-)

diff --git a/picoboot_connection/picoboot_connection.c b/picoboot_connection/picoboot_connection.c
index 5a8e1db9..574171c0 100644
--- a/picoboot_connection/picoboot_connection.c
+++ b/picoboot_connection/picoboot_connection.c
@@ -454,19 +454,6 @@ int picoboot_exec(libusb_device_handle *usb_device, uint32_t addr) {
     return picoboot_cmd(usb_device, &cmd, NULL, 0);
 }
 
-// int picoboot_exec2(libusb_device_handle *usb_device, struct picoboot_exec2_cmd *exec2_cmd) {
-//     struct picoboot_cmd cmd;
-//     // shouldn't be necessary any more
-//     // addr |= 1u; // Thumb bit
-//     //if (verbose) output("EXEC2 %08x\n", (unsigned int) exec2_cmd->scan_base);
-//     cmd.bCmdId = PC_EXEC2;
-//     cmd.bCmdSize = sizeof(cmd.exec2_cmd);
-//     cmd.dTransferLength = 0;
-//     cmd.exec2_cmd = *exec2_cmd;
-//     return picoboot_cmd(usb_device, &cmd, NULL, 0);
-// } // currently unused
-
-
 int picoboot_flash_erase(libusb_device_handle *usb_device, uint32_t addr, uint32_t len) {
     struct picoboot_cmd cmd;
     if (verbose) output("FLASH_ERASE %08x+%08x\n", (unsigned int) addr, (unsigned int) len);
diff --git a/picoboot_connection/picoboot_connection.h b/picoboot_connection/picoboot_connection.h
index 2009b778..31ee5b2e 100644
--- a/picoboot_connection/picoboot_connection.h
+++ b/picoboot_connection/picoboot_connection.h
@@ -56,7 +56,6 @@ int picoboot_reboot(libusb_device_handle *usb_device, uint32_t pc, uint32_t sp,
 int picoboot_reboot2(libusb_device_handle *usb_device, struct picoboot_reboot2_cmd *reboot_cmd);
 int picoboot_get_info(libusb_device_handle *usb_device, struct picoboot_get_info_cmd *cmd, uint8_t *buffer, uint32_t len);
 int picoboot_exec(libusb_device_handle *usb_device, uint32_t addr);
-// int picoboot_exec2(libusb_device_handle *usb_device, struct picoboot_exec2_cmd *exec2_cmd); // currently unused
 int picoboot_flash_erase(libusb_device_handle *usb_device, uint32_t addr, uint32_t len);
 int picoboot_vector(libusb_device_handle *usb_device, uint32_t addr);
 int picoboot_write(libusb_device_handle *usb_device, uint32_t addr, uint8_t *buffer, uint32_t len);
diff --git a/picoboot_connection/picoboot_connection_cxx.cpp b/picoboot_connection/picoboot_connection_cxx.cpp
index f93e0a30..a97e3da8 100644
--- a/picoboot_connection/picoboot_connection_cxx.cpp
+++ b/picoboot_connection/picoboot_connection_cxx.cpp
@@ -108,10 +108,6 @@ void connection::exec(uint32_t addr) {
     wrap_call([&] { return picoboot_exec(device, addr); });
 }
 
-// void connection::exec2(struct picoboot_exec2_cmd *cmd) {
-//     wrap_call([&] { return picoboot_exec2(device, cmd); });
-// } // currently unused
-
 void connection::flash_erase(uint32_t addr, uint32_t len) {
     wrap_call([&] { return picoboot_flash_erase(device, addr, len); });
 }
diff --git a/picoboot_connection/picoboot_connection_cxx.h b/picoboot_connection/picoboot_connection_cxx.h
index 6b2feab5..f11e2cca 100644
--- a/picoboot_connection/picoboot_connection_cxx.h
+++ b/picoboot_connection/picoboot_connection_cxx.h
@@ -47,7 +47,6 @@ namespace picoboot {
         void reboot(uint32_t pc, uint32_t sp, uint32_t delay_ms);
         void reboot2(struct picoboot_reboot2_cmd *cmd);
         void exec(uint32_t addr);
-        // void exec2(struct picoboot_exec2_cmd *cmd); // currently unused
         void get_info(struct picoboot_get_info_cmd *get_info_cmd, uint8_t *buffer, uint32_t len);
         void flash_erase(uint32_t addr, uint32_t len);
         void vector(uint32_t addr);