diff --git a/configs/Kconfig b/configs/Kconfig index 8b7f8c78a6..121ab0f180 100644 --- a/configs/Kconfig +++ b/configs/Kconfig @@ -748,8 +748,8 @@ config ARCH_BOARD_TEENSY on an Atmel AT90USB1286 MCU. config ARCH_BOARD_TM4C123G_LAUNCHPAD - bool "Tiva TM4C124G LaunchPad" - depends on ARCH_CHIP_TM4C123GH6ZRB + bool "Tiva TM4C123G LaunchPad" + depends on ARCH_CHIP_TM4C123GH6PMI select ARCH_HAVE_LEDS select ARCH_HAVE_BUTTONS select ARCH_HAVE_IRQBUTTONS diff --git a/configs/tm4c123g-launchpad/README.txt b/configs/tm4c123g-launchpad/README.txt index daef9f5457..08dbb37cd3 100644 --- a/configs/tm4c123g-launchpad/README.txt +++ b/configs/tm4c123g-launchpad/README.txt @@ -33,7 +33,7 @@ PIN SIGNAL(S) LanchPad Function 20 PA3/SSIOFSS GPIO, J2 pin 9 21 PA4/SSIORX GPIO, J2 pin 8 22 PA5/SSIOTX GPIO, J1 pin 8 - 23 PA6/I2CLSCL GPIO, J1 pin 9 + 23 PA6/I2CLSCL GPIO, J1 pin 9 24 PA7/I2CLSDA GPIO, J1 pin 10 45 PB0/T2CCP0/U1Rx GPIO, J1 pin 3 @@ -102,7 +102,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator git fetch http://openocd.zylin.com/openocd refs/changes/22/922/14 && git checkout FETCH_HEAD ./bootstrap ./configure --enable-maintainer-mode --enable-ti-icdi - make + make sudo make install For additional help, see http://processors.wiki.ti.com/index.php/Tiva_Launchpad_with_OpenOCD_and_Linux @@ -111,7 +111,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator I have been using the on-board In-Circuit Debug Interface (ICDI) interface. OpenOCD requires a configuration file. I keep the one I used last here: - + configs/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg However, the "correct" configuration script to use with OpenOCD may @@ -127,7 +127,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator There is also a script on the tools/ directory that I use to start the OpenOCD daemon on my system called oocd.sh. That script will probably require some modifications to work in another environment: - + - Possibly the value of OPENOCD_PATH and TARGET_PATH - It assumes that the correct script to use is the one at configs/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg @@ -142,7 +142,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator The relative path to the oocd.sh script is configs/tm4c123g-launchpad/tools, but that should have been added to your PATH variable when you sourced the setenv.sh script. - + Note that OpenOCD needs to be run with administrator privileges in some environments (sudo). @@ -170,11 +170,11 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator .config file). 2. The MCU must be halted prior to loading code using 'mon reset' as described below. - + OpenOCD will support several special 'monitor' commands. These GDB commands will send comments to the OpenOCD monitor. Here are a couple that you will need to use: - + (gdb) monitor reset (gdb) monitor halt @@ -261,7 +261,7 @@ IDEs NuttX is built using command-line make. It can be used with an IDE, but some effort will be required to create the project. - + Makefile Build -------------- Under Eclipse, it is pretty easy to set up an "empty makefile project" and @@ -356,7 +356,7 @@ NXFLAT Toolchain tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can be downloaded from the NuttX SourceForge download site (https://sourceforge.net/projects/nuttx/files/). - + This GNU toolchain builds and executes in the Linux or Cygwin environment. 1. You must have already configured Nuttx in /nuttx. @@ -473,7 +473,7 @@ USB Device Controller Functions Debugging with JTAG/SWD - The FT2232 USB device performs JTAG/SWD serial operations under the control + The FT2232 USB device performs JTAG/SWD serial operations under the control of the debugger or the Luminary Flash Programmer. It also operate as an In-Circuit Debugger Interface (ICDI), allowing debugging of any external target board. Debugging modes: @@ -520,7 +520,7 @@ TM4C123G LaunchPad Configuration Options CONFIG_ARCH_CHIP_name - For use in C code to identify the exact chip: - CONFIG_ARCH_CHIP_TM4C123GH6ZRB + CONFIG_ARCH_CHIP_TM4C123GH6PMI CONFIG_ARCH_BOARD - Identifies the configs subdirectory and hence, the board that supports the particular chip or SoC. @@ -588,7 +588,7 @@ TM4C123G LaunchPad Configuration Options CONFIG_TIVA_DISABLE_GPION_IRQS=n CONFIG_TIVA_DISABLE_GPIOP_IRQS=n CONFIG_TIVA_DISABLE_GPIOQ_IRQS=n - + TM4C123G specific device driver settings CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -646,7 +646,7 @@ Where is one of the following: builtin applications are selected. NOTES: - + 1. This configuration uses the mconf-based configuration tool. To change this configuration using that tool, you should: diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig index 0ea9c59a08..74471c757b 100644 --- a/configs/tm4c123g-launchpad/nsh/defconfig +++ b/configs/tm4c123g-launchpad/nsh/defconfig @@ -117,7 +117,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y # # Tiva/Stellaris Configuration Options # -CONFIG_ARCH_CHIP_TM4C123GH6ZRB=y +CONFIG_ARCH_CHIP_TM4C123GH6PMI=y CONFIG_ARCH_CHIP_TM4C=y # diff --git a/configs/tm4c123g-launchpad/tools/lm4f120-launchpad.cfg b/configs/tm4c123g-launchpad/tools/lm4f120-launchpad.cfg deleted file mode 100644 index c91b3b1d5b..0000000000 --- a/configs/tm4c123g-launchpad/tools/lm4f120-launchpad.cfg +++ /dev/null @@ -1,71 +0,0 @@ -# -# TI Tiva Launchpad ek-tm4c123gxl Evaluation Kits -# -# http://www.ti.com/tool/ek-tm4c123gxl -# - -# -# NOTE: using the bundled ICDI interface is optional! -# This interface is not ftdi based as previous boards were -# - -# Interface configuration - -# -# TI Tiva In-Circuit Debug Interface (ICDI) Board -# -# This is the propriety ICDI interface used on newer boards such as -# LM4F232 Evaluation Kit - http://www.ti.com/tool/ek-lm4f232 -# Tiva Launchpad - http://www.ti.com/stellaris-launchpad -# http://www.ti.com/tool/ek-lm4f232 -# - -interface hla -hla_layout ti-icdi -hla_vid_pid 0x1cbe 0x00fd - -# Board configuration - -# unused but set to disable warnings -adapter_khz 1000 - -set WORKAREASIZE 0x8000 -set CHIPNAME tm4c123gh5qr - -# Target configuration - -# -# lm3s icdi pseudo target -# - -if { [info exists CHIPNAME] } { - set _CHIPNAME $CHIPNAME -} else { - set _CHIPNAME lm3s -} - -# Work-area is a space in RAM used for flash programming -# By default use 16kB -if { [info exists WORKAREASIZE] } { - set _WORKAREASIZE $WORKAREASIZE -} else { - set _WORKAREASIZE 0x4000 -} - -# -# possible value are hla_jtag -# currently swd is not supported -# -transport select hla_jtag - -# do not check id as icdi currently does not support it -hla newtap $_CHIPNAME cpu -expected-id 0 - -set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME hla_target -chain-position $_TARGETNAME - -$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0 - -# flash configuration ... autodetects sizes, autoprobed -flash bank $_CHIPNAME.flash stellaris 0 0 0 0 $_TARGETNAME - diff --git a/configs/tm4c123g-launchpad/tools/oocd.sh b/configs/tm4c123g-launchpad/tools/oocd.sh index bbe08e2076..aa97bafb3a 100644 --- a/configs/tm4c123g-launchpad/tools/oocd.sh +++ b/configs/tm4c123g-launchpad/tools/oocd.sh @@ -15,12 +15,12 @@ fi # the following to run directly from the build directory # OPENOCD_PATH="/home/OpenOCD/openocd/src" -# OPENOCD_PATH="/usr/bin" -OPENOCD_PATH="/usr/local/bin" +OPENOCD_PATH="/usr/bin" +# OPENOCD_PATH="/usr/local/bin" # TARGET_PATH="/home/OpenOCD/openocd/tcl" -# TARGET_PATH="/usr/share/openocd/scripts" -TARGET_PATH="/usr/local/share/openocd/scripts" +TARGET_PATH="/usr/share/openocd/scripts" +# TARGET_PATH="/usr/local/share/openocd/scripts" # Assume a Unix development environment. Uncomment to use a Windows # like environment diff --git a/configs/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg b/configs/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg new file mode 100644 index 0000000000..62fe9812b5 --- /dev/null +++ b/configs/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg @@ -0,0 +1,12 @@ +# +# TI Tiva C Series ek-tm4c123gxl Launchpad Evaluation Kit +# +# http://www.ti.com/tool/ek-tm4c123gxl +# + +source [find interface/ti-icdi.cfg] + +set WORKAREASIZE 0x8000 +set CHIPNAME tm4c123gh6pm +source [find target/stellaris_icdi.cfg] +