diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/retarget.c b/IDE/ROWLEY-CROSSWORKS-ARM/retarget.c index 958316381..a2a61a4f4 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/retarget.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/retarget.c @@ -29,6 +29,12 @@ void __assert(const char *__expression, const char *__filename, int __line) printf("Assert: %s, File %s (%d)\n", __expression, __filename, __line); } +unsigned long ksdk_time(unsigned long* timer) +{ + (void)timer; + return hw_get_time_sec(); +} + unsigned int LowResTimer(void) { return hw_get_time_sec(); diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h b/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h index 95a795e02..ad720b32b 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h +++ b/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h @@ -7,6 +7,8 @@ extern "C" { #endif +#include /* for size_t */ + /* ------------------------------------------------------------------------- */ /* Platform */ /* ------------------------------------------------------------------------- */ @@ -270,6 +272,8 @@ extern "C" { /* Allows custom "custom_time()" function to be used for benchmark */ #define WOLFSSL_USER_CURRTIME #define USER_TICKS +extern unsigned long ksdk_time(unsigned long* timer); +#define XTIME ksdk_time /* ------------------------------------------------------------------------- */ diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c index 229132456..b2b6e1f53 100644 --- a/wolfcrypt/benchmark/benchmark.c +++ b/wolfcrypt/benchmark/benchmark.c @@ -52,9 +52,10 @@ #else #include #endif -#elif defined(FREESCALE_KSDK_BM) +#elif defined(FREESCALE_KSDK_1_3) #include "fsl_debug_console.h" #include "fsl_os_abstraction.h" + #undef printf #define printf PRINTF #else diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index bd478ffba..3788b6843 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -154,6 +154,7 @@ ASN Options: #elif defined(FREESCALE_KSDK_BM) || defined(FREESCALE_FREE_RTOS) || defined(FREESCALE_KSDK_FREERTOS) #include #ifndef XTIME + /*extern time_t ksdk_time(time_t* timer);*/ #define XTIME(t1) ksdk_time((t1)) #endif #define XGMTIME(c, t) gmtime((c)) @@ -239,10 +240,6 @@ ASN Options: struct tm* gmtime(const time_t* timer); #endif -#if defined(FREESCALE_KSDK_BM) || defined(FREESCALE_FREE_RTOS) - /* extern time_t ksdk_time(time_t* timer); */ -#endif /* FREESCALE_KSDK_BM || FREESCALE_FREE_RTOS */ - #if defined(_WIN32_WCE) time_t windows_time(time_t* timer) diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c index 3fb8287c4..2e5f84bcf 100755 --- a/wolfcrypt/src/ecc.c +++ b/wolfcrypt/src/ecc.c @@ -2283,6 +2283,8 @@ exit: return err; } +#endif /* !FREESCALE_LTC_ECC */ + /** ECC Fixed Point mulmod global k The multiplicand G Base point to multiply @@ -2299,8 +2301,6 @@ int wc_ecc_mulmod(mp_int* k, ecc_point *G, ecc_point *R, mp_int* a, return wc_ecc_mulmod_ex(k, G, R, a, modulus, map, NULL); } -#endif /* !FREESCALE_LTC_ECC */ - #ifdef ALT_ECC_SIZE