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

arch/arm/samv7: enforce compilation error for incompatible configuration options

Browse Source 
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
This commit is contained in:
Petro Karashchenko 2024-05-22 14:27:26 +02:00 committed by Xiang Xiao
parent 357f8093ac
commit d144a2a80b
24 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/src/samv7/sam_gpio.c
View File

@ -42,6 +42,11 @@
* Pre-processor Definitions
****************************************************************************/
#if defined(CONFIG_SAMV7_JTAG_FULL_ENABLE) && defined(CONFIG_SAMV7_USART1)
# error CONFIG_SAMV7_JTAG_FULL_ENABLE is incompatible with CONFIG_SAMV7_USART1.
# error The SYSIO Pin4 must be bound to PB4 to use USART1
#endif
#if !defined(CONFIG_SAMV7_ERASE_ENABLE) || \
!defined(CONFIG_SAMV7_JTAG_FULL_ENABLE)
# if defined(CONFIG_SAMV7_ERASE_DISABLE)
@ -51,7 +56,7 @@
# endif
# if defined(CONFIG_SAMV7_JTAG_DISABLE)
# define SYSIO_BITS (MATRIX_CCFG_SYSIO_SYSIO4 | MATRIX_CCFG_SYSIO_SYSIO5 | \
MATRIX_CCFG_SYSIO_SYSIO6 | MATRIX_CCFG_SYSIO_SYSIO7)
MATRIX_CCFG_SYSIO_SYSIO6 | MATRIX_CCFG_SYSIO_SYSIO7)
# endif
# if defined(CONFIG_SAMV7_JTAG_FULL_SW_ENABLE)
# define SYSIO_BITS MATRIX_CCFG_SYSIO_SYSIO4

16
arch/arm/src/samv7/sam_lowputc.c
View File

@ -241,9 +241,6 @@ void sam_lowsetup(void)
uint64_t divb3;
uint32_t intpart;
uint32_t fracpart;
#endif
#if (defined(HAVE_SERIAL_CONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)) || \
defined(CONFIG_SAMV7_USART1)
uint32_t regval;
#endif
@ -322,19 +319,6 @@ void sam_lowsetup(void)
sam_configgpio(GPIO_USART1_RTS);
# endif
/* To use the USART1 as an USART, the SYSIO Pin4 must be bound to PB4
* instead of TDI
*/
# if defined(CONFIG_SAMV7_JTAG_FULL_ENABLE)
# warning CONFIG_SAMV7_JTAG_FULL_ENABLE is incompatible with CONFIG_SAMV7_USART1.
# warning The SYSIO Pin4 must be bound to PB4 to use USART1
# endif
regval = getreg32(SAM_MATRIX_CCFG_SYSIO);
regval |= MATRIX_CCFG_SYSIO_SYSIO4;
putreg32(regval, SAM_MATRIX_CCFG_SYSIO);
#endif
#ifdef CONFIG_USART2_SERIALDRIVER

1
boards/arm/samv7/same70-xplained/configs/adc/defconfig
View File

@ -69,6 +69,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOC_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SDRAMC=y
CONFIG_SAMV7_SDRAMSIZE=2097152
CONFIG_SAMV7_TC0=y

1
boards/arm/samv7/same70-xplained/configs/can/defconfig
View File

@ -62,6 +62,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOC_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_MCAN0=y
CONFIG_SAMV7_SDRAMC=y
CONFIG_SAMV7_SDRAMSIZE=2097152

1
boards/arm/samv7/same70-xplained/configs/mcuboot-loader/defconfig
View File

@ -63,6 +63,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOC_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SDRAMC=y
CONFIG_SAMV7_SDRAMSIZE=2097152
CONFIG_SAMV7_TWIHS0=y

1
boards/arm/samv7/same70-xplained/configs/mcuboot-slot-confirm/defconfig
View File

@ -61,6 +61,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOC_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SDRAMC=y
CONFIG_SAMV7_SDRAMSIZE=2097152
CONFIG_SAMV7_TWIHS0=y

1
boards/arm/samv7/same70-xplained/configs/netnsh/defconfig
View File

@ -92,6 +92,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOC_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_TWIHS0=y
CONFIG_SAMV7_USART1=y
CONFIG_SAMV7_XDMAC=y

1
boards/arm/samv7/same70-xplained/configs/nsh/defconfig
View File

@ -62,6 +62,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOC_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SDRAMC=y
CONFIG_SAMV7_SDRAMSIZE=2097152
CONFIG_SAMV7_TWIHS0=y

1
boards/arm/samv7/same70-xplained/configs/pwm/defconfig
View File

@ -67,6 +67,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOC_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_PWM0=y
CONFIG_SAMV7_PWM0_CH0=y
CONFIG_SAMV7_PWM0_CH1=y

1
boards/arm/samv7/same70-xplained/configs/pysim/defconfig
View File

@ -129,6 +129,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOC_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_PWM0=y
CONFIG_SAMV7_PWM0_CH0=y
CONFIG_SAMV7_PWM0_CH1=y

1
boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig
View File

@ -103,6 +103,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOC_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SDRAMC=y
CONFIG_SAMV7_SDRAMSIZE=2097152
CONFIG_SAMV7_TWIHS0=y

1
boards/arm/samv7/samv71-xult/configs/knsh/defconfig
View File

@ -67,6 +67,7 @@ CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SDRAMC=y
CONFIG_SAMV7_SDRAMSIZE=2097152
CONFIG_SAMV7_TWIHS0=y

1
boards/arm/samv7/samv71-xult/configs/mcuboot-loader/defconfig
View File

@ -48,6 +48,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SYSTEMRESET=y
CONFIG_SAMV7_USART1=y
CONFIG_SAMV7_XDMAC=y

1
boards/arm/samv7/samv71-xult/configs/mcuboot-slot-confirm/defconfig
View File

@ -48,6 +48,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SYSTEMRESET=y
CONFIG_SAMV7_USART1=y
CONFIG_SAMV7_XDMAC=y

1
boards/arm/samv7/samv71-xult/configs/mcuboot-swap-test/defconfig
View File

@ -48,6 +48,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SYSTEMRESET=y
CONFIG_SAMV7_USART1=y
CONFIG_SAMV7_XDMAC=y

1
boards/arm/samv7/samv71-xult/configs/mcuboot-update-agent/defconfig
View File

@ -102,6 +102,7 @@ CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SYSTEMRESET=y
CONFIG_SAMV7_TWIHS0=y
CONFIG_SAMV7_USART1=y

1
boards/arm/samv7/samv71-xult/configs/module/defconfig
View File

@ -54,6 +54,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_USART1=y
CONFIG_SAMV7_XDMAC=y
CONFIG_SCHED_HPWORK=y

1
boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
View File

@ -116,6 +116,7 @@ CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SPI0=y
CONFIG_SAMV7_USART1=y
CONFIG_SAMV7_XDMAC=y

1
boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig
View File

@ -75,6 +75,7 @@ CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SMC=y
CONFIG_SAMV7_TWIHS0=y
CONFIG_SAMV7_USART1=y

1
boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
View File

@ -92,6 +92,7 @@ CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_TWIHS0=y
CONFIG_SAMV7_USART1=y
CONFIG_SAMV7_XDMAC=y

1
boards/arm/samv7/samv71-xult/configs/nsh/defconfig
View File

@ -64,6 +64,7 @@ CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SDRAMC=y
CONFIG_SAMV7_SDRAMSIZE=2097152
CONFIG_SAMV7_TWIHS0=y

1
boards/arm/samv7/samv71-xult/configs/nxwm/defconfig
View File

@ -110,6 +110,7 @@ CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_SMC=y
CONFIG_SAMV7_TWIHS0=y
CONFIG_SAMV7_USART1=y

1
boards/arm/samv7/samv71-xult/configs/vnc/defconfig
View File

@ -102,6 +102,7 @@ CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_TWIHS0=y
CONFIG_SAMV7_USART1=y
CONFIG_SAMV7_XDMAC=y

1
boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
View File

@ -132,6 +132,7 @@ CONFIG_SAMV7_GPIOB_IRQ=y
CONFIG_SAMV7_GPIOD_IRQ=y
CONFIG_SAMV7_GPIO_IRQ=y
CONFIG_SAMV7_HSMCI0=y
CONFIG_SAMV7_JTAG_FULL_SW_ENABLE=y
CONFIG_SAMV7_TWIHS0=y
CONFIG_SAMV7_USART1=y
CONFIG_SAMV7_XDMAC=y