diff options
| author | Michael Walker <walkerstop@gmail.com> | 2018-05-02 03:33:23 -0700 |
|---|---|---|
| committer | Michael Walker <walkerstop@gmail.com> | 2018-05-02 03:33:23 -0700 |
| commit | 6d879f58f5b56eda3330aa6e7f8382f441adecf4 (patch) | |
| tree | dad3f1f3b6ac3927484ee22002a947662a8a0173 /os/hal/boards/TI_TM4C1294_LAUNCHPAD | |
| parent | 4e9f077fb10255dced1da4d5d2ad9f8ae41442a2 (diff) | |
| parent | d4d384557df0e8e7a8071553448b0c42849f98c0 (diff) | |
| download | ChibiOS-Contrib-6d879f58f5b56eda3330aa6e7f8382f441adecf4.tar.gz ChibiOS-Contrib-6d879f58f5b56eda3330aa6e7f8382f441adecf4.tar.bz2 ChibiOS-Contrib-6d879f58f5b56eda3330aa6e7f8382f441adecf4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'os/hal/boards/TI_TM4C1294_LAUNCHPAD')
| -rw-r--r-- | os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.c | 2 | ||||
| -rw-r--r-- | os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.h | 46 | ||||
| -rw-r--r-- | os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk | 4 |
3 files changed, 26 insertions, 26 deletions
diff --git a/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.c b/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.c index 437dcf8..bbfdb88 100644 --- a/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.c +++ b/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2014..2016 Marco Veeneman + Copyright (C) 2014..2017 Marco Veeneman Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.h b/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.h index 08bb36f..611a580 100644 --- a/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.h +++ b/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014..2016 Marco Veeneman + Copyright (C) 2014..2017 Marco Veeneman Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ limitations under the License. */ -#ifndef _BOARD_H_ -#define _BOARD_H_ +#ifndef BOARD_H +#define BOARD_H /* * Setup for Texas Instruments TM4C1294 Launchpad Board. @@ -36,28 +36,10 @@ //#define BOARD_PHY_RMII /* - * MCU type + * MCU type and revision as defined in the TI header. */ -//#define TM4C1290NCPDT -//#define TM4C1290NCZAD -//#define TM4C1292NCPDT -//#define TM4C1292NCZAD -//#define TM4C1294KCPDT -#define TM4C1294NCPDT -//#define TM4C1294NCZAD -//#define TM4C1297NCZAD -//#define TM4C1299KCZAD -//#define TM4C1299NCZAD -//#define TM4C129CNCPDT -//#define TM4C129CNCZAD -//#define TM4C129DNCPDT -//#define TM4C129DNCZAD -//#define TM4C129EKCPDT -//#define TM4C129ENCPDT -//#define TM4C129ENCZAD -//#define TM4C129LNCZAD -//#define TM4C129XKCZAD -//#define TM4C129XNCZAD +#define PART_TM4C1294NCPDT +#define TARGET_IS_TM4C129_RA0 /* * Board oscillators-related settings. @@ -203,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. */ @@ -426,4 +422,4 @@ extern "C" { #endif #endif /* _FROM_ASM_ */ -#endif /* _BOARD_H_ */ +#endif /* BOARD_H */ diff --git a/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk b/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk index 56298eb..e95de0b 100644 --- a/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk +++ b/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk @@ -3,3 +3,7 @@ BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.c # Required include directories BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/TI_TM4C1294_LAUNCHPAD + +# Shared variables +ALLCSRC += $(BOARDSRC) +ALLINC += $(BOARDINC) |