From 3e04194edd06ef13517d0ca7b038695e402fdaa0 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 3 Jul 2015 09:33:52 -0600 Subject: [PATCH] SAM4L: GPIO interrupts are not yet supported; can't compile sam_gpioirq.c yet --- arch/arm/src/sam34/Kconfig | 1 + arch/arm/src/sam34/Make.defs | 6 +++--- configs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig index fc504b6f2a..56c7ff2c9f 100644 --- a/arch/arm/src/sam34/Kconfig +++ b/arch/arm/src/sam34/Kconfig @@ -927,6 +927,7 @@ config SAM34_HAVE_GPIOF_IRQ config SAM34_GPIO_IRQ bool "GPIO pin interrupts" + depends on !ARCH_CHIP_SAM4L ---help--- Enable support for interrupting GPIO pins diff --git a/arch/arm/src/sam34/Make.defs b/arch/arm/src/sam34/Make.defs index f5d690ea1b..2e8a03d93a 100644 --- a/arch/arm/src/sam34/Make.defs +++ b/arch/arm/src/sam34/Make.defs @@ -101,8 +101,8 @@ endif # Required SAM3/4 files CHIP_ASRCS = -CHIP_CSRCS = sam_allocateheap.c sam_gpioirq.c sam_irq.c sam_lowputc.c -CHIP_CSRCS += sam_serial.c sam_start.c +CHIP_CSRCS = sam_allocateheap.c sam_irq.c sam_lowputc.c sam_serial.c +CHIP_CSRCS += sam_start.c # Configuration-dependent SAM3/4 files @@ -125,7 +125,7 @@ endif ifeq ($(CONFIG_ARCH_CHIP_SAM4L),y) CHIP_CSRCS += sam4l_clockconfig.c sam4l_periphclks.c sam4l_gpio.c else -CHIP_CSRCS += sam_clockconfig.c sam_gpio.c +CHIP_CSRCS += sam_clockconfig.c sam_gpio.c sam_gpioirq.c endif ifeq ($(CONFIG_BUILD_PROTECTED),y) diff --git a/configs b/configs index 93f51860e7..a78d478e6f 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit 93f51860e7fbeb984ce9424b878bf2e7235c1c5f +Subproject commit a78d478e6f91e08438cb19538797ae5a573da96c