mirror of
https://github.com/hathach/tinyusb.git
synced 2025-02-21 21:41:09 +00:00
use system_nrf5x.c built-in support for ETM with ENABLE_ETM
This commit is contained in:
parent
19c99d3b42
commit
c789cfe518
@ -134,10 +134,6 @@ void AfterTargetReset (void) {
|
|||||||
**********************************************************************
|
**********************************************************************
|
||||||
*/
|
*/
|
||||||
void BeforeTargetConnect (void) {
|
void BeforeTargetConnect (void) {
|
||||||
//
|
|
||||||
// Trace pin init is done by J-Link script file as J-Link script files are IDE independent
|
|
||||||
//
|
|
||||||
Project.SetJLinkScript("./Nordic_nRF52840_TraceExample.pex");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
|
335
hw/bsp/nrf/boards/pca10095/ozone/nrf5340.jdebug
Normal file
335
hw/bsp/nrf/boards/pca10095/ozone/nrf5340.jdebug
Normal file
@ -0,0 +1,335 @@
|
|||||||
|
/*********************************************************************
|
||||||
|
* (c) SEGGER Microcontroller GmbH *
|
||||||
|
* The Embedded Experts *
|
||||||
|
* www.segger.com *
|
||||||
|
**********************************************************************
|
||||||
|
|
||||||
|
File :
|
||||||
|
Created : 30 Jun 2021 13:37
|
||||||
|
Ozone Version : V3.24a
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* OnProjectLoad
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Project load routine. Required.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
void OnProjectLoad (void) {
|
||||||
|
// Dialog-generated settings
|
||||||
|
Project.AddSvdFile ("$(InstallDir)/Config/CPU/Cortex-M33F.svd");
|
||||||
|
Project.AddSvdFile ("./nrf5340_application.svd");
|
||||||
|
Project.SetDevice ("nRF5340_xxAA_APP");
|
||||||
|
Project.SetHostIF ("USB", "");
|
||||||
|
Project.SetTargetIF ("SWD");
|
||||||
|
Project.SetTIFSpeed ("16 MHz");
|
||||||
|
|
||||||
|
Project.SetTraceSource ("Trace Pins");
|
||||||
|
Project.SetTracePortWidth (4);
|
||||||
|
|
||||||
|
// User settings
|
||||||
|
File.Open ("../../../../../../examples/device/cdc_msc/cmake-build-pca10095/cdc_msc.elf");
|
||||||
|
}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* OnStartupComplete
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Called when program execution has reached/passed
|
||||||
|
* the startup completion point. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void OnStartupComplete (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* TargetReset
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Replaces the default target device reset routine. Optional.
|
||||||
|
*
|
||||||
|
* Notes
|
||||||
|
* This example demonstrates the usage when
|
||||||
|
* debugging an application in RAM on a Cortex-M target device.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void TargetReset (void) {
|
||||||
|
//
|
||||||
|
// unsigned int SP;
|
||||||
|
// unsigned int PC;
|
||||||
|
// unsigned int VectorTableAddr;
|
||||||
|
//
|
||||||
|
// VectorTableAddr = Elf.GetBaseAddr();
|
||||||
|
// //
|
||||||
|
// // Set up initial stack pointer
|
||||||
|
// //
|
||||||
|
// if (VectorTableAddr != 0xFFFFFFFF) {
|
||||||
|
// SP = Target.ReadU32(VectorTableAddr);
|
||||||
|
// Target.SetReg("SP", SP);
|
||||||
|
// }
|
||||||
|
// //
|
||||||
|
// // Set up entry point PC
|
||||||
|
// //
|
||||||
|
// PC = Elf.GetEntryPointPC();
|
||||||
|
//
|
||||||
|
// if (PC != 0xFFFFFFFF) {
|
||||||
|
// Target.SetReg("PC", PC);
|
||||||
|
// } else if (VectorTableAddr != 0xFFFFFFFF) {
|
||||||
|
// PC = Target.ReadU32(VectorTableAddr + 4);
|
||||||
|
// Target.SetReg("PC", PC);
|
||||||
|
// } else {
|
||||||
|
// Util.Error("Project file error: failed to set entry point PC", 1);
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* BeforeTargetReset
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Event handler routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void BeforeTargetReset (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* AfterTargetReset
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Event handler routine. Optional.
|
||||||
|
* The default implementation initializes SP and PC to reset values.
|
||||||
|
**
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
void AfterTargetReset (void) {
|
||||||
|
_SetupTarget();
|
||||||
|
}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* DebugStart
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Replaces the default debug session startup routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void DebugStart (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* TargetConnect
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Replaces the default target IF connection routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void TargetConnect (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* BeforeTargetConnect
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Event handler routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
void BeforeTargetConnect (void) {
|
||||||
|
}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* AfterTargetConnect
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Event handler routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void AfterTargetConnect (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* TargetDownload
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Replaces the default program download routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void TargetDownload (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* BeforeTargetDownload
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Event handler routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void BeforeTargetDownload (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* AfterTargetDownload
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Event handler routine. Optional.
|
||||||
|
* The default implementation initializes SP and PC to reset values.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
void AfterTargetDownload (void) {
|
||||||
|
_SetupTarget();
|
||||||
|
}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* BeforeTargetDisconnect
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Event handler routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void BeforeTargetDisconnect (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* AfterTargetDisconnect
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Event handler routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void AfterTargetDisconnect (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* AfterTargetHalt
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Event handler routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void AfterTargetHalt (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* BeforeTargetResume
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Event handler routine. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void BeforeTargetResume (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* OnSnapshotLoad
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Called upon loading a snapshot. Optional.
|
||||||
|
*
|
||||||
|
* Additional information
|
||||||
|
* This function is used to restore the target state in cases
|
||||||
|
* where values cannot simply be written to the target.
|
||||||
|
* Typical use: GPIO clock needs to be enabled, before
|
||||||
|
* GPIO is configured.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void OnSnapshotLoad (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* OnSnapshotSave
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Called upon saving a snapshot. Optional.
|
||||||
|
*
|
||||||
|
* Additional information
|
||||||
|
* This function is usually used to save values of the target
|
||||||
|
* state which can either not be trivially read,
|
||||||
|
* or need to be restored in a specific way or order.
|
||||||
|
* Typically use: Memory Mapped Registers,
|
||||||
|
* such as PLL and GPIO configuration.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void OnSnapshotSave (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* OnError
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Called when an error occurred. Optional.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
//void OnError (void) {
|
||||||
|
//}
|
||||||
|
|
||||||
|
/*********************************************************************
|
||||||
|
*
|
||||||
|
* _SetupTarget
|
||||||
|
*
|
||||||
|
* Function description
|
||||||
|
* Setup the target.
|
||||||
|
* Called by AfterTargetReset() and AfterTargetDownload().
|
||||||
|
*
|
||||||
|
* Auto-generated function. May be overridden by Ozone.
|
||||||
|
*
|
||||||
|
**********************************************************************
|
||||||
|
*/
|
||||||
|
void _SetupTarget(void) {
|
||||||
|
unsigned int SP;
|
||||||
|
unsigned int PC;
|
||||||
|
unsigned int VectorTableAddr;
|
||||||
|
|
||||||
|
VectorTableAddr = Elf.GetBaseAddr();
|
||||||
|
//
|
||||||
|
// Set up initial stack pointer
|
||||||
|
//
|
||||||
|
SP = Target.ReadU32(VectorTableAddr);
|
||||||
|
if (SP != 0xFFFFFFFF) {
|
||||||
|
Target.SetReg("SP", SP);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// Set up entry point PC
|
||||||
|
//
|
||||||
|
PC = Elf.GetEntryPointPC();
|
||||||
|
if (PC != 0xFFFFFFFF) {
|
||||||
|
Target.SetReg("PC", PC);
|
||||||
|
} else {
|
||||||
|
Util.Error("Project script error: failed to set up entry point PC", 1);
|
||||||
|
}
|
||||||
|
}
|
@ -93,33 +93,8 @@ TU_ATTR_UNUSED static void power_event_handler(nrfx_power_usb_evt_t event)
|
|||||||
tusb_hal_nrf_power_event((uint32_t) event);
|
tusb_hal_nrf_power_event((uint32_t) event);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TRACE_ETM
|
|
||||||
void trace_etm_init(void) {
|
|
||||||
#ifdef NRF52840_XXAA
|
|
||||||
// Trace clk: P0.7, Trace D0..D3: P1.0, P0.11, P0.12, P1.09
|
|
||||||
// Setting drive strength to H0H1
|
|
||||||
uint32_t const pin_cnf = (GPIO_PIN_CNF_DRIVE_H0H1 << GPIO_PIN_CNF_DRIVE_Pos) |
|
|
||||||
(GPIO_PIN_CNF_INPUT_Disconnect << GPIO_PIN_CNF_INPUT_Pos);
|
|
||||||
NRF_P0->PIN_CNF[ 7] = pin_cnf; // CLK
|
|
||||||
NRF_P1->PIN_CNF[ 0] = pin_cnf; // D0
|
|
||||||
NRF_P0->PIN_CNF[11] = pin_cnf; // D1
|
|
||||||
NRF_P0->PIN_CNF[12] = pin_cnf; // D2
|
|
||||||
NRF_P1->PIN_CNF[ 9] = pin_cnf; // D3
|
|
||||||
|
|
||||||
// trace clock = 16 Mhz, Trace mux = parallel
|
|
||||||
NRF_CLOCK->TRACECONFIG = (CLOCK_TRACECONFIG_TRACEPORTSPEED_32MHz << CLOCK_TRACECONFIG_TRACEPORTSPEED_Pos) |
|
|
||||||
(CLOCK_TRACECONFIG_TRACEMUX_Parallel << CLOCK_TRACECONFIG_TRACEMUX_Pos);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
|
|
||||||
#define trace_etm_init()
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void board_init(void)
|
void board_init(void)
|
||||||
{
|
{
|
||||||
trace_etm_init();
|
|
||||||
|
|
||||||
// stop LF clock just in case we jump from application without reset
|
// stop LF clock just in case we jump from application without reset
|
||||||
NRF_CLOCK->TASKS_LFCLKSTOP = 1UL;
|
NRF_CLOCK->TASKS_LFCLKSTOP = 1UL;
|
||||||
|
|
||||||
|
@ -46,6 +46,12 @@ function(add_board_target BOARD_TARGET)
|
|||||||
target_compile_definitions(${BOARD_TARGET} PUBLIC
|
target_compile_definitions(${BOARD_TARGET} PUBLIC
|
||||||
CONFIG_GPIO_AS_PINRESET
|
CONFIG_GPIO_AS_PINRESET
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (TRACE_ETM STREQUAL "1")
|
||||||
|
# ENABLE_TRACE will cause system_nrf5x.c to set up ETM trace
|
||||||
|
target_compile_definitions(${BOARD_TARGET} PUBLIC ENABLE_TRACE)
|
||||||
|
endif ()
|
||||||
|
|
||||||
target_include_directories(${BOARD_TARGET} PUBLIC
|
target_include_directories(${BOARD_TARGET} PUBLIC
|
||||||
${CMAKE_CURRENT_FUNCTION_LIST_DIR}
|
${CMAKE_CURRENT_FUNCTION_LIST_DIR}
|
||||||
${NRFX_DIR}
|
${NRFX_DIR}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user