From 4984a8b681352c10f8e6cce020e1cc65c68aa061 Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Tue, 17 Sep 2013 12:18:33 -0700
Subject: [PATCH] Fix to SPIFI addressing during hackrf_spiflash read
 operation. This fixes mismatches between programmed and read-back data.

---
 firmware/hackrf_usb/hackrf_usb.c | 2 +-
 firmware/libopencm3              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index b33085d9..5f720bf0 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -463,7 +463,7 @@ usb_request_status_t usb_vendor_request_read_spiflash(
 			return USB_REQUEST_STATUS_STALL;
 		} else {
 			/* TODO flush SPIFI "cache" before to read the SPIFI memory */
-			u8_addr_pt = (uint8_t*)addr;
+			u8_addr_pt = (uint8_t*)(addr + SPIFI_DATA_UNCACHED_BASE);
 			for(i=0; i<len; i++)
 			{
 				spiflash_buffer[i] = u8_addr_pt[i];
diff --git a/firmware/libopencm3 b/firmware/libopencm3
index 0b14b17f..0f435b51 160000
--- a/firmware/libopencm3
+++ b/firmware/libopencm3
@@ -1 +1 @@
-Subproject commit 0b14b17fc539247598946465f2f78c5d23cbd4ee
+Subproject commit 0f435b51f60cc8539641789b670f6f003412d744