refactor nrf code

Author: cpq

templates/blinky/nRF52840dk/Makefile

@@ -1,17 +1,19 @@
 CFLAGS ?= -W -Wall -Wextra -Werror -Wundef -Wshadow -Wdouble-promotion -Wformat-truncation -fno-common
-CFLAGS += -g3 -Os -ffunction-sections -fdata-sections -Wno-shadow
-CFLAGS += -mcpu=cortex-m4
+CFLAGS += -g3 -O0 -ffunction-sections -fdata-sections -Wno-shadow
+CFLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16
+LDFLAGS ?= -Tlink.ld -nostartfiles -nostdlib --specs nano.specs -lc -lgcc -Wl,--gc-sections
 SOURCES = main.c
 
-build: 
-	mkdir build
-	arm-none-eabi-gcc $(SOURCES) -c $(CFLAGS) -o ./build/main.o
-	arm-none-eabi-gcc -T link.ld -nostdlib ./build/main.o -o ./build/firmware.elf
-	arm-none-eabi-objcopy -Oihex ./build/firmware.elf ./build/firmware.hex
+
+firmware.elf: hal.h link.ld Makefile $(SOURCES) 
+	arm-none-eabi-gcc $(SOURCES) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
+
+firwmare.hex:
+	arm-none-eabi-objcopy -Oihex firmware.elf firmware.hex
 
 flash: 
-	nrfjprog -f NRF52 --program ./build/firmware.hex --recover --verify
+	nrfjprog -f NRF52 --program firmware.hex --recover --verify
 	nrfjprog -f NRF52 --reset
 
 clean:
-	rm -rf ./build 
+	rm -rf firmware.*

templates/blinky/nRF52840dk/hal.h

@@ -1,45 +1,34 @@
 #define P0 ((struct gpio *) 0x50000000)
 #define P1 ((struct gpio *) 0x50000300)
 
-#define BUILT_IN_BUTTON_4_PIN 25
-#define BUILT_IN_BUTTON_3_PIN 24
-#define BUILT_IN_BUTTON_2_PIN 12
-#define BUILT_IN_BUTTON_1_PIN 11
-#define BUILT_IN_LED_1_PIN 13
-#define BUILT_IN_LED_2_PIN 14
-#define BUILT_IN_LED_3_PIN 15
-#define BUILT_IN_LED_4_PIN 16
-
 enum { GPIO_MODE_INPUT, GPIO_MODE_OUTPUT };
 enum { LOW, HIGH };
 
 struct gpio {
-  volatile uint32_t RESERVED[321], OUT, OUTSET, OUTCLR, IN, DIR, DIRSET, DIRCLR, LATCH, DETECTMODE, RESERVED_SECOND[118], PIN_CNF[32];
+  volatile uint32_t RESERVED[321], OUT, OUTSET, OUTCLR, IN, DIR, DIRSET, DIRCLR,
+      LATCH, DETECTMODE, RESERVED_SECOND[118], PIN_CNF[32];
 };
 
-void set_gpio_mode(struct gpio * port, int pin, int mode, int pull) {
+void set_gpio_mode(struct gpio *port, int pin, int mode, int pull) {
   if (pull == 0) {
     port->PIN_CNF[pin] = mode << 0;
-  }
-  else {
+  } else {
     port->PIN_CNF[pin] = mode << 0 | pull << 2;
   }
 }
 
-int gpio_read(struct gpio * port, int pin) {
+int gpio_read(struct gpio *port, int pin) {
   uint32_t button = ~(port->IN);
   if (button & (1 << pin)) {
     return 1;
-  }
-  else {
+  } else {
     return 0;
   }
 }
-void gpio_write(struct gpio * port, int pin, int value) {
+void gpio_write(struct gpio *port, int pin, int value) {
   if (value == 0) {
     port->OUTSET = 1 << pin;
-  }
-  else {
+  } else {
     port->OUTCLR = 1 << pin;
   }
 }

templates/blinky/nRF52840dk/link.ld

@@ -1,7 +1,6 @@
-ENTRY(_reset);
-
+ENTRY(Reset_Handler);
 MEMORY {
-  flash(rx)  : ORIGIN = 0x00000000, LENGTH = 1M 
+  flash(rx) : ORIGIN = 0x00000000, LENGTH = 1M
   sram(rwx) : ORIGIN = 0x20000000, LENGTH = 256k
 }
 _estack     = ORIGIN(sram) + LENGTH(sram);
@@ -12,19 +11,20 @@ SECTIONS {
   .rodata   : { *(.rodata*) }         > flash
 
   .data : {
-    _sdata = .;   /* .data section start */
+    _sdata = .;
     *(.first_data)
     *(.data SORT(.data.*))
-    _edata = .;  /* .data section end */
+    *(.iram .iram* .iram.*)
+    _edata = .;
   } > sram AT > flash
   _sidata = LOADADDR(.data);
 
   .bss : {
-    _sbss = .;              /* .bss section start */
+    _sbss = .; 
     *(.bss SORT(.bss.*) COMMON)
-    _ebss = .;              /* .bss section end */
+    _ebss = .;
   } > sram
 
   . = ALIGN(8);
-  _end = .;     /* for cmsis_gcc.h  */
+  _end = .;
 }

templates/blinky/nRF52840dk/main.c

@@ -1,28 +1,21 @@
 #include <stdint.h>
 #include "hal.h"
 
+#define LED1 19
+
 int main(void) {
-  set_gpio_mode(P0, BUILT_IN_LED_1_PIN, GPIO_MODE_OUTPUT, 0);
-  set_gpio_mode(P0, BUILT_IN_LED_2_PIN, GPIO_MODE_OUTPUT, 0);
-  set_gpio_mode(P0, BUILT_IN_LED_3_PIN, GPIO_MODE_OUTPUT, 0);
-  set_gpio_mode(P0, BUILT_IN_LED_4_PIN, GPIO_MODE_OUTPUT, 0);
+  set_gpio_mode(P0, LED1, GPIO_MODE_OUTPUT, 0);
 
+  int level = 0;
   while (1) {
-    gpio_write(P0, BUILT_IN_LED_1_PIN, HIGH);
-    gpio_write(P0, BUILT_IN_LED_2_PIN, HIGH);
-    gpio_write(P0, BUILT_IN_LED_3_PIN, HIGH);
-    gpio_write(P0, BUILT_IN_LED_4_PIN, HIGH);
-    spin(9999999);
-    gpio_write(P0, BUILT_IN_LED_4_PIN, LOW);
-    gpio_write(P0, BUILT_IN_LED_3_PIN, LOW);
-    gpio_write(P0, BUILT_IN_LED_2_PIN, LOW);
-    gpio_write(P0, BUILT_IN_LED_1_PIN, LOW);
+    gpio_write(P0, LED1, level);
     spin(9999999);
+    level = !level;
   }
 }
 
 // Startup code
-__attribute__((naked, noreturn)) void _reset(void) {
+__attribute__((naked, noreturn)) void Reset_Handler(void) {
   // memset .bss to zero, and copy .data section to RAM region
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
   for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
@@ -36,5 +29,4 @@ extern void _estack(void);  // Defined in link.ld
 
 // 16 standard and 42 nRF-specific handlers
 __attribute__((section(".vectors"))) void (*const tab[16 + 42])(void) = {
-    _estack, _reset};
-
+    _estack, Reset_Handler};