From 63292419c8b7eb931620c1cedf0486c803f3716a Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Thu, 2 Jan 2014 15:10:09 -0800
Subject: [PATCH] Moved M0 memory region to larger first AHB region (32K),
 moved USB bulk buffers to smaller AHB RAM area.

---
 firmware/common/LPC4330_M0.ld            | 2 +-
 firmware/common/LPC4330_M4.ld            | 4 ++--
 firmware/common/LPC4330_M4_rom_to_ram.ld | 2 +-
 firmware/hackrf_usb/usb_bulk_buffer.c    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/firmware/common/LPC4330_M0.ld b/firmware/common/LPC4330_M0.ld
index 787f3f9a..3ec9ad54 100644
--- a/firmware/common/LPC4330_M0.ld
+++ b/firmware/common/LPC4330_M0.ld
@@ -22,7 +22,7 @@
 
 MEMORY
 {
-	ram (rwx) : ORIGIN = 0x00000000, LENGTH = 4K
+	ram (rwx) : ORIGIN = 0x00000000, LENGTH = 32K
 }
 
 /* Include the common ld script. */
diff --git a/firmware/common/LPC4330_M4.ld b/firmware/common/LPC4330_M4.ld
index 199ba807..013c9ddf 100644
--- a/firmware/common/LPC4330_M4.ld
+++ b/firmware/common/LPC4330_M4.ld
@@ -35,7 +35,7 @@ MEMORY
 	 * to get performance benefit of having two USB buffers addressable
 	 * simultaneously (on two different buses of the AHB multilayer matrix)
 	 */
-	ram_m0 (rwx) : ORIGIN = 0x2000C000, LENGTH = 16K
+	ram_m0 (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
 }
 
 /* Include the common ld script. */
@@ -43,7 +43,7 @@ INCLUDE libopencm3_lpc43xx.ld
 
 SECTIONS
 {
-	.m0 0x2000C000 : {
+	.m0 0x20000000 : {
 		PROVIDE(__m0_start__ = .);
 		KEEP(*(.m0_bin*));
 		. = ALIGN(4);
diff --git a/firmware/common/LPC4330_M4_rom_to_ram.ld b/firmware/common/LPC4330_M4_rom_to_ram.ld
index 0f8114f4..588eb6f8 100644
--- a/firmware/common/LPC4330_M4_rom_to_ram.ld
+++ b/firmware/common/LPC4330_M4_rom_to_ram.ld
@@ -36,7 +36,7 @@ MEMORY
 	 * to get performance benefit of having two USB buffers addressable
 	 * simultaneously (on two different buses of the AHB multilayer matrix)
 	 */
-	ram_m0 (rwx) : ORIGIN = 0x2000C000, LENGTH = 16K
+	ram_m0 (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
 }
 
 /* Include the common ld script. */
diff --git a/firmware/hackrf_usb/usb_bulk_buffer.c b/firmware/hackrf_usb/usb_bulk_buffer.c
index 3e6d0320..b4da7e6d 100644
--- a/firmware/hackrf_usb/usb_bulk_buffer.c
+++ b/firmware/hackrf_usb/usb_bulk_buffer.c
@@ -22,6 +22,6 @@
 
 #include "usb_bulk_buffer.h"
 
-uint8_t* const usb_bulk_buffer = (uint8_t*)0x20004000;
+uint8_t* const usb_bulk_buffer = (uint8_t*)0x20008000;
 const uint32_t usb_bulk_buffer_mask = 32768 - 1;
 volatile uint32_t usb_bulk_buffer_offset = 0;