1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-25 08:58:14 +00:00

move vendored submodules to root vendor/ dir

before pulling, run `git submodule deinit --all`
This commit is contained in:
matejcik 2019-05-09 14:05:49 +02:00
parent 607824d118
commit 43866407df
13 changed files with 17 additions and 19 deletions

17
.gitmodules vendored
View File

@ -1,14 +1,11 @@
[submodule "vendor/micropython"] [submodule "vendor/micropython"]
path = core/vendor/micropython path = vendor/micropython
url = https://github.com/trezor/micropython.git url = https://github.com/trezor/micropython.git
[submodule "vendor/nanopb"]
path = core/vendor/nanopb
url = https://github.com/nanopb/nanopb.git
[submodule "vendor/QR-Code-generator"] [submodule "vendor/QR-Code-generator"]
path = core/vendor/QR-Code-generator path = vendor/QR-Code-generator
url = https://github.com/nayuki/QR-Code-generator.git url = https://github.com/nayuki/QR-Code-generator.git
[submodule "vendor/secp256k1-zkp"] [submodule "vendor/secp256k1-zkp"]
path = core/vendor/secp256k1-zkp path = vendor/secp256k1-zkp
url = https://github.com/ElementsProject/secp256k1-zkp.git url = https://github.com/ElementsProject/secp256k1-zkp.git
branch = secp256k1-zkp branch = secp256k1-zkp
[submodule "common/defs/ethereum/tokens"] [submodule "common/defs/ethereum/tokens"]
@ -18,13 +15,9 @@
path = crypto/tests/wycheproof path = crypto/tests/wycheproof
url = https://github.com/google/wycheproof url = https://github.com/google/wycheproof
[submodule "legacy/libopencm3"] [submodule "legacy/libopencm3"]
path = legacy/vendor/libopencm3 path = vendor/libopencm3
url = https://github.com/libopencm3/libopencm3.git url = https://github.com/libopencm3/libopencm3.git
[submodule "legacy/vendor/nanopb"] [submodule "legacy/vendor/nanopb"]
path = legacy/vendor/nanopb path = vendor/nanopb
url = https://github.com/nanopb/nanopb.git url = https://github.com/nanopb/nanopb.git
ignore = untracked ignore = untracked
[submodule "legacy/vendor/QR-Code-generator"]
path = legacy/vendor/QR-Code-generator
url = https://github.com/nayuki/QR-Code-generator.git
ignore = untracked

@ -1 +0,0 @@
Subproject commit 40d24f38aa0a8180b271b6c88be8633f842ed9d4

1
core/vendor/QR-Code-generator vendored Symbolic link
View File

@ -0,0 +1 @@
../../vendor/QR-Code-generator

@ -1 +0,0 @@
Subproject commit c5d8107e2af090ff4547851297a484652fde4242

1
core/vendor/micropython vendored Symbolic link
View File

@ -0,0 +1 @@
../../vendor/micropython

1
core/vendor/nanopb vendored

@ -1 +0,0 @@
Subproject commit 2c4c3948a9f9e2eb573706a354b89a55cb85639f

1
core/vendor/nanopb vendored Symbolic link
View File

@ -0,0 +1 @@
../../vendor/nanopb

@ -1 +0,0 @@
Subproject commit 1c830b4c9ac30aa32e246ea3ab8ef9ef99acf664

1
core/vendor/secp256k1-zkp vendored Symbolic link
View File

@ -0,0 +1 @@
../../vendor/secp256k1-zkp

@ -1 +0,0 @@
Subproject commit 40d24f38aa0a8180b271b6c88be8633f842ed9d4

1
legacy/vendor/QR-Code-generator vendored Symbolic link
View File

@ -0,0 +1 @@
../../vendor/QR-Code-generator

@ -1 +0,0 @@
Subproject commit 0fd4f74ee301af5de4e9b036f391bf17c5a52f02

1
legacy/vendor/libopencm3 vendored Symbolic link
View File

@ -0,0 +1 @@
../../vendor/libopencm3

@ -1 +0,0 @@
Subproject commit 3c69a905b16df149e1bda12f25e0522073a24678

1
legacy/vendor/nanopb vendored Symbolic link
View File

@ -0,0 +1 @@
../../vendor/nanopb

1
vendor/QR-Code-generator vendored Submodule

@ -0,0 +1 @@
Subproject commit 40d24f38aa0a8180b271b6c88be8633f842ed9d4

1
vendor/libopencm3 vendored Submodule

@ -0,0 +1 @@
Subproject commit 0fd4f74ee301af5de4e9b036f391bf17c5a52f02

1
vendor/micropython vendored Submodule

@ -0,0 +1 @@
Subproject commit c5d8107e2af090ff4547851297a484652fde4242

1
vendor/nanopb vendored Submodule

@ -0,0 +1 @@
Subproject commit 3c69a905b16df149e1bda12f25e0522073a24678

1
vendor/secp256k1-zkp vendored Submodule

@ -0,0 +1 @@
Subproject commit 1c830b4c9ac30aa32e246ea3ab8ef9ef99acf664