From: Sebastien Bourdeauducq Date: Wed, 4 Nov 2015 08:37:33 +0000 (+0800) Subject: Merge 'new' branch X-Git-Tag: 24jan2021_ls180~2106 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da171d8d0a1c54f132ca973f9e5f4836874fc411;p=litex.git Merge 'new' branch --- da171d8d0a1c54f132ca973f9e5f4836874fc411 diff --cc .gitmodules index 2f2413b1,9b5c03e8..1651ece3 --- a/.gitmodules +++ b/.gitmodules @@@ -1,12 -1,12 +1,12 @@@ - [submodule "extcores/lm32/submodule"] - path = extcores/lm32/submodule + [submodule "misoc/cores/lm32/verilog/submodule"] + path = misoc/cores/lm32/verilog/submodule url = https://github.com/m-labs/lm32.git - [submodule "extcores/mor1kx/submodule"] - path = extcores/mor1kx/submodule - url = https://github.com/openrisc/mor1kx.git - [submodule "software/compiler-rt"] - path = software/compiler-rt + [submodule "misoc/cores/mor1kx/verilog"] - path = misoc/cores/mor1kx/verilog - url = https://github.com/openrisc/mor1kx.git ++ path = misoc/cores/mor1kx/verilog ++ url = https://github.com/openrisc/mor1kx.git + [submodule "misoc/software/compiler_rt"] + path = misoc/software/compiler_rt url = http://llvm.org/git/compiler-rt.git - [submodule "software/unwinder"] - path = software/unwinder + [submodule "misoc/software/unwinder"] + path = misoc/software/unwinder url = https://github.com/whitequark/libunwind diff --cc misoc/software/compiler_rt index 00000000,a1448787..7f1c97c7 mode 000000,160000..160000 --- a/misoc/software/compiler_rt +++ b/misoc/software/compiler_rt @@@ -1,0 -1,1 +1,1 @@@ -Subproject commit a1448787a069603414e716adc8a41f866e28a4b4 ++Subproject commit 7f1c97c76620a6ee795792e6120d98a7edf81e65