Skip to content

Commit 721b1ad

Browse files
committed
fragments: adopt master's lpc55s69 macro consolidation
Master (PR #773) consolidated WOLFSSL_NXP_LPC55S69_WITH_HWACCEL and WOLFSSL_NXP_LPC55S69_NO_HWACCEL into a single WOLFSSL_NXP_LPC55S6X hwaccel flag, switched the test/bench HASHDRBG and HW-feature gates to TARGET_lpc55s69 (covers both hwaccel and non-hwaccel builds), and dropped the NO_WOLFSSL_SHA256_INTERLEAVE workaround. Propagate those changes into the new include/user_settings/ fragments so the old macro names (which no longer exist in arch.mk/test-app/hal) don't leave the test/bench and NEEDS_HASHDRBG paths permanently disabled on lpc55s69.
1 parent d8a2b3b commit 721b1ad

2 files changed

Lines changed: 2 additions & 8 deletions

File tree

include/user_settings/cascade.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@
108108
#if defined(WOLFBOOT_TPM_PARMENC) || \
109109
defined(WOLFCRYPT_SECURE_MODE) || \
110110
((defined(WOLFCRYPT_TEST) || defined(WOLFCRYPT_BENCHMARK)) && \
111-
(defined(WOLFSSL_NXP_LPC55S69_WITH_HWACCEL) || \
112-
defined(WOLFSSL_NXP_LPC55S69_NO_HWACCEL)))
111+
defined(TARGET_lpc55s69))
113112
# ifndef WOLFBOOT_NEEDS_HASHDRBG
114113
# define WOLFBOOT_NEEDS_HASHDRBG
115114
# endif

include/user_settings/test_bench.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
#define _WOLFBOOT_USER_SETTINGS_TEST_BENCH_H_
2828

2929
#ifdef WOLFCRYPT_TEST
30-
# ifdef WOLFSSL_NXP_LPC55S69_WITH_HWACCEL
31-
/* lpc55s69 hashcrypt hw does not support interleaving */
32-
# define NO_WOLFSSL_SHA256_INTERLEAVE
33-
# endif
3430
/* Skip extended tests to save memory */
3531
# define NO_CRYPT_TEST_EXTENDED
3632
/* Use smaller certificate buffers */
@@ -82,8 +78,7 @@
8278
* finalize.h's chain-1 else branch. */
8379
# define HAVE_AESGCM
8480
# define GCM_TABLE
85-
# if defined(WOLFSSL_NXP_LPC55S69_WITH_HWACCEL) \
86-
|| defined(WOLFSSL_NXP_LPC55S69_NO_HWACCEL)
81+
# ifdef TARGET_lpc55s69
8782
/* LPC55S69 path uses real RNG hardware for the seed and HASHDRBG
8883
* for generation. NEEDS_HASHDRBG is declared in cascade.h on this
8984
* combination, so finalize.h emits HAVE_HASHDRBG. */

0 commit comments

Comments
 (0)