Merge branch 'master' of github.com:ChibiOS/ChibiOS-Contrib

3 files changed, 40 insertions, 6 deletions

diff --git a/os/hal/boards/MICROBIT/board.h b/os/hal/boards/MICROBIT/board.h
index 7798634..157bd75 100644
--- a/os/hal/boards/MICROBIT/board.h
+++ b/os/hal/boards/MICROBIT/board.h
@@ -67,9 +67,9 @@
 #define IOPORT1_LED_ROW_1      13U
 #define IOPORT1_LED_ROW_2      14U
 #define IOPORT1_LED_ROW_3      15U
-#define IOPORT1_PAD_1           1U
-#define IOPORT1_PAD_2           2U
-#define IOPORT1_PAD_3           3U
+#define IOPORT1_PAD_0             IOPORT1_P0
+#define IOPORT1_PAD_1             IOPORT1_P1
+#define IOPORT1_PAD_2             IOPORT1_P2
 #define IOPORT1_SPI_MOSI       21U
 #define IOPORT1_SPI_MISO       22U
 #define IOPORT1_SPI_SCK        23U
@@ -119,9 +119,9 @@
 #define LINE_LED_ROW_1         PAL_LINE(IOPORT1, IOPORT1_LED_ROW_1)
 #define LINE_LED_ROW_2         PAL_LINE(IOPORT1, IOPORT1_LED_ROW_2)
 #define LINE_LED_ROW_3         PAL_LINE(IOPORT1, IOPORT1_LED_ROW_3)
+#define LINE_PAD_0             PAL_LINE(IOPORT1, IOPORT1_PAD_0)
 #define LINE_PAD_1             PAL_LINE(IOPORT1, IOPORT1_PAD_1)
 #define LINE_PAD_2             PAL_LINE(IOPORT1, IOPORT1_PAD_2)
-#define LINE_PAD_3             PAL_LINE(IOPORT1, IOPORT1_PAD_3)
 #define LINE_SPI_MOSI          PAL_LINE(IOPORT1, IOPORT1_SPI_MOSI)
 #define LINE_SPI_MISO          PAL_LINE(IOPORT1, IOPORT1_SPI_MISO)
 #define LINE_SPI_SCK           PAL_LINE(IOPORT1, IOPORT1_SPI_SCK)
diff --git a/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.h b/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.h
index a59235a..7660c09 100644
--- a/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.h
+++ b/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.h
@@ -28,9 +28,10 @@
 #define BOARD_NAME              "Texas Instruments TM4C123G Launchpad"
 
 /*
- * MCU type as defined in the TI header.
+ * MCU type and revision as defined in the TI header.
  */
 #define PART_TM4C123GH6PM
+#define TARGET_IS_TM4C123_RB1
 
 /*
  * Board oscillators-related settings.
@@ -95,6 +96,24 @@
 #define GPIOF_PIN7              7
 
 /*
+ * IO lines assignments.
+ */
+#define LINE_UART0_RX           PAL_LINE(GPIOA, 0U)
+#define LINE_UART0_TX           PAL_LINE(GPIOA, 1U)
+#define LINE_SSI0_CLK           PAL_LINE(GPIOA, 2U)
+#define LINE_SSI0_RX            PAL_LINE(GPIOA, 4U)
+#define LINE_SSI0_TX            PAL_LINE(GPIOA, 5U)
+
+#define LINE_I2C0_SCL           PAL_LINE(GPIOB, 2U)
+#define LINE_I2C0_SDA           PAL_LINE(GPIOB, 3U)
+
+#define LINE_SW2                PAL_LINE(GPIOF, 0U)
+#define LINE_LED_RED            PAL_LINE(GPIOF, 1U)
+#define LINE_LED_BLUE           PAL_LINE(GPIOF, 2U)
+#define LINE_LED_GREEN          PAL_LINE(GPIOF, 3U)
+#define LINE_SW1                PAL_LINE(GPIOF, 4U)
+
+/*
  * I/O ports initial setup, this configuration is established soon after reset
  * in the initialization code.
  */
diff --git a/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.h b/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.h
index 9012f7c..57fd268 100644
--- a/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.h
+++ b/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.h
@@ -36,9 +36,10 @@
 //#define BOARD_PHY_RMII
 
 /*
- * MCU type as defined in the TI header.
+ * MCU type and revision as defined in the TI header.
  */
 #define PART_TM4C1294NCPDT
+#define TARGET_IS_TM4C129_RA0
 
 /*
  * Board oscillators-related settings.
@@ -184,6 +185,20 @@
 #define GPIOQ_PIN7              7
 
 /*
+ * IO lines assignments.
+ */
+#define LINE_UART0_RX           PAL_LINE(GPIOA, 0U)
+#define LINE_UART0_TX           PAL_LINE(GPIOA, 1U)
+
+#define LINE_LED0               PAL_LINE(GPIOF, 0U)
+#define LINE_LED1               PAL_LINE(GPIOF, 4U)
+
+#define LINE_LED2               PAL_LINE(GPION, 0U)
+#define LINE_LED3               PAL_LINE(GPION, 1U)
+
+#define LINE_SW1                PAL_LINE(GPIOJ, 0U)
+
+/*
  * I/O ports initial setup, this configuration is established soon after reset
  * in the initialization code.
  */