From 66df1cae85c4a9f68d2a134a233d548e0a301fc1 Mon Sep 17 00:00:00 2001 From: Paul Scheffler Date: Wed, 20 Nov 2024 19:53:22 +0100 Subject: [PATCH] make: Export environment to IP sub-makes --- cheshire.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cheshire.mk b/cheshire.mk index 1114f279..385278b3 100644 --- a/cheshire.mk +++ b/cheshire.mk @@ -88,29 +88,29 @@ $(CHS_ROOT)/hw/regs/cheshire_reg_pkg.sv $(CHS_ROOT)/hw/regs/cheshire_reg_top.sv: CLINTCORES ?= 1 include $(CLINTROOT)/clint.mk $(CLINTROOT)/.generated: - flock -x $@ $(MAKE) clint && touch $@ + flock -x $@ $(MAKE) -e clint && touch $@ # OpenTitan peripherals include $(OTPROOT)/otp.mk $(OTPROOT)/.generated: $(CHS_ROOT)/hw/rv_plic.cfg.hjson - flock -x $@ sh -c "cp $< $(dir $@)/src/rv_plic/; $(MAKE) -j1 otp" && touch $@ + flock -x $@ sh -c "cp $< $(dir $@)/src/rv_plic/; $(MAKE) -ej1 otp" && touch $@ # AXI RT AXIRT_NUM_MGRS ?= 6 AXIRT_NUM_SUBS ?= 2 include $(AXIRTROOT)/axirt.mk $(AXIRTROOT)/.generated: - flock -x $@ $(MAKE) axirt_regs && touch $@ + flock -x $@ $(MAKE) -e axirt_regs && touch $@ # AXI VGA include $(AXI_VGA_ROOT)/axi_vga.mk $(AXI_VGA_ROOT)/.generated: - flock -x $@ $(MAKE) axi_vga && touch $@ + flock -x $@ $(MAKE) -e axi_vga && touch $@ # Custom serial link $(CHS_SLINK_DIR)/.generated: $(CHS_ROOT)/hw/serial_link.hjson cp $< $(dir $@)/src/regs/serial_link_single_channel.hjson - flock -x $@ $(MAKE) -C $(CHS_SLINK_DIR) update-regs BENDER="$(BENDER)" && touch $@ + flock -x $@ $(MAKE) -eC $(CHS_SLINK_DIR) update-regs BENDER="$(BENDER)" && touch $@ # iDMA include $(IDMA_ROOT)/idma.mk