From d27e442d5e25ed461a84efdb2a1fc109136345aa Mon Sep 17 00:00:00 2001 From: Byron Lathi Date: Fri, 6 Oct 2023 13:18:36 -0700 Subject: [PATCH] Use REPO_TOP in script, call script from makefile --- hw/efinix_fpga/simulation/Makefile | 1 + sw/script/create_verilog_image.sh | 4 ++-- sw/script/format_disk.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/efinix_fpga/simulation/Makefile b/hw/efinix_fpga/simulation/Makefile index 06423f0..d215b5f 100644 --- a/hw/efinix_fpga/simulation/Makefile +++ b/hw/efinix_fpga/simulation/Makefile @@ -33,6 +33,7 @@ $(INIT_MEM): # The script that makes this file uses relative paths $(SD_IMAGE): $(SD_IMAGE_PATH) + sh $(REPO_TOP)/sw/script/create_verilog_image.sh cp $(SD_IMAGE_PATH) $(SD_IMAGE) .PHONY: clean diff --git a/sw/script/create_verilog_image.sh b/sw/script/create_verilog_image.sh index 323bc45..83ac7cf 100644 --- a/sw/script/create_verilog_image.sh +++ b/sw/script/create_verilog_image.sh @@ -1,11 +1,11 @@ #!/bin/bash -BOOTLOADER=../bios/bootloader.bin +BOOTLOADER=$REPO_TOP/sw/bios/bootloader.bin FILE=fs.fat TMPMOUNT=/tmp/lo -FSDIR=../fsdir +FSDIR=$REPO_TOP/sw/fsdir V=-v diff --git a/sw/script/format_disk.sh b/sw/script/format_disk.sh index af66e59..8c77237 100644 --- a/sw/script/format_disk.sh +++ b/sw/script/format_disk.sh @@ -1,6 +1,6 @@ #!/bin/bash -BOOTLOADER=../bios/bootloader.bin +BOOTLOADER=$REPO_TOP/sw/bios/bootloader.bin DEVICE=/dev/mmcblk0 TMPBOOTSECT=/tmp/bootsect TMPMOUNT=/tmp/sd