From 064e86347647e0b5bc08646a8622bbf21dc1e597 Mon Sep 17 00:00:00 2001
From: Jacob Pease <jacobpease@protonmail.com>
Date: Wed, 2 Aug 2023 16:12:26 -0500
Subject: [PATCH] Buildroot can now be set up with the new Linux Makefile. The
 driver can now also be loaded from addins/vivado-risc-v and should be removed
 from the main Wally repo. A sed command customizes the package source
 location for the new buildroot directory.

---
 linux/Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/linux/Makefile b/linux/Makefile
index 621653aaa..ccabbeffe 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,27 +1,32 @@
 RISCV := /opt/riscv
 BUILDROOT := ${RISCV}/buildroot
 IMAGES := ${BUILDROOT}/output/images
+WALLY := $(shell dirname $(shell pwd))
 WALLYLINUX := $(shell pwd)
 PACKAGE_SOURCE := ${WALLYLINUX}/buildroot-packages/package-source
 FPGA_AXI_SDC := ${WALLYLINUX}/buildroot-packages/fpga-axi-sdc
+DRIVER := ${PACKAGE_SOURCE}/fpga-axi-sdc.c
 
 .PHONY: all clean patch
 
-all:
-	
+all: $(IMAGES)
 
-patch: $(BUILDROOT) 
+patch: $(BUILDROOT) $(DRIVER)
 	@ echo "${WALLYLINUX}"
+	cp ../addins/vivado-risc-v/patches/fpga-axi-sdc.c $(DRIVER)
 	cp -r $(WALLYLINUX)/buildroot-config-src/wally $</board
 	cp -r $(WALLYLINUX)/buildroot-packages/fpga-axi-sdc $</package
 	sed -i 's|FPGA_AXI_SDC_SITE =|FPGA_AXI_SDC_SITE = $(PACKAGE_SOURCE)|1' $(BUILDROOT)/package/fpga-axi-sdc/fpga-axi-sdc.mk
 	cp $(WALLYLINUX)/buildroot-config-src/buildroot-2023.05.1/linux.config $</board/wally/linux.config
 	cp $(WALLYLINUX)/buildroot-config-src/buildroot-2023.05.1/main.config $</board/wally/main.config
 	cd $<; git apply $(WALLYLINUX)/buildroot-packages/package-2023.05.1.patch
-	cd $<; cp ./board/wally/main.config .config
+	cd $<; cp $(BUILDROOT)/board/wally/main.config $(BUILDROOT)/.config
 
 $(BUILDROOT):
 	git clone https://github.com/buildroot/buildroot.git $@
 	cd $@; git checkout 2023.05.x
 
+$(DRIVER):
+	@ if [ -d "$(WALLY)/addins/vivado-risc-v" ] ; then git submodule update --init $(WALLY)/addins/vivado-risc-v; fi
+
 clean: