Skip to content

Commit ac17c82

Browse files
committed
Added new config option NXP_CUSTOM_DCD_OBJS
+ Fix linker error due to wrong pointer type
1 parent 83aa1d8 commit ac17c82

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

arch.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,7 @@ endif
783783

784784
ifeq ($(NXP_CUSTOM_DCD),1)
785785
CFLAGS+=-DNXP_CUSTOM_DCD
786+
OBJS+=$(NXP_CUSTOM_DCD_OBJS)
786787
endif
787788

788789
CFLAGS+=-DWOLFBOOT_ARCH_$(ARCH)

hal/imx_rt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ const BOOT_DATA_T __attribute__((section(".boot_data"))) boot_data = {
570570

571571

572572
extern void isr_reset(void);
573-
extern const uint32_t __dcd_data_start;
573+
extern const uint8_t __dcd_data_start;
574574
const uint32_t dcd_data_addr = (uint32_t) &__dcd_data_start;
575575

576576
#ifndef NXP_CUSTOM_DCD

tools/config.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ifeq ($(ARCH),)
1111
MCUXPRESSO_CMSIS?=$(PWD)/CMSIS_5/CMSIS
1212
FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk
1313
NXP_CUSTOM_DCD=0
14+
NXP_CUSTOM_DCD_OBJS=""
1415
STM32CUBE?=$(HOME)/STM32Cube/Repository/STM32Cube_FW_WB_V1.3.0
1516
CYPRESS_PDL?=$(HOME)/src/psoc6pdl
1617
CYPRESS_TARGET_LIB?=$(HOME)/src/TARGET_CY8CKIT-062S2-43012
@@ -97,4 +98,4 @@ CONFIG_VARS:= ARCH TARGET SIGN HASH MCUXSDK MCUXPRESSO MCUXPRESSO_CPU MCUXPRESSO
9798
WOLFBOOT_UNIVERSAL_KEYSTORE \
9899
XMSS_PARAMS \
99100
ELF \
100-
NXP_CUSTOM_DCD
101+
NXP_CUSTOM_DCD NXP_CUSTOM_DCD_OBJS

0 commit comments

Comments
 (0)