From 3cde02a046f97c627832d0d57422008c72eac0c5 Mon Sep 17 00:00:00 2001 From: "Yuhui.Zheng" <10982575+yuhui-zheng@users.noreply.github.com> Date: Wed, 18 Dec 2019 02:08:06 +0000 Subject: [PATCH] RVDS/Keil weak linkage for vPortSetupTimerInterrupt() -- CM4F, CM3 Test steps are documented in this PR https://github.com/aws/amazon-freertos/pull/1141. --- FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c | 4 ++-- FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c index 42d48157a8..dea221b146 100644 --- a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c +++ b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c @@ -1,4 +1,4 @@ -/* +-/* * FreeRTOS Kernel V10.2.1 * Copyright (C) 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * @@ -603,7 +603,7 @@ void xPortSysTickHandler( void ) */ #if( configOVERRIDE_DEFAULT_TICK_CONFIGURATION == 0 ) - void vPortSetupTimerInterrupt( void ) + __weak void vPortSetupTimerInterrupt( void ) { /* Calculate the constants required to configure the tick interrupt. */ #if( configUSE_TICKLESS_IDLE == 1 ) diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c index d3d42cfc81..6a9cbbf251 100644 --- a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c +++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c @@ -693,7 +693,7 @@ void xPortSysTickHandler( void ) */ #if( configOVERRIDE_DEFAULT_TICK_CONFIGURATION == 0 ) - void vPortSetupTimerInterrupt( void ) + __weak void vPortSetupTimerInterrupt( void ) { /* Calculate the constants required to configure the tick interrupt. */ #if( configUSE_TICKLESS_IDLE == 1 )