Browse Source

Add heapmgr and consoleio dependency for all freertos CPU specific units

Pierre Muller 1 year ago
parent
commit
d7eef9c3ca
2 changed files with 2 additions and 10 deletions
  1. 1 5
      rtl/freertos/Makefile
  2. 1 5
      rtl/freertos/Makefile.fpc

+ 1 - 5
rtl/freertos/Makefile

@@ -3130,15 +3130,11 @@ consoleio$(PPUEXT) : consoleio.pp $(SYSTEMUNIT)$(PPUEXT)
 heapmgr$(PPUEXT) : heapmgr.pp $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $<
 define CPU_UNITS_RULE
-ifeq ($(ARCH),avr)
-$(1)$(PPUEXT): $(ARCH)/$(1).pp intrinsics$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
-else
-ifeq ($(ARCH),xtensa)
+ifneq ($(filter $(ARCH),arm riscv32 xtensa),)
 $(1)$(PPUEXT): $(ARCH)/$(1).pp consoleio$(PPUEXT) heapmgr$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 else
 $(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT)
 endif
-endif
 endef
 $(foreach unit,$(CPU_UNITS),$(eval $(call CPU_UNITS_RULE,$(unit))))
 $(addsuffix $(PPUEXT),$(CPU_UNITS)):

+ 1 - 5
rtl/freertos/Makefile.fpc

@@ -280,15 +280,11 @@ heapmgr$(PPUEXT) : heapmgr.pp $(SYSTEMUNIT)$(PPUEXT)
 #
 
 define CPU_UNITS_RULE
-ifeq ($(ARCH),avr)
-$(1)$(PPUEXT): $(ARCH)/$(1).pp intrinsics$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
-else
-ifeq ($(ARCH),xtensa)
+ifneq ($(filter $(ARCH),arm riscv32 xtensa),)
 $(1)$(PPUEXT): $(ARCH)/$(1).pp consoleio$(PPUEXT) heapmgr$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 else
 $(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT)
 endif
-endif
 endef
 
 $(foreach unit,$(CPU_UNITS),$(eval $(call CPU_UNITS_RULE,$(unit))))