From e3ff21b1b5c511f576eea4098f6412bfac77efeb Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 11 Jul 2020 17:49:54 +0800 Subject: [PATCH] create gateware folder --- README.md | 4 ++-- default.nix | 2 +- src/Makefile | 4 ++-- src/{ => gateware}/zc706.py | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename src/{ => gateware}/zc706.py (100%) diff --git a/README.md b/README.md index a86fe48f..53994579 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ Impure incremental build: ```shell nix-shell cd src -./zc706.py -g ../build/gateware # build gateware -make # build firmware +gateware/zc706.py -g ../build/gateware # build gateware +make # build firmware cd .. ./remote_run.sh -i ``` diff --git a/default.nix b/default.nix index 7a51c893..60068792 100644 --- a/default.nix +++ b/default.nix @@ -48,7 +48,7 @@ let ]; } '' - python ${./src/zc706.py} -g build -V ${variant} + python ${./src/gateware/zc706.py} -g build -V ${variant} mkdir -p $out $out/nix-support cp build/top.bit $out echo file binary-dist $out/top.bit >> $out/nix-support/hydra-build-products diff --git a/src/Makefile b/src/Makefile index cf494751..563f4c60 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,9 +5,9 @@ all: ../build/firmware/armv7-none-eabihf/release/szl .PHONY: all -../build/pl.rs: zc706.py +../build/pl.rs: gateware/zc706.py mkdir -p ../build - python zc706.py -r ../build/pl.rs -V $(VARIANT) + python gateware/zc706.py -r ../build/pl.rs -V $(VARIANT) ../build/firmware/armv7-none-eabihf/release/runtime: ../build/pl.rs $(shell find . -path ./szl -prune -o -print) XBUILD_SYSROOT_PATH=`pwd`/../build/sysroot cargo xbuild --release -p runtime --target-dir ../build/firmware diff --git a/src/zc706.py b/src/gateware/zc706.py similarity index 100% rename from src/zc706.py rename to src/gateware/zc706.py