Skip to content

Commit

Permalink
build: add a rule to manually generate the assembly configuration file
Browse files Browse the repository at this point in the history
This new rule can be used to re-generate the assembly configuration file
after the os.conf file has been manually edited.
  • Loading branch information
Zeal8bit committed Jul 6, 2024
1 parent c6f0998 commit 7974213
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build_zeal8bitos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
run: |
make alldefconfig
echo 'CONFIG_ENABLE_EMULATION_HOSTFS=y' >> os.conf
make asmconf
z88dk-z80asm
make
mv build/os_with_romdisk.img build/$(git describe --tags).img
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ LINKERFILE_PATH=target/$(TARGET)/$(LINKERFILE)
LINKERFILE_OBJ=$(patsubst %.asm,%.o,$(LINKERFILE_PATH))
LINKERFILE_BUILT=$(BINDIR)/$(LINKERFILE_OBJ)

.PHONY: check menuconfig $(SUBDIRS) version packer
.PHONY: check menuconfig $(SUBDIRS) version packer asmconf

all:$(KCONFIG_CONFIG) version packer precmd $(LINKERFILE_OBJ) $(OBJS)
$(CC) $(ASMFLAGS) -o$(FULLBIN) -b -m -s $(LINKERFILE_BUILT) $(BUILTOBJS)
Expand Down Expand Up @@ -144,6 +144,10 @@ define CONVERT_config_asm =
echo -e "\nENDIF" >> $2
endef

asmconf: $(KCONFIG_CONFIG)
@echo "Converting $(KCONFIG_CONFIG) to $(OSCONFIG_ASM) ..."
@$(call CONVERT_config_asm,$(KCONFIG_CONFIG), $(OSCONFIG_ASM))

menuconfig:
$(MENUCONFIG)
@echo "Converting $(KCONFIG_CONFIG) to $(OSCONFIG_ASM) ..."
Expand Down
2 changes: 1 addition & 1 deletion include/fs/hostfs_h.asm
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@
ENDIF ; CONFIG_ENABLE_EMULATION_HOSTFS


ENDIF ; ZEALFS_H
ENDIF ; HOSTFS_H

0 comments on commit 7974213

Please sign in to comment.