aboutsummaryrefslogtreecommitdiff
path: root/examples/lpc43xx
diff options
context:
space:
mode:
authorchrysn2012-10-29 14:34:42 +0100
committerchrysn2012-10-29 14:34:42 +0100
commita01e5c201bca79b9dc4fe4363d843f8c7dad5290 (patch)
tree557308df3df94393c51164d7bfb193787877878c /examples/lpc43xx
parente55a9e387560924a157d60b29a3aa49300b9b456 (diff)
parentf594af86c8515889565bbc17d13e16d8f56eea9f (diff)
Merge branch 'generalizations'
this merges common c and header files of different architectures, adds a dispatch mechanism and yaml descriptions of interrupt handlers from which the whole interrupt table setup c code is generated.
Diffstat (limited to 'examples/lpc43xx')
-rw-r--r--examples/lpc43xx/Makefile.include2
-rw-r--r--examples/lpc43xx/hackrf-jellybean/systick/systickdemo.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/lpc43xx/Makefile.include b/examples/lpc43xx/Makefile.include
index 15e523b..cf78538 100644
--- a/examples/lpc43xx/Makefile.include
+++ b/examples/lpc43xx/Makefile.include
@@ -41,7 +41,7 @@ endif
CFLAGS += -O2 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
-mcpu=cortex-m4 -mthumb -MD \
- -mfloat-abi=hard -mfpu=fpv4-sp-d16
+ -mfloat-abi=hard -mfpu=fpv4-sp-d16 -DLPC43XX
LDSCRIPT ?= $(BINARY).ld
LDFLAGS += -L$(TOOLCHAIN_DIR)/lib \
-T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections -Xlinker -Map=$(BINARY).map
diff --git a/examples/lpc43xx/hackrf-jellybean/systick/systickdemo.c b/examples/lpc43xx/hackrf-jellybean/systick/systickdemo.c
index 66c8e06..d38b0bc 100644
--- a/examples/lpc43xx/hackrf-jellybean/systick/systickdemo.c
+++ b/examples/lpc43xx/hackrf-jellybean/systick/systickdemo.c
@@ -20,8 +20,8 @@
#include <libopencm3/lpc43xx/gpio.h>
#include <libopencm3/lpc43xx/scu.h>
#include <libopencm3/lpc43xx/cgu.h>
-#include <libopencm3/lpc43xx/nvic.h>
-#include <libopencm3/lpc43xx/systick.h>
+#include <libopencm3/cm3/nvic.h>
+#include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scs.h>
#include "../jellybean_conf.h"