From 116ce4e23675d1f909f95cbe7f0adc63590e1e87 Mon Sep 17 00:00:00 2001 From: Luchian Mihai Date: Fri, 3 Oct 2025 19:06:06 +0300 Subject: [PATCH] boards/Board.mk: update romfs image generation --- boards/Board.mk | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/boards/Board.mk b/boards/Board.mk index f355bc1fe4..d7136e085a 100644 --- a/boards/Board.mk +++ b/boards/Board.mk @@ -18,27 +18,20 @@ # ############################################################################ -ifneq ($(RCSRCS)$(RCRAWS),) -ETCDIR := etctmp -ETCSRC := $(ETCDIR:%=%.c) +ifneq ($(ROMFSDIR),) -CSRCS += $(ETCSRC) +ROMFSIMG = romfs.img +ROMFSSRC := $(ROMFSIMG:%.img=%.c) -RCOBJS = $(RCSRCS:%=$(ETCDIR)$(DELIM)%) +CSRCS += $(ROMFSSRC) -$(RCOBJS): $(ETCDIR)$(DELIM)%: % - $(Q) mkdir -p $(dir $@) - $(call PREPROCESS, $<, $@) +$(ROMFSIMG): $(ROMFSDIR) + $(Q) genromfs -f $(ROMFSIMG) -d $(ROMFSDIR) -V "NSHInitVol" -$(ETCSRC): $(foreach raw,$(RCRAWS), $(if $(wildcard $(BOARD_DIR)$(DELIM)src$(DELIM)$(raw)), $(BOARD_DIR)$(DELIM)src$(DELIM)$(raw), $(if $(wildcard $(BOARD_COMMON_DIR)$(DELIM)$(raw)), $(BOARD_COMMON_DIR)$(DELIM)$(raw), $(BOARD_DIR)$(DELIM)src$(DELIM)$(raw)))) $(RCOBJS) - $(foreach raw, $(RCRAWS), \ - $(shell rm -rf $(ETCDIR)$(DELIM)$(raw)) \ - $(shell mkdir -p $(dir $(ETCDIR)$(DELIM)$(raw))) \ - $(shell cp -rfp $(if $(wildcard $(BOARD_DIR)$(DELIM)src$(DELIM)$(raw)), $(BOARD_DIR)$(DELIM)src$(DELIM)$(raw), $(if $(wildcard $(BOARD_COMMON_DIR)$(DELIM)$(raw)), $(BOARD_COMMON_DIR)$(DELIM)$(raw), $(BOARD_DIR)$(DELIM)src$(DELIM)$(raw))) $(ETCDIR)$(DELIM)$(raw))) - $(Q) genromfs -f romfs.img -d $(ETCDIR)$(DELIM)$(CONFIG_ETC_ROMFSMOUNTPT) -V "NSHInitVol" +$(ROMFSSRC): $(ROMFSIMG) $(Q) echo "#include " > $@ - $(Q) xxd -i romfs.img | sed -e "s/^unsigned char/const unsigned char aligned_data(4)/g" >> $@ - $(Q) rm romfs.img + $(Q) xxd -i $(ROMFSIMG) | sed -e "s/^unsigned char/const unsigned char aligned_data(4)/g" >> $@ + $(Q) rm $(ROMFSIMG) endif ifneq ($(ZDSVERSION),)