From 20d3828c21d3b5f253f8fbd7d4514cc92e230b29 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 2 Oct 2020 19:54:22 +0100 Subject: [PATCH] add pinmux generator to create litex pinmap --- .gitmodules | 2 +- Makefile | 11 +++++++++-- libreriscv | 2 +- mkpinmux.sh | 3 +++ pinmux | 1 + 5 files changed, 15 insertions(+), 4 deletions(-) create mode 100755 mkpinmux.sh create mode 160000 pinmux diff --git a/.gitmodules b/.gitmodules index 86460ee7..b03ac661 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,7 @@ path = nmigen-type-annotations url = https://salsa.debian.org/Kazan-team/nmigen-type-annotations.git branch = master -[submodule "libreriscv"] +[submodule "pinmux"] path = pinmux url = https://git.libre-soc.org/git/pinmux.git [submodule "libreriscv"] diff --git a/Makefile b/Makefile index 2228b2c6..37d353c1 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,16 @@ PYTHON3 ?= "python3" gitupdate: git submodule init - git submodule update --recursive + git submodule update --init --recursive --remote -install: +mkpinmux: + ./mkpinmux.sh + cp pinmux/ls180/ls180_pins.py src/soc/debug + cp pinmux/ls180/ls180_pins.py src/soc/litex/florent/libresoc + +install: develop mkpinmux + +develop: python3 setup.py develop # yes, develop, not install python3 src/soc/decoder/pseudo/pywriter.py diff --git a/libreriscv b/libreriscv index a6b06f68..cdd0f8a5 160000 --- a/libreriscv +++ b/libreriscv @@ -1 +1 @@ -Subproject commit a6b06f68cf33e794241584e43a6892d88bb3a0ea +Subproject commit cdd0f8a50f3c15703d8b507333b5df526b86210c diff --git a/mkpinmux.sh b/mkpinmux.sh new file mode 100755 index 00000000..b122611c --- /dev/null +++ b/mkpinmux.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd pinmux +python2 src/pinmux_generator.py -v -s ls180 -o ls180 diff --git a/pinmux b/pinmux new file mode 160000 index 00000000..f1e4b3a8 --- /dev/null +++ b/pinmux @@ -0,0 +1 @@ +Subproject commit f1e4b3a8bc48bcdfca867a0322096556e8317984 -- 2.30.2