software/bios: bump version.

Also, pin LiteX dependencies to the revision used by lambdasoc-bios.

diff --git a/.gitmodules b/.gitmodules
index 2bd39974f3e981388762a03a52fcd2397e9ec886..bfb7431f4f8873d0d1ccecaaefc51d881c30e5bf 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "lambdasoc/software/bios"]
        path = lambdasoc/software/bios
        url = https://github.com/lambdaconcept/lambdasoc-bios
-       branch = sdram-staging

diff --git a/MANIFEST.in b/MANIFEST.in
index 0fef7e120c3246a568ac8374d73ec244271d2824..288bfc515dc5c506eb26fe8e70f36953f7267d88 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-graft lambdasoc/software/bios/3rdparty/llvm-project/compiler-rt/lib/builtins
+graft lambdasoc/software/bios/3rdparty/compiler-rt/lib/builtins
 graft lambdasoc/software/bios/3rdparty/litex/litex/soc/software/include
 include lambdasoc/software/bios/3rdparty/litex/litex/soc/cores/cpu/minerva/*.h
 graft lambdasoc/software/bios/3rdparty/litex/litex/soc/software/libbase
@@ -6,4 +6,6 @@ graft lambdasoc/software/bios/3rdparty/litex/litex/soc/software/liblitedram
 include lambdasoc/software/bios/Makefile
 graft lambdasoc/software/bios/src
 include lambdasoc/software/bios/toolchain.mk
+include lambdasoc/software/bios/compiler_rt.mk
+include lambdasoc/software/bios/litex.mk
 graft lambdasoc/software/bios/util

diff --git a/lambdasoc/software/bios b/lambdasoc/software/bios
index 57ce4bad04dfd1148d5e438d68100703925a1edf..ba0aa9698d60f2e6b6c398a01614352f3bd827fa 160000 (submodule)
--- a/lambdasoc/software/bios
+++ b/lambdasoc/software/bios
@@ -1 +1 @@
-Subproject commit 57ce4bad04dfd1148d5e438d68100703925a1edf
+Subproject commit ba0aa9698d60f2e6b6c398a01614352f3bd827fa

diff --git a/requirements.txt b/requirements.txt
index cd57d74b50c82054eba51d712845f5ae80f14c74..f934d49ab91a6bce836bb4d4b9bcec38421233bd 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,6 @@ git+https://github.com/nmigen/nmigen-boards
 git+https://github.com/lambdaconcept/minerva
 git+https://github.com/m-labs/asyncserial
 
-git+https://github.com/m-labs/migen
-git+https://github.com/enjoy-digital/litex
-git+https://github.com/enjoy-digital/litedram
+git+https://github.com/m-labs/migen@3ffd64c9b47619bd6689b44f29a8ed7c74365f14
+git+https://github.com/enjoy-digital/litex@f9f1b8e25db6d6db1aa47a135a5f898c433d516e
+git+https://github.com/enjoy-digital/litedram@83d18f48c7f7590096ddb35d669836d7abb3be6f