diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 1fc72a63222..bf63b3d3c4b 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -1334,7 +1334,7 @@
  • ARM Cortex-A8 (1)
  • ARM Cortex-M0/M0+ (4)
  • ARM Cortex-M3 (30)
    • -
  • ARM Cortex-M4 (18)
    • +
  • ARM Cortex-M4 (19)
  • Atmel AVR @@ -3548,6 +3549,32 @@ nsh>
    + +
    + +

    + TI Tiva TM4C1294. + This port uses the TI Tiva TM4C1294 LaunchPad. +

    + + + + +
    +
    +
    diff --git a/Documentation/README.html b/Documentation/README.html index 37aa984d064..74f12f4f6f6 100644 --- a/Documentation/README.html +++ b/Documentation/README.html @@ -236,6 +236,8 @@ | | | `- README.txt | | |- tm4c123g-launchpad/ | | | `- README.txt + | | |- tm4c1294-launchpad/ + | | | `- README.txt | | |- twr-k60n512/ | | | `- README.txt | | |- ubw32/ diff --git a/README.txt b/README.txt index bd41014f7f3..044badb7e15 100644 --- a/README.txt +++ b/README.txt @@ -1295,6 +1295,8 @@ nuttx | | `- README.txt | |- tm4c123g-launchpad/ | | `- README.txt + | |- tm4c1294-launchpad/ + | | `- README.txt | |- twr-k60n512/ | | `- README.txt | |- ubw32/ diff --git a/configs/Kconfig b/configs/Kconfig index bee4cc74efc..29c62bc3b22 100644 --- a/configs/Kconfig +++ b/configs/Kconfig @@ -1460,6 +1460,9 @@ endif if ARCH_BOARD_TM4C123G_LAUNCHPAD source "configs/tm4c123g-launchpad/Kconfig" endif +if ARCH_BOARD_TM4C1294_LAUNCHPAD +source "configs/tm4c1294-launchpad/Kconfig" +endif if ARCH_BOARD_CC3200_LAUNCHPAD source "configs/cc3200-launchpad/Kconfig" endif diff --git a/configs/README.txt b/configs/README.txt index c762060f23d..3957688ade9 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -589,6 +589,12 @@ configs/tm4c123g-launchpad platform for ARM® Cortex™-M4F-based microcontrollers from Texas Instruments. +configs/tm4c1294-launchpad + This is the port of NuttX to the Tiva® TM4C1294 LaunchPad. The + Tiva® TM4C123G LaunchPad Evaluation Board is a low-cost evaluation + platform for ARM® Cortex™-M4F-based microcontrollers from Texas + Instruments. + configs/twr-k60n512 Kinetis K60 Cortex-M4 MCU. This port uses the FreeScale TWR-K60N512 development board. diff --git a/configs/tm4c1294-launchpad/include/board.h b/configs/tm4c1294-launchpad/include/board.h index 2bf6353a742..ee4d8b55dcd 100644 --- a/configs/tm4c1294-launchpad/include/board.h +++ b/configs/tm4c1294-launchpad/include/board.h @@ -1,7 +1,7 @@ /************************************************************************************ * configs/tm4c1294-launchpad/include/board.h * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/tm4c1294-launchpad/ipv6/Make.defs b/configs/tm4c1294-launchpad/ipv6/Make.defs index 918bf985f66..f4356f4b7fe 100644 --- a/configs/tm4c1294-launchpad/ipv6/Make.defs +++ b/configs/tm4c1294-launchpad/ipv6/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/dk-tm4c129x/ipv6/Make.defs +# configs/tm4c1294-launchpad/ipv6/Make.defs # # Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/tm4c1294-launchpad/nsh/Make.defs b/configs/tm4c1294-launchpad/nsh/Make.defs index 377d1e1e39f..2600f0f26e8 100644 --- a/configs/tm4c1294-launchpad/nsh/Make.defs +++ b/configs/tm4c1294-launchpad/nsh/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/tm4c1294-launchpad/nsh/Make.defs # -# Copyright (C) 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without diff --git a/configs/tm4c1294-launchpad/nsh/setenv.sh b/configs/tm4c1294-launchpad/nsh/setenv.sh index a479847e40b..5e22b317c22 100755 --- a/configs/tm4c1294-launchpad/nsh/setenv.sh +++ b/configs/tm4c1294-launchpad/nsh/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/tm4c1294-launchpad/nsh/setenv.sh # -# Copyright (C) 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without diff --git a/configs/tm4c1294-launchpad/scripts/ld.script b/configs/tm4c1294-launchpad/scripts/ld.script index b60907a4048..c47cb099a8d 100755 --- a/configs/tm4c1294-launchpad/scripts/ld.script +++ b/configs/tm4c1294-launchpad/scripts/ld.script @@ -1,7 +1,7 @@ /**************************************************************************** * configs/tm4c1294-launchpad/scripts/ld.script * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/tm4c1294-launchpad/src/Makefile b/configs/tm4c1294-launchpad/src/Makefile index 5ce6c83d28b..8609a6a9c9e 100644 --- a/configs/tm4c1294-launchpad/src/Makefile +++ b/configs/tm4c1294-launchpad/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ -# configs/dk-tm4c129x/src/Makefile +# configs/tm4c1294-launchpad/src/Makefile # -# Copyright (C) 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without diff --git a/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h b/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h index 3f036109ed3..0c20e8439af 100644 --- a/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h +++ b/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h @@ -1,7 +1,7 @@ /************************************************************************************ * configs/tm4c1294-launchpad/src/ek-tm4c1294xl.h * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -177,4 +177,3 @@ int tiva_timer_initialize(void); #endif /* __ASSEMBLY__ */ #endif /* __CONFIGS_TM4C1294_LAUNCHPAD_TM4C1294_LAUNCHPAD_H */ - diff --git a/configs/tm4c1294-launchpad/src/tm4c_autoleds.c b/configs/tm4c1294-launchpad/src/tm4c_autoleds.c index 940a24ff5cf..bbba0ed7954 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_autoleds.c +++ b/configs/tm4c1294-launchpad/src/tm4c_autoleds.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/tm4c1294-launchpad/src/tm4c_autoleds.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/tm4c1294-launchpad/src/tm4c_bringup.c b/configs/tm4c1294-launchpad/src/tm4c_bringup.c index c302f4084d9..afaafaba4bb 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_bringup.c +++ b/configs/tm4c1294-launchpad/src/tm4c_bringup.c @@ -1,7 +1,7 @@ /**************************************************************************** * config/tm4c1294-launchpad/src/tm4c_bringup.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/tm4c1294-launchpad/src/tm4c_buttons.c b/configs/tm4c1294-launchpad/src/tm4c_buttons.c index b7300329aa3..1ce04a4d92c 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_buttons.c +++ b/configs/tm4c1294-launchpad/src/tm4c_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/tm4c1294-launchpad/src/tm4c_buttons.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/tm4c1294-launchpad/src/tm4c_nsh.c b/configs/tm4c1294-launchpad/src/tm4c_nsh.c index c22e7e40d31..8df992b266b 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_nsh.c +++ b/configs/tm4c1294-launchpad/src/tm4c_nsh.c @@ -1,7 +1,7 @@ /**************************************************************************** * config/tm4c1294-launchpad/src/tm4c_nsh.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/tm4c1294-launchpad/src/tm4c_ssi.c b/configs/tm4c1294-launchpad/src/tm4c_ssi.c index d5ecffc1e8a..e4a6d0d69c7 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_ssi.c +++ b/configs/tm4c1294-launchpad/src/tm4c_ssi.c @@ -1,7 +1,7 @@ /************************************************************************************ * configs/tm4c1294-launchpad/src/tm4c_ssi.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ #include "tiva_gpio.h" #include "tm4c1294-launchpad.h" -/* The DK-TM4C129X microSD CS is on SSI0 */ +/* The TM4C1294-Launchpad microSD CS is on SSI0 */ #if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1) @@ -101,7 +101,7 @@ void weak_function tm4c_ssiinitialize(void) * The external functions, tiva_spiselect and tiva_spistatus must be provided * by board-specific logic. The are implementations of the select and status * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). - * All othermethods (including tiva_spiinitialize()) are provided by common + * All other methods (including tiva_spiinitialize()) are provided by common * logic. To use this common SPI logic on your board: * * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your diff --git a/configs/tm4c1294-launchpad/src/tm4c_timer.c b/configs/tm4c1294-launchpad/src/tm4c_timer.c index fe3eb51a270..bcf4a944f3b 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_timer.c +++ b/configs/tm4c1294-launchpad/src/tm4c_timer.c @@ -101,9 +101,11 @@ int tiva_timer_initialize(void) { int ret; - timvdbg("Registering TIMER%d at %s\n", GPTM, CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME); + timvdbg("Registering TIMER%d at %s\n", + GPTM, CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME); - ret = tiva_timer_register(CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME, GPTM, ALTCLK); + ret = tiva_timer_register(CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME, + GPTM, ALTCLK); if (ret < 0) { timdbg("ERROR: Failed to register timer driver: %d\n", ret); diff --git a/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/configs/tm4c1294-launchpad/src/tm4c_userleds.c index 84d76482e71..b7218ddf3ae 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_userleds.c +++ b/configs/tm4c1294-launchpad/src/tm4c_userleds.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/tm4c1294-launchpad/src/tm4c_userleds.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without