Skip to content

Commit 2e90fcd

Browse files
authored
Merge pull request ARMmbed#39 from linlingao/us_timer_test
Rename some ti files as they have the same name as mbedtls
2 parents 6501001 + 1a3b3c1 commit 2e90fcd

File tree

4 files changed

+2
-2
lines changed

4 files changed

+2
-2
lines changed

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/ti/devices/cc32xx/driverlib/aes.c renamed to targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/ti/devices/cc32xx/driverlib/ti_aes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#include "inc/hw_memmap.h"
5454
#include "inc/hw_nvic.h"
5555
#include "inc/hw_types.h"
56-
#include "aes.h"
56+
#include "ti_aes.h"
5757
#include "debug.h"
5858
#include "interrupt.h"
5959

File renamed without changes.

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/ti/devices/cc32xx/driverlib/des.c renamed to targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/ti/devices/cc32xx/driverlib/ti_des.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#include "inc/hw_memmap.h"
5454
#include "inc/hw_types.h"
5555
#include "debug.h"
56-
#include "des.h"
56+
#include "ti_des.h"
5757
#include "interrupt.h"
5858

5959

File renamed without changes.

0 commit comments

Comments
 (0)