summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-24 06:20:27 +0100
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-24 06:29:12 +0100
commit6c17623845a0d42285d77bdd8bbf177badf5b9f6 (patch)
tree3db8b0fa214264ac089d16bbcf4a3c533b8d7629 /arch
parente9b4b3d26eae1a07c9c2d948e51250792beea075 (diff)
Shuffled a few configuration items around, and added a barebone demo source code.
Diffstat (limited to 'arch')
-rw-r--r--arch/Makefile2
-rw-r--r--arch/config.mk12
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/Makefile b/arch/Makefile
index 89121a0..60f44bf 100644
--- a/arch/Makefile
+++ b/arch/Makefile
@@ -3,10 +3,10 @@ TARGET_LIB = libarch.a
all: $(TARGET_LIB)
include $(ROOTDIR)/common.mk
+include config.mk
ifeq ($(CPU),arm)
ifeq ($(CPU_FLAVOR),lpc1768)
-TARGET_INCLUDES += arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx arm/lpc17xx/Core/CM3/CoreSupport arm/lpc17xx/Drivers/include
TARGET_SRCS += arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx/system_LPC17xx.c arm/lpc17xx/Core/CM3/CoreSupport/core_cm3.c
TARGET_SRCS += $(addprefix arm/lpc17xx/Drivers/source/lpc17xx_, spi.c rit.c exti.c wdt.c uart.c dac.c rtc.c i2s.c pwm.c mcpwm.c pinsel.c nvic.c emac.c systick.c ssp.c can.c gpio.c libcfg_default.c i2c.c timer.c gpdma.c clkpwr.c qei.c adc.c)
TARGET_SRCS += arm/lpc17xx/startup.s
diff --git a/arch/config.mk b/arch/config.mk
new file mode 100644
index 0000000..be2ecb9
--- /dev/null
+++ b/arch/config.mk
@@ -0,0 +1,12 @@
+include $(ROOTDIR)/common.mk
+
+ifeq ($(CPU),arm)
+ifeq ($(CPU_FLAVOR),lpc1768)
+TARGET_INCLUDES += $(ROOTDIR)/arch/arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx $(ROOTDIR)/arch/arm/lpc17xx/Core/CM3/CoreSupport $(ROOTDIR)/arch/arm/lpc17xx/Drivers/include
+ifeq ($(USE_MPU),true)
+LDSCRIPT = $(ROOTDIR)/arch/arm/lpc17xx/ldscript
+else
+LDSCRIPT = $(ROOTDIR)/arch/arm/lpc17xx/ldscript-mpu
+endif
+endif
+endif