summaryrefslogtreecommitdiff
path: root/arch/config.mk
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-24 07:03:11 +0100
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-24 07:04:14 +0100
commit1b108126c12b97c379a899bc3d2dba1b65ef59df (patch)
tree9ecc2ca4e3b8d4dccb44b90e46b09c0081677082 /arch/config.mk
parentd111373489fb9d6e842a298d83399dab25fe6aa9 (diff)
Adding skeleton OS directory, and fixing the ldscript.
Diffstat (limited to 'arch/config.mk')
-rw-r--r--arch/config.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/config.mk b/arch/config.mk
index be2ecb9..a475d59 100644
--- a/arch/config.mk
+++ b/arch/config.mk
@@ -4,9 +4,9 @@ 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
+else
+LDSCRIPT = $(ROOTDIR)/arch/arm/lpc17xx/ldscript
endif
endif
endif