Added new config option NXP_CUSTOM_DCD_OBJS

+ Fix linker error due to wrong pointer type
wolfSSL · Nov 22, 2023 · ac17c82 · ac17c82
1 parent 83aa1d8
commit ac17c82
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/arch.mk b/arch.mk
@@ -783,6 +783,7 @@ endif
 
 ifeq ($(NXP_CUSTOM_DCD),1)
   CFLAGS+=-DNXP_CUSTOM_DCD
+  OBJS+=$(NXP_CUSTOM_DCD_OBJS)
 endif
 
 CFLAGS+=-DWOLFBOOT_ARCH_$(ARCH)

diff --git a/hal/imx_rt.c b/hal/imx_rt.c
@@ -570,7 +570,7 @@ const BOOT_DATA_T __attribute__((section(".boot_data"))) boot_data = {
 
 
 extern void isr_reset(void);
-extern const uint32_t __dcd_data_start;
+extern const uint8_t __dcd_data_start;
 const uint32_t dcd_data_addr = (uint32_t) &__dcd_data_start;
 
 #ifndef NXP_CUSTOM_DCD

diff --git a/tools/config.mk b/tools/config.mk
@@ -11,6 +11,7 @@ ifeq ($(ARCH),)
   MCUXPRESSO_CMSIS?=$(PWD)/CMSIS_5/CMSIS
   FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk
   NXP_CUSTOM_DCD=0
+  NXP_CUSTOM_DCD_OBJS=""
   STM32CUBE?=$(HOME)/STM32Cube/Repository/STM32Cube_FW_WB_V1.3.0
   CYPRESS_PDL?=$(HOME)/src/psoc6pdl
   CYPRESS_TARGET_LIB?=$(HOME)/src/TARGET_CY8CKIT-062S2-43012
@@ -97,4 +98,4 @@ CONFIG_VARS:= ARCH TARGET SIGN HASH MCUXSDK MCUXPRESSO MCUXPRESSO_CPU MCUXPRESSO
 	WOLFBOOT_UNIVERSAL_KEYSTORE \
 	XMSS_PARAMS \
 	ELF \
-	NXP_CUSTOM_DCD
+	NXP_CUSTOM_DCD NXP_CUSTOM_DCD_OBJS