From 7a0a1038350a9871e4ed6369879cb13b232acba4 Mon Sep 17 00:00:00 2001
From: Paul Scheffler <paulsc@iis.ee.ethz.ch>
Date: Wed, 20 Nov 2024 17:52:38 +0100
Subject: [PATCH] make: Move SW build after HW generation

---
 cheshire.mk | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cheshire.mk b/cheshire.mk
index 1114f279..00fb0527 100644
--- a/cheshire.mk
+++ b/cheshire.mk
@@ -70,12 +70,6 @@ chs-nonfree-init:
 
 -include $(CHS_ROOT)/nonfree/nonfree.mk
 
-############
-# Build SW #
-############
-
-include $(CHS_ROOT)/sw/sw.mk
-
 ###############
 # Generate HW #
 ###############
@@ -123,6 +117,14 @@ CHS_HW_ALL += $(AXIRTROOT)/.generated
 CHS_HW_ALL += $(AXI_VGA_ROOT)/.generated
 CHS_HW_ALL += $(CHS_SLINK_DIR)/.generated
 
+
+############
+# Build SW #
+############
+
+# Include SW header after HW targets, as HW variables affect SW header generation
+include $(CHS_ROOT)/sw/sw.mk
+
 #####################
 # Generate Boot ROM #
 #####################