Merge pull request #9 from TitanMKD/master

Fixed Linker ROM to RAM

examples/lpc43xx/hackrf-jellybean/jellybean-lpc4330_rom_to_ram.ld

@@ -28,7 +28,8 @@ MEMORY
   /* rom is really the shadow region that points to SPI flash or elsewhere */
   rom (rx)  : ORIGIN = 0x00000000, LENGTH =  1M
   ram (rwx) : ORIGIN = 0x10000000, LENGTH =  128K
-  /* there are some additional RAM regions */
+  /* there are some additional RAM regions for data */
+  ram_data (rw) : ORIGIN = 0x10080000, LENGTH =  72K
 }
 
 /* Include the common ld script. */

include/libopencm3/lpc43xx/gpio.h

@@ -155,5 +155,6 @@
 
 void gpio_set(u32 gpioport, u32 gpios);
 void gpio_clear(u32 gpioport, u32 gpios);
+void gpio_toggle(u32 gpioport, u32 gpios);
 
 #endif

lib/lpc43xx/Makefile

@@ -25,7 +25,7 @@ PREFIX		?= arm-none-eabi
 #PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 AR		= $(PREFIX)-ar
-CFLAGS		= -O2 -g -Wall -Wextra -I../../include -fno-common \
+CFLAGS		= -O2 -g3 -Wall -Wextra -I../../include -fno-common \
 		  -mcpu=cortex-m4 -mthumb -Wstrict-prototypes \
 		  -ffunction-sections -fdata-sections -MD \
 		  -mfloat-abi=hard -mfpu=fpv4-sp-d16

lib/lpc43xx/gpio.c

@@ -26,5 +26,10 @@ void gpio_set(u32 gpioport, u32 gpios)
 
 void gpio_clear(u32 gpioport, u32 gpios)
 {
-        GPIO_CLR(gpioport) = gpios;
+	GPIO_CLR(gpioport) = gpios;
 }
+
+void gpio_toggle(u32 gpioport, u32 gpios)
+{
+	GPIO_NOT(gpioport) = gpios;
+}

lib/lpc43xx/libopencm3_lpc43xx_rom_to_ram.ld

@@ -36,7 +36,7 @@ SECTIONS
 
 	.text : {
 		. = ALIGN(0x400);
-		_text_ram = . + ORIGIN(ram); /* Start of Code in RAM */
+		_text_ram = (. - ORIGIN(rom)) + ORIGIN(ram); /* Start of Code in RAM */
 
 		*(.vectors)	/* Vector table */
 		*(.text*)	/* Program code */
@@ -53,29 +53,29 @@ SECTIONS
 	__exidx_end = .;
 
 	_etext = .;
-	_etext_ram = . + ORIGIN(ram);
+	_etext_ram = (. - ORIGIN(rom)) + ORIGIN(ram);
-	_etext_rom = . + ORIGIN(rom_flash);
+	_etext_rom = (. - ORIGIN(rom)) + ORIGIN(rom_flash);
-
-	. = ORIGIN(ram);
 
 	.data : {
 		_data = .;
 		*(.data*)	/* Read-write initialized data */
 		. = ALIGN(4);
 		_edata = .;
-	} >ram AT >rom
+	} >ram_data AT >rom
 
 	.bss : {
+		. = _edata;
 		*(.bss*)	/* Read-write zero initialized data */
 		*(COMMON)
 		. = ALIGN(4);
 		_ebss = .;
-	} >ram
+	} >ram_data
 
 	/* exception unwind data - required due to libgcc.a issuing /0 exceptions */
 	.ARM.extab : {
+		. = _ebss;
 		*(.ARM.extab*)
-	} >ram
+	} >ram_data
 
 	/*
 	 * The .eh_frame section appears to be used for C++ exception handling.

lib/lpc43xx/vector.c

@@ -171,6 +171,9 @@ void reset_handler(void)
 	if( (&_etext_ram-&_text_ram) > 0 )
 	{
 		src = &_etext_rom-(&_etext_ram-&_text_ram);
+		/* Change Shadow memory to ROM (for Debug Purpose in case Boot has not set correctly the M4MEMMAP because of debug) */
+		CREG_M4MEMMAP = (unsigned long)src;
+
 		for(dest = &_text_ram; dest < &_etext_ram; )
 		{
 			*dest++ = *src++;