Skip to content

Commit

Permalink
Merge branch 'MDK-Packs:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthiasHertel80 authored Sep 29, 2021
2 parents f7a15a0 + 5bb1b41 commit cea38a0
Show file tree
Hide file tree
Showing 48 changed files with 14,768 additions and 203 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
// <0=> DWT Cycle Counter <1=> SysTick <2=> CMSIS-RTOS2 System Timer
// <3=> User Timer (Normal Reset) <4=> User Timer (Power-On Reset)
// <i>Selects source for 32-bit time stamp
#define EVENT_TIMESTAMP_SOURCE 0
#define EVENT_TIMESTAMP_SOURCE 2

// <o>Time Stamp Clock Frequency [Hz] <0-1000000000>
// <i>Defines initial time stamp clock frequency (0 when not used)
#define EVENT_TIMESTAMP_FREQ 25000000U
#define EVENT_TIMESTAMP_FREQ 0U

// </h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,7 @@ extern const pFunc __VECTOR_TABLE[496];
PendSV_Handler, /* -2: PendSV Handler */
SysTick_Handler, /* -1: SysTick Handler */

#ifdef __FVP_PY
ARM_VSI0_Handler,
#else
NONSEC_WATCHDOG_RESET_Handler, /* 0: Non-Secure Watchdog Reset Handler */
#endif
NONSEC_WATCHDOG_Handler, /* 1: Non-Secure Watchdog Handler */
SLOWCLK_Timer_Handler, /* 2: SLOWCLK Timer Handler */
TIMER0_Handler, /* 3: TIMER 0 Handler */
Expand Down Expand Up @@ -333,7 +329,105 @@ extern const pFunc __VECTOR_TABLE[496];
0, /* 128: Reserved */
0, /* 129: Reserved */
0, /* 130: Reserved */
};
0, /* 131: Reserved */
0, /* 132: Reserved */
0, /* 133: Reserved */
0, /* 134: Reserved */
0, /* 135: Reserved */
0, /* 136: Reserved */
0, /* 137: Reserved */
0, /* 138: Reserved */
0, /* 139: Reserved */
0, /* 140: Reserved */
0, /* 141: Reserved */
0, /* 142: Reserved */
0, /* 143: Reserved */
0, /* 144: Reserved */
0, /* 145: Reserved */
0, /* 146: Reserved */
0, /* 147: Reserved */
0, /* 148: Reserved */
0, /* 149: Reserved */
0, /* 150: Reserved */
0, /* 151: Reserved */
0, /* 152: Reserved */
0, /* 153: Reserved */
0, /* 154: Reserved */
0, /* 155: Reserved */
0, /* 156: Reserved */
0, /* 157: Reserved */
0, /* 158: Reserved */
0, /* 159: Reserved */
0, /* 160: Reserved */
0, /* 161: Reserved */
0, /* 162: Reserved */
0, /* 163: Reserved */
0, /* 164: Reserved */
0, /* 165: Reserved */
0, /* 166: Reserved */
0, /* 167: Reserved */
0, /* 168: Reserved */
0, /* 169: Reserved */
0, /* 170: Reserved */
0, /* 171: Reserved */
0, /* 172: Reserved */
0, /* 173: Reserved */
0, /* 174: Reserved */
0, /* 175: Reserved */
0, /* 176: Reserved */
0, /* 177: Reserved */
0, /* 178: Reserved */
0, /* 179: Reserved */
0, /* 180: Reserved */
0, /* 181: Reserved */
0, /* 182: Reserved */
0, /* 183: Reserved */
0, /* 184: Reserved */
0, /* 185: Reserved */
0, /* 186: Reserved */
0, /* 187: Reserved */
0, /* 188: Reserved */
0, /* 189: Reserved */
0, /* 190: Reserved */
0, /* 191: Reserved */
0, /* 192: Reserved */
0, /* 193: Reserved */
0, /* 194: Reserved */
0, /* 195: Reserved */
0, /* 196: Reserved */
0, /* 197: Reserved */
0, /* 198: Reserved */
0, /* 199: Reserved */
0, /* 200: Reserved */
0, /* 201: Reserved */
0, /* 202: Reserved */
0, /* 203: Reserved */
0, /* 204: Reserved */
0, /* 205: Reserved */
0, /* 206: Reserved */
0, /* 207: Reserved */
0, /* 208: Reserved */
0, /* 209: Reserved */
0, /* 210: Reserved */
0, /* 211: Reserved */
0, /* 212: Reserved */
0, /* 213: Reserved */
0, /* 214: Reserved */
0, /* 215: Reserved */
0, /* 216: Reserved */
0, /* 217: Reserved */
0, /* 218: Reserved */
0, /* 219: Reserved */
0, /* 220: Reserved */
0, /* 221: Reserved */
0, /* 222: Reserved */
0, /* 223: Reserved */
#ifdef __FVP_PY
ARM_VSI0_Handler, /* 224: VSI 0 */
#else
0, /* 224: Reserved */
#endif
};

#if defined ( __GNUC__ )
#pragma GCC diagnostic pop
Expand Down
2 changes: 1 addition & 1 deletion Platform_FVP_Corstone_SSE-300_Ethos-U55/debug.ini
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CORE_CLK=200000000
CORE_CLK=32000000
2 changes: 1 addition & 1 deletion Platform_FVP_Corstone_SSE-300_Ethos-U55/fvp_config.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Parameters:
# instance.parameter=value #(type, mode) default = 'def value' : description : [min..max]
#------------------------------------------------------------------------------
cpu_core.core_clk.mul=200000000 # (int , init-time) default = '0x17d7840' : Clock Rate Multiplier. This parameter is not exposed via CADI and can only be set in LISA
cpu_core.core_clk.mul=32000000 # (int , init-time) default = '0x17d7840' : Clock Rate Multiplier. This parameter is not exposed via CADI and can only be set in LISA
cpu_core.mps3_board.telnetterminal0.start_telnet=0 # (bool , init-time) default = '1' : Start telnet if nothing connected
cpu_core.mps3_board.uart0.out_file=- # (string, init-time) default = '' : Output file to hold data written by the UART (use '-' to send all output to stdout)
cpu_core.mps3_board.visualisation.disable-visualisation=1 # (bool , init-time) default = '0' : Enable/disable visualisation
Expand Down
4 changes: 2 additions & 2 deletions Platform_FVP_Corstone_SSE-300_Ethos-U55/microspeech.uvoptx
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DbgFMv8M</Key>
<Name>-I -S"System Generator:cpu_core" -L"cpu_core.cpu0" -O4102 -C0 -MC"..\..\Program Files\Arm\VHT\models\Win64_VC2017\arm_vsi.exe" -MF"fvp_config.txt" -PF -MA"-V "..\VSI\audio\python" -C cpu_core.mps3_board.telnetterminal0.start_telnet=1"</Name>
<Name>-I -S"System Generator:cpu_core" -L"cpu_core.cpu0" -O4102 -C0 -MC"..\..\Program Files\Arm\VHT\models\Win64_VC2017\VHT-Corstone-300.exe" -MF"fvp_config.txt" -PF -MA"-V "..\VSI\audio\python" -C cpu_core.mps3_board.telnetterminal0.start_telnet=1"</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
Expand Down Expand Up @@ -340,7 +340,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DbgFMv8M</Key>
<Name>-I -S"System Generator:cpu_core" -L"cpu_core.cpu0" -O4102 -C0 -MC"..\..\Program Files\Arm\VHT\models\Win64_VC2017\arm_vsi.exe" -MF"fvp_config.txt" -PF -MA"-V "..\VSI\audio\python" -C cpu_core.mps3_board.telnetterminal0.start_telnet=1"</Name>
<Name>-I -S"System Generator:cpu_core" -L"cpu_core.cpu0" -O4102 -C0 -MC"..\..\Program Files\Arm\VHT\models\Win64_VC2017\VHT-Corstone-300.exe" -MF"fvp_config.txt" -PF -MA"-V "..\VSI\audio\python" -C cpu_core.mps3_board.telnetterminal0.start_telnet=1"</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
Expand Down
2 changes: 1 addition & 1 deletion Platform_FVP_Corstone_SSE-300_Ethos-U55/run_example.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
"C:\Program Files\ARM\VHT\models\Win64_VC2017\arm_vsi.exe" -V "..\VSI\audio\python" -f fvp_config.txt -a Objects\microspeech.axf --stat --cyclelimit 4000000000 %*
"C:\Program Files\ARM\VHT\models\Win64_VC2017\VHT-Corstone-300.exe" -V "..\VSI\audio\python" -f fvp_config.txt -a Objects\microspeech.axf --stat --cyclelimit 768000000 %*
2 changes: 1 addition & 1 deletion Platform_FVP_Corstone_SSE-300_Ethos-U55/run_example.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
arm_vsi.x -V "../VSI/audio/python" -f fvp_config.txt -a Objects/microspeech.axf --stat --cyclelimit 4000000000 $*
VHT-Corstone-300 -V "../VSI/audio/python" -f fvp_config.txt -a Objects/microspeech.axf --stat --cyclelimit 768000000 $*
74 changes: 74 additions & 0 deletions Platform_IMXRT1050-EVKB/Board_IO/retarget_stdio.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/* -----------------------------------------------------------------------------
* Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the License); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* -------------------------------------------------------------------------- */

#include <stdint.h>
#include "fsl_debug_console.h" // NXP::Device:SDK Utilities:debug_console

int DbgConsole_SendDataReliable(uint8_t *ch, size_t size);
int DbgConsole_ReadCharacter(uint8_t *ch);

/**
Put a character to the stderr
\param[in] ch Character to output
\return The character written, or -1 on write error.
*/
int stderr_putchar (int ch) {
int32_t ret;

ret = DbgConsole_SendDataReliable((uint8_t *)(&ch), 1);

if (ret!= -1) {
ret = ch;
}
return (ret);
}

/**
Put a character to the stdout
\param[in] ch Character to output
\return The character written, or -1 on write error.
*/
int stdout_putchar (int ch) {
int32_t ret;

ret = DbgConsole_SendDataReliable((uint8_t *)(&ch), 1);

if (ret!= -1) {
ret = ch;
}
return (ret);
}

/**
Get a character from the stdio
\return The next character from the input, or -1 on read error.
*/
int stdin_getchar (void) {
int32_t ret;
uint8_t ch;

ret = DbgConsole_ReadCharacter(&ch);

if (ret!= -1) {
ret = ch;
}
return (ret);
}
Loading

0 comments on commit cea38a0

Please sign in to comment.