From c3714e44104a69db431a7dad3521be165a9c7a4d Mon Sep 17 00:00:00 2001 From: "A. Hahn" Date: Wed, 7 Aug 2024 11:00:37 +0200 Subject: [PATCH 1/2] Firmware: add fw-fg-scu2-scu3 target and rename bg target to fw-bg in Makefile --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e99cd70f2..28ad13b69 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,7 @@ gateware: all pexarria5 exploder5 vetar2a vetar2a-ee-butis scu2 scu3 pmc microtc install: etherbone-install tools-install driver-install -clean:: etherbone-clean tools-clean tlu-clean sdbfs-clean driver-clean lm32-toolchain-clean firmware-clean scu2-clean scu3-clean vetar2a-clean vetar2a-ee-butis-clean exploder5-clean pexarria5-clean sio3-clean ecatools-clean pmc-clean microtca-clean bg-clean +clean:: etherbone-clean tools-clean tlu-clean sdbfs-clean driver-clean lm32-toolchain-clean firmware-clean scu2-clean scu3-clean vetar2a-clean vetar2a-ee-butis-clean exploder5-clean pexarria5-clean sio3-clean ecatools-clean pmc-clean microtca-clean distclean:: clean git clean -xfd . @@ -495,12 +495,18 @@ blm-clean:: # LM32 firmware # ################################################################################################# -bg: lm32-toolchain +fw-bg: lm32-toolchain $(MAKE) -C modules/burst_generator -bg-clean:: +fw-bg-clean:: $(MAKE) -C modules/burst_generator clean +fw-fg-scu2-scu3: lm32-toolchain + $(MAKE) -C syn/gsi_scu/control2 scu_control.elf + +fw-fg-scu2-scu3-clean:: + $(MAKE) -C syn/gsi_scu/control2 clean + # ################################################################################################# # Legacy and unmaintained devices # ################################################################################################# From 5fec31bf7e02aa3cbcc7f9515f1fec2574a33e4a Mon Sep 17 00:00:00 2001 From: "A. Hahn" Date: Wed, 7 Aug 2024 11:01:48 +0200 Subject: [PATCH 2/2] ci-firmware-build.yml: add fw-fg-scu2-scu3 --- .github/workflows/ci-firmware-build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-firmware-build.yml b/.github/workflows/ci-firmware-build.yml index 548b8dcbe..72d4bf612 100644 --- a/.github/workflows/ci-firmware-build.yml +++ b/.github/workflows/ci-firmware-build.yml @@ -46,4 +46,7 @@ jobs: run: sudo make etherbone-install - name: Build burst generator - run: make bg + run: make fw-bg + + - name: Build function generator + run: make fw-fg-scu2-scu3