@@ -20,28 +20,33 @@ JLINK_CMD_SUFFIX = \
2020Reset\n\
2121Exit
2222
23+ ALIF_TOC_CONFIG = alif_cfg.json
24+ ALIF_TOC_APPS = $(BUILD ) /$(ALIF_TOC_CONFIG )
25+ ALIF_TOC_CFLAGS += -DTOC_CFG_FILE=$(ALIF_TOOLKIT_CFG_FILE )
26+
2327ifeq ($(MCU_CORE ) ,M55_HP)
2428
25- ALIF_TOC_CONFIG = mcu/M55_HP_cfg.json
26- ALIF_TOC_APPS = $(BUILD ) /M55_HP/firmware.bin
29+ ALIF_TOC_CFLAGS += -DTOC_CORE_M55_HP_APP=1
30+ ALIF_TOC_APPS + = $(BUILD ) /M55_HP/firmware.bin
2731JLINK_CMD = '\
2832$(JLINK_CMD_PREFIX ) \
2933LoadFile "$(BUILD ) /M55_HP/firmware.bin",0x80020000\n\
3034$(JLINK_CMD_SUFFIX ) '
3135
3236else ifeq ($(MCU_CORE),M55_HE)
3337
34- ALIF_TOC_CONFIG = mcu/M55_HE_cfg.json
35- ALIF_TOC_APPS = $(BUILD ) /M55_HE/firmware.bin
38+ ALIF_TOC_CFLAGS += -DTOC_CORE_M55_HE_APP=1
39+ ALIF_TOC_APPS + = $(BUILD ) /M55_HE/firmware.bin
3640JLINK_CMD = '\
3741$(JLINK_CMD_PREFIX ) \
3842LoadFile "$(BUILD ) /M55_HE/firmware.bin",0x80320000\n\
3943$(JLINK_CMD_SUFFIX ) '
4044
4145else ifeq ($(MCU_CORE),M55_DUAL)
4246
43- ALIF_TOC_CONFIG = mcu/M55_DUAL_cfg.json
44- ALIF_TOC_APPS = $(BUILD ) /M55_HP/firmware.bin $(BUILD ) /M55_HE/firmware.bin
47+ ALIF_TOC_CFLAGS += -DTOC_CORE_M55_HP_APP=1
48+ ALIF_TOC_CFLAGS += -DTOC_CORE_M55_HE_APP=1
49+ ALIF_TOC_APPS += $(BUILD ) /M55_HP/firmware.bin $(BUILD ) /M55_HE/firmware.bin
4550JLINK_CMD = '\
4651$(JLINK_CMD_PREFIX ) \
4752LoadFile "$(BUILD ) /M55_HP/firmware.bin",0x80020000\n\
@@ -81,10 +86,13 @@ $(BUILD)/M55_HP/firmware.bin:
8186$(BUILD ) /M55_HE/firmware.bin :
8287 make -f alif.mk MCU_CORE=M55_HE MICROPY_PY_OPENAMP_MODE=1
8388
89+ $(BUILD ) /$(ALIF_TOC_CONFIG ) : mcu/$(ALIF_TOC_CONFIG ) .in | $(BUILD )
90+ $(ECHO ) " Preprocess toc config $@ "
91+ $(Q )$(CPP ) -P -E $(ALIF_TOC_CFLAGS ) - < mcu/$(ALIF_TOC_CONFIG ) .in > $@
92+
8493$(BUILD ) /firmware.toc.bin : $(ALIF_TOC_APPS )
8594 $(Q ) python $(ALIF_TOOLS ) /app-gen-toc.py \
86- --filename $(abspath $(ALIF_TOC_CONFIG ) ) \
87- --config-dir $(BOARD_DIR ) \
95+ --filename $(abspath $(BUILD ) /$(ALIF_TOC_CONFIG ) ) \
8896 --output-dir $(BUILD ) \
8997 --firmware-dir $(BUILD ) \
9098 --output $@
0 commit comments