summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-24 22:31:23 +0100
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-24 22:31:23 +0100
commit175b7cdd07bf2266b278de829dbf105b19a198c0 (patch)
treeeaec8629e7443a2855ef8899611ca5ae267fabb1
parent227eccf5b8eddce33c7a19a81eb5564a2b01ddca (diff)
Compiling the debug framework, and fixing it slightly.
-rw-r--r--arch/Makefile2
-rw-r--r--arch/arm/lpc17xx/Drivers/source/debug_frmwrk.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/Makefile b/arch/Makefile
index d5c09d1..0ce1809 100644
--- a/arch/Makefile
+++ b/arch/Makefile
@@ -10,7 +10,7 @@ ifeq ($(CPU),arm)
ifeq ($(CPU_FLAVOR),lpc1768)
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 arm/lpc17xx/hooks.c
+TARGET_SRCS += arm/lpc17xx/startup.s arm/lpc17xx/hooks.c arm/lpc17xx/Drivers/source/debug_frmwrk.c
endif
endif
diff --git a/arch/arm/lpc17xx/Drivers/source/debug_frmwrk.c b/arch/arm/lpc17xx/Drivers/source/debug_frmwrk.c
index 7e63e04..e318ee2 100644
--- a/arch/arm/lpc17xx/Drivers/source/debug_frmwrk.c
+++ b/arch/arm/lpc17xx/Drivers/source/debug_frmwrk.c
@@ -261,7 +261,7 @@ void debug_frmwrk_init(void)
PINSEL_ConfigPin(&PinCfg);
PinCfg.Pinnum = 3;
PINSEL_ConfigPin(&PinCfg);
-#elif #if (USED_UART_DEBUG_PORT==1)
+#elif (USED_UART_DEBUG_PORT==1)
/*
* Initialize UART1 pin connect
*/