diff --git a/Makefile b/Makefile
index 37884dd5..c235c70a 100644
--- a/Makefile
+++ b/Makefile
@@ -203,8 +203,8 @@ test-app/image.bin: wolfboot-align.bin
 standalone:
 	@make -C test-app TARGET=$(TARGET) EXT_FLASH=$(EXT_FLASH) SPI_FLASH=$(SPI_FLASH) ARCH=$(ARCH) \
     V=$(V) RAM_CODE=$(RAM_CODE) WOLFBOOT_VERSION=$(WOLFBOOT_VERSION)\
-	KINETIS=$(KINETIS) KINETIS_CPU=$(KINETIS_CPU) KINETIS_DRIVERS=$(KINETIS_DRIVERS) \
-	KINETIS_CMSIS=$(KINETIS_CMSIS) NVM_FLASH_WRITEONCE=$(NVM_FLASH_WRITEONCE) \
+	MCUXPRESSO=$(MCUXPRESSO) MCUXPRESSO_CPU=$(MCUXPRESSO_CPU) MCUXPRESSO_DRIVERS=$(MCUXPRESSO_DRIVERS) \
+	MCUXPRESSO_CMSIS=$(MCUXPRESSO_CMSIS) NVM_FLASH_WRITEONCE=$(NVM_FLASH_WRITEONCE) \
 	FREEDOM_E_SDK=$(FREEDOM_E_SDK) standalone
 	$(Q)$(OBJCOPY) -O binary test-app/image.elf standalone.bin
 	@$(SIZE) test-app/image.elf
diff --git a/arch.mk b/arch.mk
index e668fa7b..1d123776 100644
--- a/arch.mk
+++ b/arch.mk
@@ -105,17 +105,23 @@ endif
 
 
 ifeq ($(TARGET),kinetis)
-  CFLAGS+= -I$(KINETIS_DRIVERS)/drivers -I$(KINETIS_DRIVERS) -DCPU_$(KINETIS_CPU) -I$(KINETIS_CMSIS)/Include -DDEBUG_CONSOLE_ASSERT_DISABLE=1
-  OBJS+= $(KINETIS_DRIVERS)/drivers/fsl_clock.o $(KINETIS_DRIVERS)/drivers/fsl_ftfx_flash.o $(KINETIS_DRIVERS)/drivers/fsl_ftfx_cache.o $(KINETIS_DRIVERS)/drivers/fsl_ftfx_controller.o
+  CFLAGS+= -I$(MCUXPRESSO_DRIVERS)/drivers -I$(MCUXPRESSO_DRIVERS) -DCPU_$(MCUXPRESSO_CPU) -I$(MCUXPRESSO_CMSIS)/Include -DDEBUG_CONSOLE_ASSERT_DISABLE=1
+  OBJS+= $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_ftfx_flash.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_ftfx_cache.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_ftfx_controller.o
   ## The following lines can be used to enable HW acceleration
-  ifeq ($(KINETIS_CPU),MK82FN256VLL15)
+  ifeq ($(MCUXPRESSO_CPU),MK82FN256VLL15)
     ifeq ($(PKA),1)
       PKA_EXTRA_CFLAGS+=-DFREESCALE_LTC_ECC -DFREESCALE_USE_LTC -DFREESCALE_LTC_TFM
-      PKA_EXTRA_OBJS+=./lib/wolfssl/wolfcrypt/src/port/nxp/ksdk_port.o $(KINETIS_DRIVERS)/drivers/fsl_ltc.o
+      PKA_EXTRA_OBJS+=./lib/wolfssl/wolfcrypt/src/port/nxp/ksdk_port.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_ltc.o
     endif
   endif
 endif
 
+ifeq ($(TARGET),lpc)
+  CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/drivers -I$(MCUXPRESSO_DRIVERS) -DCPU_$(MCUXPRESSO_CPU) -I$(MCUXPRESSO_CMSIS)/Include -DDEBUG_CONSOLE_ASSERT_DISABLE=1
+  OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_flashiap.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_power.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_reset.o
+  OBJS+=$(MCUXPRESSO_DRIVERS)/mcuxpresso/libpower_softabi.a $(MCUXPRESSO_DRIVERS)/drivers/fsl_common.o
+endif
+
 
 CFLAGS+=-DARCH_FLASH_OFFSET=$(ARCH_FLASH_OFFSET)
 
diff --git a/config/examples/kinetis-k82f.config b/config/examples/kinetis-k82f.config
index eb32260a..3f832222 100644
--- a/config/examples/kinetis-k82f.config
+++ b/config/examples/kinetis-k82f.config
@@ -1,10 +1,10 @@
 ARCH?=ARM
 TARGET?=kinetis
 SIGN?=ECC256
-KINETIS?=$(HOME)/src/FRDM-K82F
-KINETIS_CPU?=MK82FN256VLL15
-KINETIS_DRIVERS?=$(KINETIS)/devices/MK82F25615
-KINETIS_CMSIS?=$(HOME)/src/FRDM-K64F/CMSIS
+MCUXPRESSO?=$(HOME)/src/FRDM-K82F
+MCUXPRESSO_CPU?=MK82FN256VLL15
+MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK82F25615
+MCUXPRESSO_CMSIS?=$(HOME)/src/FRDM-K64F/CMSIS
 FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk
 DEBUG?=0
 VTOR?=1
diff --git a/lib/wolfssl b/lib/wolfssl
index 3f13b49f..1ea77552 160000
--- a/lib/wolfssl
+++ b/lib/wolfssl
@@ -1 +1 @@
-Subproject commit 3f13b49fa318fbd3216d7da36d942e7c276d3413
+Subproject commit 1ea7755232f9901cb6fa015c224004d18a4aa2f2
diff --git a/src/boot_arm.c b/src/boot_arm.c
index 02ebfa3e..1430729d 100644
--- a/src/boot_arm.c
+++ b/src/boot_arm.c
@@ -37,7 +37,7 @@ extern void main(void);
 
 void isr_reset(void) {
     register unsigned int *src, *dst;
-#ifdef PLATFORM_kinetis
+#if defined(PLATFORM_kinetis) || defined(PLATFORM_lpc)
     /* Immediately disable Watchdog after boot */
     /*  Write Keys to unlock register */
     *((volatile unsigned short *)0x4005200E) = 0xC520;
diff --git a/test-app/Makefile b/test-app/Makefile
index 2f0a3d06..a0fbb06e 100644
--- a/test-app/Makefile
+++ b/test-app/Makefile
@@ -2,7 +2,7 @@
 -include ../tools/config.mk
 TARGET?=none
 ARCH?=ARM
-KINETIS_CMSIS?=$(KINETIS)/CMSIS
+MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
 
 ifeq ($(SIGN),RSA2048)
   IMAGE_HEADER_SIZE:=512
@@ -57,9 +57,9 @@ ifeq ($(SPI_FLASH),1)
 endif
 
 ifeq ($(TARGET),kinetis)
-  CFLAGS+= -I$(KINETIS_DRIVERS)/drivers -I$(KINETIS_DRIVERS) -DCPU_$(KINETIS_CPU) -I$(KINETIS_CMSIS)/Include -DDEBUG_CONSOLE_ASSERT_DISABLE=1 -DNVM_FLASH_WRITEONCE=1
-  APP_OBJS+= $(KINETIS_DRIVERS)/drivers/fsl_clock.o $(KINETIS_DRIVERS)/drivers/fsl_ftfx_flash.o $(KINETIS_DRIVERS)/drivers/fsl_ftfx_cache.o \
-  $(KINETIS_DRIVERS)/drivers/fsl_ftfx_controller.o $(KINETIS_DRIVERS)/drivers/fsl_gpio.o
+  CFLAGS+= -I$(MCUXPRESSO_DRIVERS)/drivers -I$(MCUXPRESSO_DRIVERS) -DCPU_$(MCUXPRESSO_CPU) -I$(MCUXPRESSO_CMSIS)/Include -DDEBUG_CONSOLE_ASSERT_DISABLE=1 -DNVM_FLASH_WRITEONCE=1
+  APP_OBJS+= $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_ftfx_flash.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_ftfx_cache.o \
+  $(MCUXPRESSO_DRIVERS)/drivers/fsl_ftfx_controller.o $(MCUXPRESSO_DRIVERS)/drivers/fsl_gpio.o
 endif
 
 ifeq ($(TARGET),stm32g0)
diff --git a/tools/config.mk b/tools/config.mk
index 16929f44..872cec9c 100644
--- a/tools/config.mk
+++ b/tools/config.mk
@@ -4,10 +4,10 @@ ifeq ($(ARCH),)
   TARGET?=stm32f4
   SIGN?=ED25519
   HASH?=SHA256
-  KINETIS?=$(HOME)/src/FRDM-K64F
-  KINETIS_CPU=MK64FN1M0VLL12
-  KINETIS_DRIVERS?=$(KINETIS)/devices/MK64F12
-  KINETIS_CMSIS?=$(KINETIS)/CMSIS
+  MCUXPRESSO?=$(HOME)/src/FRDM-K64F
+  MCUXPRESSO_CPU=MK64FN1M0VLL12
+  MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK64F12
+  MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
   FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk
   STM32CUBE?=$(HOME)/STM32Cube/Repository/STM32Cube_FW_WB_V1.3.0
   DEBUG?=0
@@ -34,8 +34,8 @@ ifeq ($(ARCH),)
 endif
 
 
-CONFIG_VARS:= ARCH TARGET SIGN HASH KINETIS KINETIS_CPU KINETIS_DRIVERS \
-	KINETIS_CMSIS FREEDOM_E_SDK STM32CUBE DEBUG VTOR CORTEX_M0 NO_ASM EXT_FLASH \
+CONFIG_VARS:= ARCH TARGET SIGN HASH MCUXPRESSO MCUXPRESSO_CPU MCUXPRESSO_DRIVERS \
+	MCUXPRESSO_CMSIS FREEDOM_E_SDK STM32CUBE DEBUG VTOR CORTEX_M0 NO_ASM EXT_FLASH \
 	SPI_FLASH ALLOW_DOWNGRADE NVM_FLASH_WRITEONCE WOLFBOOT_VERSION V \
 	SPMATH RAM_CODE DUALBANK_SWAP IMAGE_HEADER_SIZE PKA WOLFTPM \
 	WOLFBOOT_PARTITION_SIZE WOLFBOOT_SECTOR_SIZE  \