From 13094b8d2b398251fe3f3d3892f6d69b21c05247 Mon Sep 17 00:00:00 2001 From: Tim Callahan Date: Thu, 17 Sep 2020 21:32:54 -0700 Subject: [PATCH] Remove LOC constraint, and add Linux test for 100T. Signed-off-by: Tim Callahan --- xc7/README.rst | 1 + xc7/linux_litex_demo/Makefile | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/xc7/README.rst b/xc7/README.rst index ae5226b..85dabff 100644 --- a/xc7/README.rst +++ b/xc7/README.rst @@ -75,5 +75,6 @@ To build the linux-litex-demo example, run the following commands: .. code:: bash pushd xc7/linux_litex_demo && make && popd + pushd xc7/linux_litex_demo && TARGET=arty_100 make && popd .. build_examples_include_end_label diff --git a/xc7/linux_litex_demo/Makefile b/xc7/linux_litex_demo/Makefile index ba217e5..315f674 100644 --- a/xc7/linux_litex_demo/Makefile +++ b/xc7/linux_litex_demo/Makefile @@ -6,13 +6,22 @@ VERILOG := ${current_dir}/baselitex_arty.v \ MEM_INIT := ${current_dir}/mem.init \ ${current_dir}/mem_1.init \ ${current_dir}/mem_2.init -PARTNAME := xc7a35tcsg324-1 -DEVICE := xc7a50t_test BITSTREAM_DEVICE := artix7 PCF := ${current_dir}/arty.pcf SDC := ${current_dir}/arty.sdc XDC := ${current_dir}/arty.xdc -BUILDDIR := build +BUILDDIR_35 := build +BUILDDIR_100 := build + +ifeq ($(TARGET),arty_100) + PARTNAME := xc7a100tcsg324-1 + DEVICE := xc7a100t_test + BUILDDIR := ${BUILDDIR_100} +else + PARTNAME := xc7a35tcsg324-1 + DEVICE := xc7a50t_test + BUILDDIR := ${BUILDDIR_35} +endif all: ${BUILDDIR}/${TOP}.bit @@ -21,7 +30,7 @@ ${BUILDDIR}: ln -s ${MEM_INIT} ${BUILDDIR} ${BUILDDIR}/${TOP}.eblif: | ${BUILDDIR} - cd ${BUILDDIR} && symbiflow_synth -t ${TOP} -v ${VERILOG} -d ${BITSTREAM_DEVICE} -p ${PARTNAME} -x ${XDC} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_synth -t ${TOP} -v ${VERILOG} -d ${BITSTREAM_DEVICE} -p ${PARTNAME} -x ${XDC} ${BUILDDIR}/${TOP}.net: ${BUILDDIR}/${TOP}.eblif cd ${BUILDDIR} && symbiflow_pack -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null @@ -39,5 +48,4 @@ ${BUILDDIR}/${TOP}.bit: ${BUILDDIR}/${TOP}.fasm cd ${BUILDDIR} && symbiflow_write_bitstream -d ${BITSTREAM_DEVICE} -f ${TOP}.fasm -p ${PARTNAME} -b ${TOP}.bit clean: - rm -rf ${BUILDDIR} - + rm -rf ${BUILDDIR_35} ${BUILDDIR_100}