Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-03 10:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Makefile bugs, and removed old code.

Browse Source
This commit is contained in:
Jacob Pease 2023-08-05 15:27:17 -05:00
parent ca1a9c577c
commit 1de7cc7347
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
linux/Makefile
View File

@ -36,9 +36,13 @@ test:
generate: $(DTB) generate: $(DTB)
$(DTB): $(DTS) $(DTB): $(DTS) $(IMAGES)
dtc -I dts -O dtb $< > $@ dtc -I dts -O dtb $< > $@
$(IMAGES):
@ echo "No output/images directory in buildroot."
@ echo "Run make --jobs in buildroot directory before generating device tree binaries."; exit 1
disassemble: disassemble:
mkdir -p $(DIS) mkdir -p $(DIS)
make -j $(OBJDUMPS) make -j $(OBJDUMPS)
@ -48,33 +52,9 @@ $(OBJDUMPS): $(BINARIES)
# Generating new Buildroot directories -------------------------------- # Generating new Buildroot directories --------------------------------
# This directive should be run as: make newbr BUILDROOT=path/to/buildroot # This directive should be run as: make patch BUILDROOT=path/to/buildroot
newbr: $(BUILDROOT) $(DRIVER) patch: $(BUILDROOT)/package/fpga-axi-sdc $(WALLYBOARD)/main.config $(WALLYBOARD)/linux.config $(DRIVER)
@ echo "Patching buildroot directory at: $<" cp $(WALLYBOARD)/main.config $(BUILDROOT)/.config
@ echo "Copying wally configuration files and rootfs_overlay to buildroot."
cp -r $(WALLYLINUX)/buildroot-config-src/wally $</board
@ echo "Moving fpga-axi-sdc driver package to buildroot"
cp -r $(WALLYLINUX)/buildroot-packages/fpga-axi-sdc $</package
@ echo "Package variable FPGA_AXI_SDC_SITE set to: $(PACKAGE_SOURCE)"
sed -i 's|FPGA_AXI_SDC_SITE =|FPGA_AXI_SDC_SITE = $(PACKAGE_SOURCE)|1' $(BUILDROOT)/package/fpga-axi-sdc/fpga-axi-sdc.mk
@ echo "Copying configurations to buildroot."
# 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
cp $(BRPACKAGES)/linux.config $</board/wally/linux.config
cp $(BRPACKAGES)/wally.config $</board/wally/main.config
@ echo "Patching buildroot directory."
# cd $<; git apply $(WALLYLINUX)/buildroot-packages/package-2023.05.1.patch
cd $<; git apply $(WALLYLINUX)/buildroot-packages/package.patch
@ echo "Copying main buildroot configuration as .config"
cd $<; cp $(BUILDROOT)/board/wally/main.config $(BUILDROOT)/.config
patch: $(BUILDROOT)/package/fpga-axi-sdc $(WALLYBOARD)/main.config $(WALLYBOARD)/linux.config
# CONFIG DEPENDENCIES 2021.05 ----------------------------------------- # CONFIG DEPENDENCIES 2021.05 -----------------------------------------
$(WALLYBOARD)/main.config: $(WALLYBOARD) $(BRPACKAGES)/wally.config $(WALLYBOARD)/main.config: $(WALLYBOARD) $(BRPACKAGES)/wally.config
@ -92,6 +72,9 @@ $(BUILDROOT)/package/fpga-axi-sdc: $(BUILDROOT) $(PATCHFILE) $(BRPACKAGES)/fpga-
sed -i 's|FPGA_AXI_SDC_SITE =|FPGA_AXI_SDC_SITE = $(PACKAGE_SOURCE)|1' $(BUILDROOT)/package/fpga-axi-sdc/fpga-axi-sdc.mk sed -i 's|FPGA_AXI_SDC_SITE =|FPGA_AXI_SDC_SITE = $(PACKAGE_SOURCE)|1' $(BUILDROOT)/package/fpga-axi-sdc/fpga-axi-sdc.mk
cd $(BUILDROOT); git apply $(PATCHFILE) cd $(BUILDROOT); git apply $(PATCHFILE)
$(PATCHFILE):
cd $(BUILDROOT); git apply $(PATCHFILE)
$(BUILDROOT): $(BUILDROOT):
git clone https://github.com/buildroot/buildroot.git $@ git clone https://github.com/buildroot/buildroot.git $@
# cd $@; git checkout 2023.05.x # cd $@; git checkout 2023.05.x
@ -101,11 +84,7 @@ $(DRIVER):
@ if [ -d "$(WALLY)/addins/vivado-risc-v" ] ; then git submodule update --init $(WALLY)/addins/vivado-risc-v; fi @ if [ -d "$(WALLY)/addins/vivado-risc-v" ] ; then git submodule update --init $(WALLY)/addins/vivado-risc-v; fi
cp ../addins/vivado-risc-v/patches/fpga-axi-sdc.c $@ cp ../addins/vivado-risc-v/patches/fpga-axi-sdc.c $@
# For 2021.05 # For 2021.05
sed "s|card_hw_reset|hw_reset|1" ../addins/vivado-riscv/patches/fpga-axi-sdc.c sed -i "s|card_hw_reset|hw_reset|1" $@
$(IMAGES):
@ echo "No output/images directory in buildroot."
@ echo "Run make --jobs in buildroot directory before generating device tree binaries."; exit 1
# --------------------------------------------------------------------- # ---------------------------------------------------------------------