sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAM3/4: Rename CONFIG_GPIO*_IRQ to CONFIG_SAM34_GPIO*_IRQ in all board-related files

Browse Source
This commit is contained in:
Gregory Nutt 2014-03-23 15:48:10 -06:00
parent 1b0e1aee04
commit 2ba8224cdc
26 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configs/arduino-due/README.txt
View File

@ -827,12 +827,12 @@ Arduino DUE-specific Configuration Options
Some subsystems can be configured to operate in different ways. The drivers Some subsystems can be configured to operate in different ways. The drivers
need to know how to configure the subsystem. need to know how to configure the subsystem.
CONFIG_GPIOA_IRQ CONFIG_SAM34_GPIOA_IRQ
CONFIG_GPIOB_IRQ CONFIG_SAM34_GPIOB_IRQ
CONFIG_GPIOC_IRQ CONFIG_SAM34_GPIOC_IRQ
CONFIG_GPIOD_IRQ CONFIG_SAM34_GPIOD_IRQ
CONFIG_GPIOE_IRQ CONFIG_SAM34_GPIOE_IRQ
CONFIG_GPIOF_IRQ CONFIG_SAM34_GPIOF_IRQ
CONFIG_USART0_ISUART CONFIG_USART0_ISUART
CONFIG_USART1_ISUART CONFIG_USART1_ISUART
CONFIG_USART2_ISUART CONFIG_USART2_ISUART
@ -1069,8 +1069,8 @@ Configuration sub-directories
CONFIG_ADS7843E_THRESHY=39 CONFIG_ADS7843E_THRESHY=39
System Type: System Type:
CONFIG_GPIO_IRQ=y : GPIO interrupt support CONFIG_SAM34_GPIO_IRQ=y : GPIO interrupt support
CONFIG_GPIOACIRQ=y : Enable GPIO interrupts from port C CONFIG_SAM34_GPIOC_IRQ=y : Enable GPIO interrupts from port C
RTOS Features: RTOS Features:
CONFIG_DISABLE_SIGNALS=n : Signals are required CONFIG_DISABLE_SIGNALS=n : Signals are required

2
configs/arduino-due/include/board.h
View File

@ -45,7 +45,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <stdint.h> # include <stdint.h>
# include <stdbool.h> # include <stdbool.h>
# ifdef CONFIG_GPIO_IRQ # ifdef CONFIG_SAM34_GPIO_IRQ
# include <arch/irq.h> # include <arch/irq.h>
# endif # endif
#endif #endif

2
configs/arduino-due/nsh/defconfig
View File

@ -91,7 +91,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_OABI_TOOLCHAIN=y
# CONFIG_GPIO_IRQ is not set # CONFIG_SAM34_GPIO_IRQ is not set
# #
# AT91SAM3/4 Configuration Options # AT91SAM3/4 Configuration Options

4
configs/arduino-due/src/sam_touchscreen.c
View File

@ -69,8 +69,8 @@
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
#ifndef CONFIG_GPIOC_IRQ #ifndef CONFIG_SAM34_GPIOC_IRQ
# error "Touchscreen support requires CONFIG_GPIOC_IRQ" # error "Touchscreen support requires CONFIG_SAM34_GPIOC_IRQ"
#endif #endif
#ifndef CONFIG_ADS7843E_FREQUENCY #ifndef CONFIG_ADS7843E_FREQUENCY

12
configs/sam3u-ek/README.txt
View File

@ -387,9 +387,9 @@ SAM3U-EK-specific Configuration Options
Some subsystems can be configured to operate in different ways. The drivers Some subsystems can be configured to operate in different ways. The drivers
need to know how to configure the subsystem. need to know how to configure the subsystem.
CONFIG_GPIOA_IRQ CONFIG_SAM34_GPIOA_IRQ
CONFIG_GPIOB_IRQ CONFIG_SAM34_GPIOB_IRQ
CONFIG_GPIOC_IRQ CONFIG_SAM34_GPIOC_IRQ
CONFIG_USART0_ISUART CONFIG_USART0_ISUART
CONFIG_USART1_ISUART CONFIG_USART1_ISUART
CONFIG_USART2_ISUART CONFIG_USART2_ISUART
@ -617,11 +617,11 @@ Configurations
CONFIG_ADS7843E_THRESHY=39 CONFIG_ADS7843E_THRESHY=39
System Type -> Peripherals: System Type -> Peripherals:
CONFIG_SAM34_SPI0=y : Enable support for SPI CONFIG_SAM34_SPI0=y : Enable support for SPI
System Type: System Type:
CONFIG_GPIO_IRQ=y : GPIO interrupt support CONFIG_SAM34_GPIO_IRQ=y : GPIO interrupt support
CONFIG_GPIOA_IRQ=y : Enable GPIO interrupts from port A CONFIG_SAM34_GPIOA_IRQ=y : Enable GPIO interrupts from port A
RTOS Features: RTOS Features:
CONFIG_DISABLE_SIGNALS=n : Signals are required CONFIG_DISABLE_SIGNALS=n : Signals are required

2
configs/sam3u-ek/include/board.h
View File

@ -44,7 +44,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <stdint.h> # include <stdint.h>
# ifdef CONFIG_GPIO_IRQ # ifdef CONFIG_SAM34_GPIO_IRQ
# include <arch/irq.h> # include <arch/irq.h>
# endif # endif
#endif #endif

2
configs/sam3u-ek/knsh/defconfig
View File

@ -115,7 +115,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y 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_EXTNAND=y
CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTNOR=y
CONFIG_ARCH_HAVE_EXTSRAM0=y CONFIG_ARCH_HAVE_EXTSRAM0=y

2
configs/sam3u-ek/nsh/defconfig
View File

@ -109,7 +109,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y 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_EXTNAND=y
CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTNOR=y
CONFIG_ARCH_HAVE_EXTSRAM0=y CONFIG_ARCH_HAVE_EXTSRAM0=y

2
configs/sam3u-ek/nx/defconfig
View File

@ -109,7 +109,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y 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_EXTNAND=y
CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTNOR=y
CONFIG_ARCH_HAVE_EXTSRAM0=y CONFIG_ARCH_HAVE_EXTSRAM0=y

8
configs/sam3u-ek/nxwm/defconfig
View File

@ -109,7 +109,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_GPIO_IRQ=y CONFIG_SAM34_GPIO_IRQ=y
CONFIG_ARCH_HAVE_EXTNAND=y CONFIG_ARCH_HAVE_EXTNAND=y
CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTNOR=y
CONFIG_ARCH_HAVE_EXTSRAM0=y CONFIG_ARCH_HAVE_EXTSRAM0=y
@ -204,9 +204,9 @@ CONFIG_SAM34_UART0=y
# #
# AT91SAM3/4 GPIO Interrupt Configuration # AT91SAM3/4 GPIO Interrupt Configuration
# #
CONFIG_GPIOA_IRQ=y CONFIG_SAM34_GPIOA_IRQ=y
# CONFIG_GPIOB_IRQ is not set # CONFIG_SAM34_GPIOB_IRQ is not set
# CONFIG_GPIOC_IRQ is not set # CONFIG_SAM34_GPIOC_IRQ is not set
# #
# Architecture Options # Architecture Options

6
configs/sam3u-ek/src/up_buttons.c
View File

@ -60,7 +60,7 @@
* Private Data * 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_irqbutton1;
static xcpt_t g_irqbutton2; static xcpt_t g_irqbutton2;
#endif #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) static xcpt_t board_button_irqx(int irq, xcpt_t irqhandler, xcpt_t *store)
{ {
xcpt_t oldhandler; 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) xcpt_t board_button_irq(int id, xcpt_t irqhandler)
{ {
if (id == BUTTON1) if (id == BUTTON1)

4
configs/sam3u-ek/src/up_touchscreen.c
View File

@ -66,8 +66,8 @@
# error "Touchscreen support requires CONFIG_SAM34_SPI0" # error "Touchscreen support requires CONFIG_SAM34_SPI0"
#endif #endif
#ifndef CONFIG_GPIOA_IRQ #ifndef CONFIG_SAM34_GPIOA_IRQ
# error "Touchscreen support requires CONFIG_GPIOA_IRQ" # error "Touchscreen support requires CONFIG_SAM34_GPIOA_IRQ"
#endif #endif
#ifndef CONFIG_ADS7843E_FREQUENCY #ifndef CONFIG_ADS7843E_FREQUENCY

40
configs/sam4e-ek/README.txt
View File

@ -614,7 +614,7 @@ USB Full-Speed Device
------------------ ------------------
The Mass Storage Class (MSC) class driver can be selected for use with 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 is configured to support a FAT file system through an FTL layer as
described about under "AT25 Serial FLASH". described about under "AT25 Serial FLASH".
@ -797,8 +797,8 @@ Touchscreen
CONFIG_SAM34_SPI0=y : Enable support for SPI CONFIG_SAM34_SPI0=y : Enable support for SPI
System Type: System Type:
CONFIG_GPIO_IRQ=y : GPIO interrupt support CONFIG_SAM34_GPIO_IRQ=y : GPIO interrupt support
CONFIG_GPIOA_IRQ=y : Enable GPIO interrupts from port A CONFIG_SAM34_GPIOA_IRQ=y : Enable GPIO interrupts from port A
RTOS Features: RTOS Features:
CONFIG_DISABLE_SIGNALS=n : Signals are required 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 Some subsystems can be configured to operate in different ways. The drivers
need to know how to configure the subsystem. need to know how to configure the subsystem.
CONFIG_GPIOA_IRQ CONFIG_SAM34_GPIOA_IRQ
CONFIG_GPIOB_IRQ CONFIG_SAM34_GPIOB_IRQ
CONFIG_GPIOC_IRQ CONFIG_SAM34_GPIOC_IRQ
CONFIG_GPIOD_IRQ CONFIG_SAM34_GPIOD_IRQ
CONFIG_GPIOE_IRQ CONFIG_SAM34_GPIOE_IRQ
CONFIG_GPIOF_IRQ CONFIG_SAM34_GPIOF_IRQ
CONFIG_GPIOG_IRQ CONFIG_SAM34_GPIOG_IRQ
CONFIG_GPIOH_IRQ CONFIG_SAM34_GPIOH_IRQ
CONFIG_GPIOJ_IRQ CONFIG_SAM34_GPIOJ_IRQ
CONFIG_GPIOK_IRQ CONFIG_SAM34_GPIOK_IRQ
CONFIG_GPIOL_IRQ CONFIG_SAM34_GPIOL_IRQ
CONFIG_GPIOM_IRQ CONFIG_SAM34_GPIOM_IRQ
CONFIG_GPION_IRQ CONFIG_SAM34_GPION_IRQ
CONFIG_GPIOP_IRQ CONFIG_SAM34_GPIOP_IRQ
CONFIG_GPIOQ_IRQ CONFIG_SAM34_GPIOQ_IRQ
CONFIG_USART0_ISUART CONFIG_USART0_ISUART
CONFIG_USART1_ISUART CONFIG_USART1_ISUART
@ -1168,7 +1168,7 @@ Configurations
in that this configurations uses a USB serial device for console I/O. in that this configurations uses a USB serial device for console I/O.
STATUS: STATUS:
2014-3-22: Partially functional, but not yet reliable. 2014-3-23: This configuration appears to be fully functional.
NOTES: NOTES:
@ -1219,7 +1219,7 @@ Configurations
USB debug off and USB trace on (see below). USB debug off and USB trace on (see below).
4. Enabling USB monitor SYSLOG output. See the paragraph entitle 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. 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 5. By default, this configuration uses the CDC/ACM serial device to

2
configs/sam4e-ek/include/board.h
View File

@ -44,7 +44,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <stdint.h> # include <stdint.h>
# ifdef CONFIG_GPIO_IRQ # ifdef CONFIG_SAM34_GPIO_IRQ
# include <arch/irq.h> # include <arch/irq.h>
# endif # endif
#endif #endif

2
configs/sam4e-ek/nsh/defconfig
View File

@ -120,7 +120,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
# CONFIG_ARMV7M_OABI_TOOLCHAIN 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_EXTNAND=y
CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTNOR=y
CONFIG_ARCH_HAVE_EXTSRAM0=y CONFIG_ARCH_HAVE_EXTSRAM0=y

6
configs/sam4e-ek/src/sam_buttons.c
View File

@ -60,7 +60,7 @@
* Private Data * 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_scrollup;
static xcpt_t g_irq_scrolldown; static xcpt_t g_irq_scrolldown;
static xcpt_t g_irq_waku; 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) static xcpt_t board_button_irqx(int irq, xcpt_t irqhandler, xcpt_t *store)
{ {
xcpt_t oldhandler; 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) xcpt_t board_button_irq(int id, xcpt_t irqhandler)
{ {
switch (id) switch (id)

4
configs/sam4e-ek/src/sam_touchscreen.c
View File

@ -66,8 +66,8 @@
# error "Touchscreen support requires CONFIG_SAM34_SPI0" # error "Touchscreen support requires CONFIG_SAM34_SPI0"
#endif #endif
#ifndef CONFIG_GPIOA_IRQ #ifndef CONFIG_SAM34_GPIOA_IRQ
# error "Touchscreen support requires CONFIG_GPIOA_IRQ" # error "Touchscreen support requires CONFIG_SAM34_GPIOA_IRQ"
#endif #endif
#ifndef CONFIG_ADS7843E_FREQUENCY #ifndef CONFIG_ADS7843E_FREQUENCY

2
configs/sam4e-ek/usbnsh/defconfig
View File

@ -110,7 +110,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
# CONFIG_ARMV7M_OABI_TOOLCHAIN 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_EXTNAND=y
CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTNOR=y
CONFIG_ARCH_HAVE_EXTSRAM0=y CONFIG_ARCH_HAVE_EXTSRAM0=y

6
configs/sam4l-xplained/README.txt
View File

@ -574,9 +574,9 @@ SAM4L Xplained Pro-specific Configuration Options
Some subsystems can be configured to operate in different ways. The drivers Some subsystems can be configured to operate in different ways. The drivers
need to know how to configure the subsystem. need to know how to configure the subsystem.
CONFIG_GPIOA_IRQ CONFIG_SAM34_GPIOA_IRQ
CONFIG_GPIOB_IRQ CONFIG_SAM34_GPIOB_IRQ
CONFIG_GPIOC_IRQ CONFIG_SAM34_GPIOC_IRQ
CONFIG_USART0_ISUART CONFIG_USART0_ISUART
CONFIG_USART1_ISUART CONFIG_USART1_ISUART
CONFIG_USART2_ISUART CONFIG_USART2_ISUART

2
configs/sam4l-xplained/include/board.h
View File

@ -44,7 +44,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <stdint.h> # include <stdint.h>
# ifdef CONFIG_GPIO_IRQ # ifdef CONFIG_SAM34_GPIO_IRQ
# include <arch/irq.h> # include <arch/irq.h>
# endif # endif
#endif #endif

2
configs/sam4l-xplained/nsh/defconfig
View File

@ -109,7 +109,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_OABI_TOOLCHAIN=y
# CONFIG_GPIO_IRQ is not set # CONFIG_SAM34_GPIO_IRQ is not set
# #
# AT91SAM3/4 Configuration Options # AT91SAM3/4 Configuration Options

4
configs/sam4l-xplained/src/sam_buttons.c
View File

@ -60,7 +60,7 @@
* Private Data * 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; static xcpt_t g_irqsw0;
#endif #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 board_button_irq(int id, xcpt_t irqhandler)
{ {
xcpt_t oldhandler = NULL; xcpt_t oldhandler = NULL;

6
configs/sam4s-xplained/README.txt
View File

@ -464,9 +464,9 @@ SAM4S Xplained-specific Configuration Options
Some subsystems can be configured to operate in different ways. The drivers Some subsystems can be configured to operate in different ways. The drivers
need to know how to configure the subsystem. need to know how to configure the subsystem.
CONFIG_GPIOA_IRQ CONFIG_SAM34_GPIOA_IRQ
CONFIG_GPIOB_IRQ CONFIG_SAM34_GPIOB_IRQ
CONFIG_GPIOC_IRQ CONFIG_SAM34_GPIOC_IRQ
CONFIG_USART0_ISUART CONFIG_USART0_ISUART
CONFIG_USART1_ISUART CONFIG_USART1_ISUART
CONFIG_USART2_ISUART CONFIG_USART2_ISUART

4
configs/sam4s-xplained/include/board.h
View File

@ -44,7 +44,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <stdint.h> # include <stdint.h>
# ifdef CONFIG_GPIO_IRQ # ifdef CONFIG_SAM34_GPIO_IRQ
# include <arch/irq.h> # include <arch/irq.h>
# endif # endif
#endif #endif
@ -61,7 +61,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <stdint.h> # include <stdint.h>
# ifdef CONFIG_GPIO_IRQ # ifdef CONFIG_SAM34_GPIO_IRQ
# include <arch/irq.h> # include <arch/irq.h>
# endif # endif
#endif #endif

2
configs/sam4s-xplained/nsh/defconfig
View File

@ -109,7 +109,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y 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_EXTNAND=y
CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTNOR=y
CONFIG_ARCH_HAVE_EXTSRAM0=y CONFIG_ARCH_HAVE_EXTSRAM0=y

2
configs/sam4s-xplained/src/sam_buttons.c
View File

@ -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 board_button_irq(int id, xcpt_t irqhandler)
{ {
xcpt_t oldhandler = NULL; xcpt_t oldhandler = NULL;