Skip to content

Commit 0b82680

Browse files
committed
Fix tabs vs. space in .mk files
1 parent 72a0aa3 commit 0b82680

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

arch.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ ifeq ($(CORTEX_A5),1)
189189
FPU=-mfpu=vfp4-d16
190190
CFLAGS+=-mcpu=cortex-a5 -mtune=cortex-a5 -static -z noexecstack
191191
LDLAGS+=-mcpu=cortex-a5 -mtune=cortex-a5 -mtune=cortex-a5 -static \
192-
-z noexecstack -Ttext 0x300000
192+
-z noexecstack -Ttext 0x300000
193193
# Cortex-A uses boot_arm32.o
194194
OBJS+=src/boot_arm32.o src/boot_arm32_start.o
195195
ifeq ($(NO_ASM),1)
@@ -200,15 +200,15 @@ ifeq ($(CORTEX_A5),1)
200200
OBJS+=./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha256-asm.o
201201
OBJS+=./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.o
202202
CFLAGS+=-DWOLFSSL_SP_ARM32_ASM -DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_NO_HW_CRYPTO \
203-
-DWOLFSSL_ARM_ARCH=7 -DWOLFSSL_ARMASM_INLINE -DWOLFSSL_ARMASM_NO_NEON
203+
-DWOLFSSL_ARM_ARCH=7 -DWOLFSSL_ARMASM_INLINE -DWOLFSSL_ARMASM_NO_NEON
204204
endif
205205
else
206206
# All others use boot_arm.o
207207
OBJS+=src/boot_arm.o
208208
ifneq ($(NO_ARM_ASM),1)
209209
CORTEXM_ARM_EXTRA_OBJS= \
210210
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-aes.o \
211-
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-chacha.o \
211+
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-chacha.o \
212212
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha256.o \
213213
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha512.o \
214214
./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-aes-asm.o \
@@ -228,7 +228,7 @@ else
228228
./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-sha256-asm_c.o
229229

230230
CORTEXM_ARM_EXTRA_CFLAGS+=-DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_NO_HW_CRYPTO \
231-
-DWOLFSSL_ARMASM_INLINE -DWOLFSSL_ARMASM_NO_NEON
231+
-DWOLFSSL_ARMASM_INLINE -DWOLFSSL_ARMASM_NO_NEON
232232
endif
233233
ifeq ($(CORTEX_M33),1)
234234
CFLAGS+=-mcpu=cortex-m33 -DCORTEX_M33
@@ -281,7 +281,7 @@ else
281281
else
282282
CFLAGS+=-DWOLFSSL_SP_ASM -DWOLFSSL_SP_ARM_THUMB_ASM
283283
MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_armthumb.o
284-
# TODO: integrate thumb2-asm
284+
# TODO: integrate thumb2-asm
285285
#CFLAGS+=$(CORTEXM_ARM_EXTRA_CFLAGS) -DWOLFSSL_ARM_ARCH=6
286286
#OBJS+=$(CORTEXM_ARM_THUMB_EXTRA_OBJS)
287287
endif

options.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -684,9 +684,9 @@ ifeq ($(WOLFCRYPT_TZ_PKCS11),1)
684684
WOLFCRYPT_OBJS+=./lib/wolfssl/wolfcrypt/src/hmac.o
685685
WOLFCRYPT_OBJS+=./lib/wolfssl/wolfcrypt/src/dh.o
686686
WOLFCRYPT_OBJS+=./lib/wolfPKCS11/src/crypto.o \
687-
./lib/wolfPKCS11/src/internal.o \
688-
./lib/wolfPKCS11/src/slot.o \
689-
./lib/wolfPKCS11/src/wolfpkcs11.o
687+
./lib/wolfPKCS11/src/internal.o \
688+
./lib/wolfPKCS11/src/slot.o \
689+
./lib/wolfPKCS11/src/wolfpkcs11.o
690690
STACK_USAGE=16688
691691
ifneq ($(ENCRYPT),1)
692692
WOLFCRYPT_OBJS+=./lib/wolfssl/wolfcrypt/src/aes.o

0 commit comments

Comments
 (0)