diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt index d10e7b937b..f5ed07ffd5 100644 --- a/configs/arduino-due/README.txt +++ b/configs/arduino-due/README.txt @@ -827,12 +827,12 @@ Arduino DUE-specific Configuration Options Some subsystems can be configured to operate in different ways. The drivers need to know how to configure the subsystem. - CONFIG_GPIOA_IRQ - CONFIG_GPIOB_IRQ - CONFIG_GPIOC_IRQ - CONFIG_GPIOD_IRQ - CONFIG_GPIOE_IRQ - CONFIG_GPIOF_IRQ + CONFIG_SAM34_GPIOA_IRQ + CONFIG_SAM34_GPIOB_IRQ + CONFIG_SAM34_GPIOC_IRQ + CONFIG_SAM34_GPIOD_IRQ + CONFIG_SAM34_GPIOE_IRQ + CONFIG_SAM34_GPIOF_IRQ CONFIG_USART0_ISUART CONFIG_USART1_ISUART CONFIG_USART2_ISUART @@ -1069,8 +1069,8 @@ Configuration sub-directories CONFIG_ADS7843E_THRESHY=39 System Type: - CONFIG_GPIO_IRQ=y : GPIO interrupt support - CONFIG_GPIOACIRQ=y : Enable GPIO interrupts from port C + CONFIG_SAM34_GPIO_IRQ=y : GPIO interrupt support + CONFIG_SAM34_GPIOC_IRQ=y : Enable GPIO interrupts from port C RTOS Features: CONFIG_DISABLE_SIGNALS=n : Signals are required diff --git a/configs/arduino-due/include/board.h b/configs/arduino-due/include/board.h index 16ffc23bfc..e47158116a 100644 --- a/configs/arduino-due/include/board.h +++ b/configs/arduino-due/include/board.h @@ -45,7 +45,7 @@ #ifndef __ASSEMBLY__ # include # include -# ifdef CONFIG_GPIO_IRQ +# ifdef CONFIG_SAM34_GPIO_IRQ # include # endif #endif diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig index 13574c9bb4..0efcb53538 100644 --- a/configs/arduino-due/nsh/defconfig +++ b/configs/arduino-due/nsh/defconfig @@ -91,7 +91,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set CONFIG_ARMV7M_OABI_TOOLCHAIN=y -# CONFIG_GPIO_IRQ is not set +# CONFIG_SAM34_GPIO_IRQ is not set # # AT91SAM3/4 Configuration Options diff --git a/configs/arduino-due/src/sam_touchscreen.c b/configs/arduino-due/src/sam_touchscreen.c index 272a21976b..5e5a22a8d2 100644 --- a/configs/arduino-due/src/sam_touchscreen.c +++ b/configs/arduino-due/src/sam_touchscreen.c @@ -69,8 +69,8 @@ ****************************************************************************/ /* Configuration ************************************************************/ -#ifndef CONFIG_GPIOC_IRQ -# error "Touchscreen support requires CONFIG_GPIOC_IRQ" +#ifndef CONFIG_SAM34_GPIOC_IRQ +# error "Touchscreen support requires CONFIG_SAM34_GPIOC_IRQ" #endif #ifndef CONFIG_ADS7843E_FREQUENCY diff --git a/configs/sam3u-ek/README.txt b/configs/sam3u-ek/README.txt index 0a3f0191bc..34dbc8cb85 100644 --- a/configs/sam3u-ek/README.txt +++ b/configs/sam3u-ek/README.txt @@ -387,9 +387,9 @@ SAM3U-EK-specific Configuration Options Some subsystems can be configured to operate in different ways. The drivers need to know how to configure the subsystem. - CONFIG_GPIOA_IRQ - CONFIG_GPIOB_IRQ - CONFIG_GPIOC_IRQ + CONFIG_SAM34_GPIOA_IRQ + CONFIG_SAM34_GPIOB_IRQ + CONFIG_SAM34_GPIOC_IRQ CONFIG_USART0_ISUART CONFIG_USART1_ISUART CONFIG_USART2_ISUART @@ -617,11 +617,11 @@ Configurations CONFIG_ADS7843E_THRESHY=39 System Type -> Peripherals: - CONFIG_SAM34_SPI0=y : Enable support for SPI + CONFIG_SAM34_SPI0=y : Enable support for SPI System Type: - CONFIG_GPIO_IRQ=y : GPIO interrupt support - CONFIG_GPIOA_IRQ=y : Enable GPIO interrupts from port A + CONFIG_SAM34_GPIO_IRQ=y : GPIO interrupt support + CONFIG_SAM34_GPIOA_IRQ=y : Enable GPIO interrupts from port A RTOS Features: CONFIG_DISABLE_SIGNALS=n : Signals are required diff --git a/configs/sam3u-ek/include/board.h b/configs/sam3u-ek/include/board.h index 5b638f290c..3b37fe0e09 100644 --- a/configs/sam3u-ek/include/board.h +++ b/configs/sam3u-ek/include/board.h @@ -44,7 +44,7 @@ #ifndef __ASSEMBLY__ # include -# ifdef CONFIG_GPIO_IRQ +# ifdef CONFIG_SAM34_GPIO_IRQ # include # endif #endif diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig index 4e706f0481..30bd2771d6 100644 --- a/configs/sam3u-ek/knsh/defconfig +++ b/configs/sam3u-ek/knsh/defconfig @@ -115,7 +115,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set CONFIG_ARMV7M_OABI_TOOLCHAIN=y -# CONFIG_GPIO_IRQ is not set +# CONFIG_SAM34_GPIO_IRQ is not set CONFIG_ARCH_HAVE_EXTNAND=y CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTSRAM0=y diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig index 0b295f3ea6..9f554751ec 100644 --- a/configs/sam3u-ek/nsh/defconfig +++ b/configs/sam3u-ek/nsh/defconfig @@ -109,7 +109,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set CONFIG_ARMV7M_OABI_TOOLCHAIN=y -# CONFIG_GPIO_IRQ is not set +# CONFIG_SAM34_GPIO_IRQ is not set CONFIG_ARCH_HAVE_EXTNAND=y CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTSRAM0=y diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig index f60732cce6..4bf97573e7 100644 --- a/configs/sam3u-ek/nx/defconfig +++ b/configs/sam3u-ek/nx/defconfig @@ -109,7 +109,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set CONFIG_ARMV7M_OABI_TOOLCHAIN=y -# CONFIG_GPIO_IRQ is not set +# CONFIG_SAM34_GPIO_IRQ is not set CONFIG_ARCH_HAVE_EXTNAND=y CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTSRAM0=y diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig index b026c33744..ca3b3d06a8 100644 --- a/configs/sam3u-ek/nxwm/defconfig +++ b/configs/sam3u-ek/nxwm/defconfig @@ -109,7 +109,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set CONFIG_ARMV7M_OABI_TOOLCHAIN=y -CONFIG_GPIO_IRQ=y +CONFIG_SAM34_GPIO_IRQ=y CONFIG_ARCH_HAVE_EXTNAND=y CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTSRAM0=y @@ -204,9 +204,9 @@ CONFIG_SAM34_UART0=y # # AT91SAM3/4 GPIO Interrupt Configuration # -CONFIG_GPIOA_IRQ=y -# CONFIG_GPIOB_IRQ is not set -# CONFIG_GPIOC_IRQ is not set +CONFIG_SAM34_GPIOA_IRQ=y +# CONFIG_SAM34_GPIOB_IRQ is not set +# CONFIG_SAM34_GPIOC_IRQ is not set # # Architecture Options diff --git a/configs/sam3u-ek/src/up_buttons.c b/configs/sam3u-ek/src/up_buttons.c index 40d0f910a1..8406025de1 100644 --- a/configs/sam3u-ek/src/up_buttons.c +++ b/configs/sam3u-ek/src/up_buttons.c @@ -60,7 +60,7 @@ * Private Data ****************************************************************************/ -#if defined(CONFIG_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) +#if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) static xcpt_t g_irqbutton1; static xcpt_t g_irqbutton2; #endif @@ -77,7 +77,7 @@ static xcpt_t g_irqbutton2; * ****************************************************************************/ -#if defined(CONFIG_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) +#if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) static xcpt_t board_button_irqx(int irq, xcpt_t irqhandler, xcpt_t *store) { xcpt_t oldhandler; @@ -167,7 +167,7 @@ uint8_t board_buttons(void) * ****************************************************************************/ -#if defined(CONFIG_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) +#if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) xcpt_t board_button_irq(int id, xcpt_t irqhandler) { if (id == BUTTON1) diff --git a/configs/sam3u-ek/src/up_touchscreen.c b/configs/sam3u-ek/src/up_touchscreen.c index c3db19d04a..7aa1a5cec2 100644 --- a/configs/sam3u-ek/src/up_touchscreen.c +++ b/configs/sam3u-ek/src/up_touchscreen.c @@ -66,8 +66,8 @@ # error "Touchscreen support requires CONFIG_SAM34_SPI0" #endif -#ifndef CONFIG_GPIOA_IRQ -# error "Touchscreen support requires CONFIG_GPIOA_IRQ" +#ifndef CONFIG_SAM34_GPIOA_IRQ +# error "Touchscreen support requires CONFIG_SAM34_GPIOA_IRQ" #endif #ifndef CONFIG_ADS7843E_FREQUENCY diff --git a/configs/sam4e-ek/README.txt b/configs/sam4e-ek/README.txt index ba9459072e..c69f2766ac 100644 --- a/configs/sam4e-ek/README.txt +++ b/configs/sam4e-ek/README.txt @@ -614,7 +614,7 @@ USB Full-Speed Device ------------------ The Mass Storage Class (MSC) class driver can be selected for use with - UDP. Note: The following assumes that the internal AT24 Serial FLASH + UDP. Note: The following assumes that the internal AT25 Serial FLASH is configured to support a FAT file system through an FTL layer as described about under "AT25 Serial FLASH". @@ -797,8 +797,8 @@ Touchscreen CONFIG_SAM34_SPI0=y : Enable support for SPI System Type: - CONFIG_GPIO_IRQ=y : GPIO interrupt support - CONFIG_GPIOA_IRQ=y : Enable GPIO interrupts from port A + CONFIG_SAM34_GPIO_IRQ=y : GPIO interrupt support + CONFIG_SAM34_GPIOA_IRQ=y : Enable GPIO interrupts from port A RTOS Features: CONFIG_DISABLE_SIGNALS=n : Signals are required @@ -937,21 +937,21 @@ SAM4E-EK-specific Configuration Options Some subsystems can be configured to operate in different ways. The drivers need to know how to configure the subsystem. - CONFIG_GPIOA_IRQ - CONFIG_GPIOB_IRQ - CONFIG_GPIOC_IRQ - CONFIG_GPIOD_IRQ - CONFIG_GPIOE_IRQ - CONFIG_GPIOF_IRQ - CONFIG_GPIOG_IRQ - CONFIG_GPIOH_IRQ - CONFIG_GPIOJ_IRQ - CONFIG_GPIOK_IRQ - CONFIG_GPIOL_IRQ - CONFIG_GPIOM_IRQ - CONFIG_GPION_IRQ - CONFIG_GPIOP_IRQ - CONFIG_GPIOQ_IRQ + CONFIG_SAM34_GPIOA_IRQ + CONFIG_SAM34_GPIOB_IRQ + CONFIG_SAM34_GPIOC_IRQ + CONFIG_SAM34_GPIOD_IRQ + CONFIG_SAM34_GPIOE_IRQ + CONFIG_SAM34_GPIOF_IRQ + CONFIG_SAM34_GPIOG_IRQ + CONFIG_SAM34_GPIOH_IRQ + CONFIG_SAM34_GPIOJ_IRQ + CONFIG_SAM34_GPIOK_IRQ + CONFIG_SAM34_GPIOL_IRQ + CONFIG_SAM34_GPIOM_IRQ + CONFIG_SAM34_GPION_IRQ + CONFIG_SAM34_GPIOP_IRQ + CONFIG_SAM34_GPIOQ_IRQ CONFIG_USART0_ISUART CONFIG_USART1_ISUART @@ -1168,7 +1168,7 @@ Configurations in that this configurations uses a USB serial device for console I/O. STATUS: - 2014-3-22: Partially functional, but not yet reliable. + 2014-3-23: This configuration appears to be fully functional. NOTES: @@ -1219,7 +1219,7 @@ Configurations USB debug off and USB trace on (see below). 4. Enabling USB monitor SYSLOG output. See the paragraph entitle - " Debugging USB Device" for a summary of the configuration settings + "Debugging USB Device" for a summary of the configuration settings needed to enable the USB monitor and get USB debug data out UART0. 5. By default, this configuration uses the CDC/ACM serial device to diff --git a/configs/sam4e-ek/include/board.h b/configs/sam4e-ek/include/board.h index bcd7928192..ef981a1d7f 100644 --- a/configs/sam4e-ek/include/board.h +++ b/configs/sam4e-ek/include/board.h @@ -44,7 +44,7 @@ #ifndef __ASSEMBLY__ # include -# ifdef CONFIG_GPIO_IRQ +# ifdef CONFIG_SAM34_GPIO_IRQ # include # endif #endif diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig index 090b9fda33..aaac295e0c 100644 --- a/configs/sam4e-ek/nsh/defconfig +++ b/configs/sam4e-ek/nsh/defconfig @@ -120,7 +120,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set -# CONFIG_GPIO_IRQ is not set +# CONFIG_SAM34_GPIO_IRQ is not set CONFIG_ARCH_HAVE_EXTNAND=y CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTSRAM0=y diff --git a/configs/sam4e-ek/src/sam_buttons.c b/configs/sam4e-ek/src/sam_buttons.c index 42d6f3ec29..9f6283878c 100644 --- a/configs/sam4e-ek/src/sam_buttons.c +++ b/configs/sam4e-ek/src/sam_buttons.c @@ -60,7 +60,7 @@ * Private Data ****************************************************************************/ -#if defined(CONFIG_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) +#if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) static xcpt_t g_irq_scrollup; static xcpt_t g_irq_scrolldown; static xcpt_t g_irq_waku; @@ -79,7 +79,7 @@ static xcpt_t g_irq_tamp; * ****************************************************************************/ -#if defined(CONFIG_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) +#if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) static xcpt_t board_button_irqx(int irq, xcpt_t irqhandler, xcpt_t *store) { xcpt_t oldhandler; @@ -173,7 +173,7 @@ uint8_t board_buttons(void) * ****************************************************************************/ -#if defined(CONFIG_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) +#if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) xcpt_t board_button_irq(int id, xcpt_t irqhandler) { switch (id) diff --git a/configs/sam4e-ek/src/sam_touchscreen.c b/configs/sam4e-ek/src/sam_touchscreen.c index 19a8dad1ec..7965ad5498 100644 --- a/configs/sam4e-ek/src/sam_touchscreen.c +++ b/configs/sam4e-ek/src/sam_touchscreen.c @@ -66,8 +66,8 @@ # error "Touchscreen support requires CONFIG_SAM34_SPI0" #endif -#ifndef CONFIG_GPIOA_IRQ -# error "Touchscreen support requires CONFIG_GPIOA_IRQ" +#ifndef CONFIG_SAM34_GPIOA_IRQ +# error "Touchscreen support requires CONFIG_SAM34_GPIOA_IRQ" #endif #ifndef CONFIG_ADS7843E_FREQUENCY diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig index 5272efb0ce..d2636b99bb 100644 --- a/configs/sam4e-ek/usbnsh/defconfig +++ b/configs/sam4e-ek/usbnsh/defconfig @@ -110,7 +110,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set -# CONFIG_GPIO_IRQ is not set +# CONFIG_SAM34_GPIO_IRQ is not set CONFIG_ARCH_HAVE_EXTNAND=y CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTSRAM0=y diff --git a/configs/sam4l-xplained/README.txt b/configs/sam4l-xplained/README.txt index e0a760f9ed..677e793d2e 100644 --- a/configs/sam4l-xplained/README.txt +++ b/configs/sam4l-xplained/README.txt @@ -574,9 +574,9 @@ SAM4L Xplained Pro-specific Configuration Options Some subsystems can be configured to operate in different ways. The drivers need to know how to configure the subsystem. - CONFIG_GPIOA_IRQ - CONFIG_GPIOB_IRQ - CONFIG_GPIOC_IRQ + CONFIG_SAM34_GPIOA_IRQ + CONFIG_SAM34_GPIOB_IRQ + CONFIG_SAM34_GPIOC_IRQ CONFIG_USART0_ISUART CONFIG_USART1_ISUART CONFIG_USART2_ISUART diff --git a/configs/sam4l-xplained/include/board.h b/configs/sam4l-xplained/include/board.h index 7bdd895429..b3582e86e8 100644 --- a/configs/sam4l-xplained/include/board.h +++ b/configs/sam4l-xplained/include/board.h @@ -44,7 +44,7 @@ #ifndef __ASSEMBLY__ # include -# ifdef CONFIG_GPIO_IRQ +# ifdef CONFIG_SAM34_GPIO_IRQ # include # endif #endif diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig index a019a3739c..31d74eab67 100644 --- a/configs/sam4l-xplained/nsh/defconfig +++ b/configs/sam4l-xplained/nsh/defconfig @@ -109,7 +109,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set CONFIG_ARMV7M_OABI_TOOLCHAIN=y -# CONFIG_GPIO_IRQ is not set +# CONFIG_SAM34_GPIO_IRQ is not set # # AT91SAM3/4 Configuration Options diff --git a/configs/sam4l-xplained/src/sam_buttons.c b/configs/sam4l-xplained/src/sam_buttons.c index 2d61756521..13401d3ac9 100644 --- a/configs/sam4l-xplained/src/sam_buttons.c +++ b/configs/sam4l-xplained/src/sam_buttons.c @@ -60,7 +60,7 @@ * Private Data ****************************************************************************/ -#if defined(CONFIG_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) +#if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) static xcpt_t g_irqsw0; #endif @@ -122,7 +122,7 @@ uint8_t board_buttons(void) * ****************************************************************************/ -#if defined(CONFIG_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) +#if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) xcpt_t board_button_irq(int id, xcpt_t irqhandler) { xcpt_t oldhandler = NULL; diff --git a/configs/sam4s-xplained/README.txt b/configs/sam4s-xplained/README.txt index 7d40e937fb..15d581926a 100644 --- a/configs/sam4s-xplained/README.txt +++ b/configs/sam4s-xplained/README.txt @@ -464,9 +464,9 @@ SAM4S Xplained-specific Configuration Options Some subsystems can be configured to operate in different ways. The drivers need to know how to configure the subsystem. - CONFIG_GPIOA_IRQ - CONFIG_GPIOB_IRQ - CONFIG_GPIOC_IRQ + CONFIG_SAM34_GPIOA_IRQ + CONFIG_SAM34_GPIOB_IRQ + CONFIG_SAM34_GPIOC_IRQ CONFIG_USART0_ISUART CONFIG_USART1_ISUART CONFIG_USART2_ISUART diff --git a/configs/sam4s-xplained/include/board.h b/configs/sam4s-xplained/include/board.h index e4133a6fd3..87f272cc7f 100644 --- a/configs/sam4s-xplained/include/board.h +++ b/configs/sam4s-xplained/include/board.h @@ -44,7 +44,7 @@ #ifndef __ASSEMBLY__ # include -# ifdef CONFIG_GPIO_IRQ +# ifdef CONFIG_SAM34_GPIO_IRQ # include # endif #endif @@ -61,7 +61,7 @@ #ifndef __ASSEMBLY__ # include -# ifdef CONFIG_GPIO_IRQ +# ifdef CONFIG_SAM34_GPIO_IRQ # include # endif #endif diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig index a69c5f5a03..c27cb128c0 100644 --- a/configs/sam4s-xplained/nsh/defconfig +++ b/configs/sam4s-xplained/nsh/defconfig @@ -109,7 +109,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set CONFIG_ARMV7M_OABI_TOOLCHAIN=y -# CONFIG_GPIO_IRQ is not set +# CONFIG_SAM34_GPIO_IRQ is not set CONFIG_ARCH_HAVE_EXTNAND=y CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTSRAM0=y diff --git a/configs/sam4s-xplained/src/sam_buttons.c b/configs/sam4s-xplained/src/sam_buttons.c index ce7e68e612..f5b06c6fa0 100644 --- a/configs/sam4s-xplained/src/sam_buttons.c +++ b/configs/sam4s-xplained/src/sam_buttons.c @@ -120,7 +120,7 @@ uint8_t board_buttons(void) * ****************************************************************************/ -#if defined(CONFIG_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) +#if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) xcpt_t board_button_irq(int id, xcpt_t irqhandler) { xcpt_t oldhandler = NULL;