arch/arm/samv7: enforce compilation error for incompatible configurat…

…ion options

Signed-off-by: Petro Karashchenko <[email protected]>

arch/arm/src/samv7/sam_gpio.c

@@ -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

arch/arm/src/samv7/sam_lowputc.c

@@ -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_SAMV7_USART2