diff --git a/hal/nxp_p1021.ld b/hal/nxp_p1021.ld
index 374f3d642..e10f50764 100644
--- a/hal/nxp_p1021.ld
+++ b/hal/nxp_p1021.ld
@@ -62,8 +62,6 @@ SECTIONS
         _start_data = .;
         KEEP(*(.data*))
         . = ALIGN(4);
-        KEEP(*(.ramcode))
-        . = ALIGN(4);
         _end_data = .;
     } > DRAM
 
diff --git a/hal/nxp_p1021_stage1.ld b/hal/nxp_p1021_stage1.ld
index f1aa2c858..040e3d571 100644
--- a/hal/nxp_p1021_stage1.ld
+++ b/hal/nxp_p1021_stage1.ld
@@ -85,8 +85,6 @@ SECTIONS
         _start_data = .;
         KEEP(*(.data*))
         . = ALIGN(4);
-        KEEP(*(.ramcode))
-        . = ALIGN(4);
         _end_data = .;
     } > DRAM
 
diff --git a/options.mk b/options.mk
index 10ab7ade2..bae89a7c2 100644
--- a/options.mk
+++ b/options.mk
@@ -532,6 +532,7 @@ endif
 
 ifeq ($(WOLFCRYPT_TZ_PKCS11),1)
   CFLAGS+=-DSECURE_PKCS11
+  CFLAGS+=-DWOLFSSL_PKCS11_RW_TOKENS
   CFLAGS+=-DCK_CALLABLE="__attribute__((cmse_nonsecure_entry))"
   CFLAGS+=-Ilib/wolfPKCS11
   CFLAGS+=-DWP11_HASH_PIN_COST=3
diff --git a/stage1/Makefile b/stage1/Makefile
index fe99eeee4..50a97e197 100644
--- a/stage1/Makefile
+++ b/stage1/Makefile
@@ -10,7 +10,7 @@ include ../tools/config.mk
 ## Initializers
 WOLFBOOT_ROOT?=$(PWD)
 CFLAGS:=-D"__WOLFBOOT"
-CFLAGS+=-Werror -Wextra
+CFLAGS+=-Werror -Wextra -nostdlib
 LDFLAGS:=
 LSCRIPT:=loader_stage1.ld
 LSCRIPT_IN:=../hal/$(TARGET)_stage1.ld
@@ -36,6 +36,8 @@ STAGE1=1
 ifeq ($(ARCH),PPC)
 	WOLFTPM=0
 	WOLFBOOT_TPM_KEYSTORE=0
+	RAM_CODE=0
+	UPDATE_OBJS:=
 endif
 ELF=0
 MULTIBOOT2=0