Skip to content

Commit 118e698

Browse files
Update makefile
1 parent f387673 commit 118e698

File tree

1 file changed

+15
-20
lines changed

1 file changed

+15
-20
lines changed

ports/silabs/Makefile

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ BUILD ?= $(SILABS_BUILD)
3535
OUTPUT_DIR = $(SILABS_BUILD)
3636
# Python script to generate pins and pins functionalities code
3737
PY_GEN_PINS_SRC ?= tools/make_pins.py
38-
3938
# SLC tool path
4039
SLC_PATH = $(realpath $(CURDIR))/tools/build-tools/slc_cli
4140

41+
BUILD_VERBOSE ?= 1
42+
4243
CFLAGS = $(INCLUDES) $(C_DEFS) $(C_FLAGS) \
4344
-Wno-expansion-to-defined \
4445
-Wno-unused-parameter \
@@ -134,42 +135,36 @@ MCU_SECTIONS = $^ $@
134135
-include $(SILABS_BUILD)/$(PROJECTNAME).project.mak
135136

136137
# Default goal
137-
all:
138-
ifeq (,$(wildcard $(SILABS_BUILD)/$(PROJECTNAME).Makefile))
139-
+@$(MAKE) --no-print-directory slc-generate
140-
+@$(MAKE) --no-print-directory $(OUTPUT_DIR)/firmware.out
141-
else
142-
+@$(MAKE) --no-print-directory $(OUTPUT_DIR)/firmware.out
143-
endif
138+
all: $(OUTPUT_DIR)/firmware.bin
144139

145-
$(OUTPUT_DIR)/firmware.bin: $(SILABS_BUILD)/$(PROJECTNAME).Makefile $(OUTPUT_DIR)/firmware.out
140+
$(OUTPUT_DIR)/firmware.bin: $(SILABS_BUILD)/$(PROJECTNAME).Makefile $(OUTPUT_DIR)/firmware.hex
141+
+@$(MAKE) --no-print-directory $(OUTPUT_DIR)/firmware.out
146142

147143
$(SILABS_BUILD)/$(PROJECTNAME).Makefile:
148144
+@$(MAKE) --no-print-directory slc-generate
149-
+@$(MAKE) --no-print-directory $(OUTPUT_DIR)/firmware.out
150145

151146
$(OUTPUT_DIR)/firmware.out: $(SILABS_BUILD)/pin_functions.h $(SILABS_BUILD)/pins.c $(OBJ) $(OBJS) $(LIB_FILES)
152147
@echo 'Linking $(OUTPUT_DIR)/firmware.out'
153148
@echo "$(OBJS) $(OBJ)" > $(OUTPUT_DIR)/linker_objs
154149
$(CC) $(LD_FLAGS) @$(OUTPUT_DIR)/linker_objs $(LIBS) -o $(OUTPUT_DIR)/firmware.out
155150
$(OBJCOPY) $(OUTPUT_DIR)/firmware.out -O binary $(OUTPUT_DIR)/firmware.bin
156-
$(OBJCOPY) $(OUTPUT_DIR)/firmware.out -O ihex $(OUTPUT_DIR)/firmware.hex
157-
$(OBJCOPY) $(OUTPUT_DIR)/firmware.out -O srec $(OUTPUT_DIR)/firmware.s37
158151
@echo 'Done.'
159152

153+
$(OUTPUT_DIR)/firmware.hex:
154+
160155
$(SILABS_BUILD)/pin_functions.h:
161156
$(STEPECHO) "GEN $@"
162157
$(Q)$(PYTHON) $(PY_GEN_PINS_SRC) -e $@ boards/$(BOARD)/pins.csv boards/$(BOARD)/pin_functions.csv
163-
@-rm pins.c
158+
@-$(RM) pins.c
164159

165160
$(SILABS_BUILD)/pins.c:
166161
$(STEPECHO) "GEN $@"
167162
$(Q)$(PYTHON) $(PY_GEN_PINS_SRC) -s $@ boards/$(BOARD)/pins.csv boards/$(BOARD)/pin_functions.csv
168-
@-rm pin_functions.h
163+
@-$(RM) pin_functions.h
169164

170165
slc-generate:
171166
+@$(MAKE) -C tools all
172-
-@cp -f boards/$(BOARD)/MX25R3235F.toml ../../data/nvm.toml/flash/macronix/MX25R3235F.toml
167+
-@$(CP) -f boards/devkit_xg24_brd2601b/MX25R3235F.toml ../../data/nvm.toml/flash/macronix/MX25R3235F.toml
173168
ifeq (,$(wildcard $(SLC_PATH)/bin/slc-cli/developer/adapter_packs/python/lib/python3.6/jinja2))
174169
-@ln -s $(SLC_PATH)/bin/slc-cli/developer/adapter_packs/python/lib/python3.6/site-packages/jinja2 \
175170
$(SLC_PATH)/bin/slc-cli/developer/adapter_packs/python/lib/python3.6/jinja2
@@ -195,27 +190,27 @@ $(OBJS):
195190

196191
$(OUTPUT_DIR)/%.o: %.c
197192
@echo 'Building $<'
198-
@mkdir -p $(@D)
193+
@$(MKDIR_P) $(@D)
199194
$(ECHO)$(CC) $(CFLAGS) -c -o $@ $<
200195

201196
$(OUTPUT_DIR)/%.o: %.cpp
202197
@echo 'Building $<'
203-
@mkdir -p $(@D)
198+
@$(MKDIR_P) $(@D)
204199
$(ECHO)$(CXX) $(CXXFLAGS) -c -o $@ $<
205200

206201
$(OUTPUT_DIR)/%.o: %.cc
207202
@echo 'Building $<'
208-
@mkdir -p $(@D)
203+
@$(MKDIR_P) $(@D)
209204
$(ECHO)$(CXX) $(CXXFLAGS) -c -o $@ $<
210205

211206
$(OUTPUT_DIR)/%.o: %.s
212207
@echo 'Building $<'
213-
@mkdir -p $(@D)
208+
@$(MKDIR_P) $(@D)
214209
$(ECHO)$(CC) $(ASMFLAGS) -c -o $@ $<
215210

216211
$(OUTPUT_DIR)/%.o: %.S
217212
@echo 'Building $<'
218-
@mkdir -p $(@D)
213+
@$(MKDIR_P) $(@D)
219214
$(ECHO)$(CC) $(ASMFLAGS) -c -o $@ $<
220215

221216
include $(TOP)/py/mkrules.mk

0 commit comments

Comments
 (0)