Skip to content

Commit 19a4689

Browse files
iabdalkaderdpgeorge
authored andcommitted
alif/mcu: Pre-process Alif ToC config file.
Signed-off-by: iabdalkader <[email protected]>
1 parent da46b4d commit 19a4689

File tree

2 files changed

+63
-8
lines changed

2 files changed

+63
-8
lines changed

ports/alif/Makefile

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,33 @@ JLINK_CMD_SUFFIX = \
2020
Reset\n\
2121
Exit
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+
2327
ifeq ($(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
2731
JLINK_CMD = '\
2832
$(JLINK_CMD_PREFIX)\
2933
LoadFile "$(BUILD)/M55_HP/firmware.bin",0x80020000\n\
3034
$(JLINK_CMD_SUFFIX)'
3135

3236
else 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
3640
JLINK_CMD = '\
3741
$(JLINK_CMD_PREFIX)\
3842
LoadFile "$(BUILD)/M55_HE/firmware.bin",0x80320000\n\
3943
$(JLINK_CMD_SUFFIX)'
4044

4145
else 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
4550
JLINK_CMD = '\
4651
$(JLINK_CMD_PREFIX)\
4752
LoadFile "$(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 $@

ports/alif/mcu/alif_cfg.json.in

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"DEVICE": {
3+
"disabled" : false,
4+
"binary": TOC_CFG_FILE,
5+
"version" : "0.5.00",
6+
"signed": false
7+
},
8+
"HP_BOOT": {
9+
#if TOC_CORE_M55_HP_BOOT
10+
"disabled" : false,
11+
#else
12+
"disabled" : true,
13+
#endif
14+
"binary": "bootloader.bin",
15+
"mramAddress": "0x80000000",
16+
"version": "1.0.0",
17+
"cpu_id": "M55_HP",
18+
"flags": ["boot"],
19+
"signed": false
20+
},
21+
"HP_APP": {
22+
#if TOC_CORE_M55_HP_APP
23+
"disabled" : false,
24+
#else
25+
"disabled" : true,
26+
#endif
27+
"binary": "M55_HP/firmware.bin",
28+
"mramAddress": "0x80020000",
29+
"version": "1.0.0",
30+
"cpu_id": "M55_HP",
31+
"flags": ["boot"],
32+
"signed": false
33+
},
34+
"HE_APP": {
35+
#if TOC_CORE_M55_HE_APP
36+
"disabled" : false,
37+
#else
38+
"disabled" : true,
39+
#endif
40+
"binary": "M55_HE/firmware.bin",
41+
"mramAddress": "0x80320000",
42+
"version": "1.0.0",
43+
"cpu_id": "M55_HE",
44+
"flags": ["deferred"],
45+
"signed": false
46+
}
47+
}

0 commit comments

Comments
 (0)