From e4a38ada86f7279d432410a61a3f36bf58a1ca88 Mon Sep 17 00:00:00 2001 From: yuhzheng 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. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2763 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- 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 42d48157a..dea221b14 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 d3d42cfc8..6a9cbbf25 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 ) -- 2.39.2