Cleanup, revert some Makefile edits

Author: gojimmypi

CMakeSettings.json

@@ -1,15 +1,15 @@
-{
-  "configurations": [
-    {
-      "name": "x64-Debug",
-      "generator": "Ninja",
-      "configurationType": "Debug",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
-      "buildRoot": "${projectDir}\\out\\build\\${name}",
-      "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": ""
-    }
-  ]
-}
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": ""
+    }
+  ]
+}

Makefile

@@ -51,7 +51,7 @@ else
   endif
 endif
 
-WOLFCRYPT_OBJS?=
+WOLFCRYPT_OBJS:=
 SECURE_OBJS:=
 PUBLIC_KEY_OBJS:=
 WOLFHSM_OBJS:=
@@ -135,11 +135,11 @@ ifeq ($(VISUALGDB),1)
   $(CMSIS_LOCAL_OBJ_DIR)/%.o: $(VISUALGDB_CMSIS_SRC)/%.c
 	@mkdir -p $(CMSIS_LOCAL_OBJ_DIR)
 	$(CC) $(CFLAGS) -c $< -o $@
+else
+  OBJS+=$(WOLFCRYPT_OBJS)
 endif
 # ============================================================================
 
--include .config
-
 $(info WOLFCRYPT_OBJS=$(WOLFCRYPT_OBJS))
 $(info MATH_OBJS=$(MATH_OBJS))
 

README.md

@@ -737,12 +737,12 @@ Use `make keysclean` to delete keys and regenerate.
     * RP2350 (Raspberry Pi Pico 2, ARM Cortex-M33 with TrustZone)
     * NXP MCXA153
     * NXP MCXW716
-    * STM32F1 series (STM32F103 “Blue Pill” board)
+    * STM32F1 series (STM32F103 "Blue Pill" board)
   * Improvements to supported targets
     * Xilinx UltraScale+ (ZynqMP)
         * Added hardware-accelerated SHA3 hashing via the CSU engine
         * Added support for enabling JTAG at runtime when `CSU_DEBUG` is set
-        * Introduced support for the device’s PUF (Physically Unclonable Function) for unique key generation and secure key storage (requires eFuses)
+        * Introduced support for the device's PUF (Physically Unclonable Function) for unique key generation and secure key storage (requires eFuses)
     * Renesas RX
         * Added option for TSIP hardware crypto engine
     * Infineon TriCore (AURIX TC3xx)

test-app/Makefile

@@ -201,7 +201,7 @@ ifeq ($(TARGET),sama5d3)
   LSCRIPT_TEMPLATE:=$(ARCH)-$(TARGET).ld
 endif
 
-ifeq ($(TARGET),stm32l4_disabled)
+ifeq ($(TARGET),stm32l4)
   APP_OBJS+=$(STM32CUBE)/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.o
   APP_OBJS+=$(STM32CUBE)/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.o
   CFLAGS+=-DSTM32L4A6xx -DUSE_HAL_DRIVER -Isrc -Ihal \