mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-11-12 18:49:07 +00:00
move submodules to vendor subdirectory
This commit is contained in:
parent
06a70556e0
commit
6e3aec0c1b
8
.gitmodules
vendored
8
.gitmodules
vendored
@ -1,12 +1,12 @@
|
||||
[submodule "trezor-crypto"]
|
||||
path = trezor-crypto
|
||||
path = vendor/trezor-crypto
|
||||
url = https://github.com/trezor/trezor-crypto.git
|
||||
[submodule "trezor-common"]
|
||||
path = trezor-common
|
||||
path = vendor/trezor-common
|
||||
url = https://github.com/trezor/trezor-common.git
|
||||
[submodule "trezor-qrenc"]
|
||||
path = trezor-qrenc
|
||||
path = vendor/trezor-qrenc
|
||||
url = https://github.com/trezor/trezor-qrenc.git
|
||||
[submodule "libopencm3"]
|
||||
path = libopencm3
|
||||
path = vendor/libopencm3
|
||||
url = https://github.com/libopencm3/libopencm3.git
|
||||
|
@ -1,5 +1,5 @@
|
||||
TOP_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
|
||||
TOOLCHAIN_DIR ?= $(TOP_DIR)libopencm3
|
||||
TOOLCHAIN_DIR ?= $(TOP_DIR)vendor/libopencm3
|
||||
|
||||
PREFIX ?= arm-none-eabi-
|
||||
CC = $(PREFIX)gcc
|
||||
@ -43,8 +43,8 @@ CFLAGS += $(OPTFLAGS) \
|
||||
-I$(TOOLCHAIN_DIR)/include \
|
||||
-I$(TOP_DIR) \
|
||||
-I$(TOP_DIR)gen \
|
||||
-I$(TOP_DIR)trezor-crypto \
|
||||
-I$(TOP_DIR)trezor-qrenc
|
||||
-I$(TOP_DIR)vendor/trezor-crypto \
|
||||
-I$(TOP_DIR)vendor/trezor-qrenc
|
||||
|
||||
ifdef APPVER
|
||||
CFLAGS += -DAPPVER=$(APPVER)
|
||||
|
@ -4,12 +4,12 @@ OBJS += bootloader.o
|
||||
OBJS += signatures.o
|
||||
OBJS += usb.o
|
||||
|
||||
OBJS += ../trezor-crypto/bignum.o
|
||||
OBJS += ../trezor-crypto/ecdsa.small.o
|
||||
OBJS += ../trezor-crypto/hmac.o
|
||||
OBJS += ../trezor-crypto/ripemd160.o
|
||||
OBJS += ../trezor-crypto/secp256k1.small.o
|
||||
OBJS += ../trezor-crypto/sha2.o
|
||||
OBJS += ../vendor/trezor-crypto/bignum.o
|
||||
OBJS += ../vendor/trezor-crypto/ecdsa.small.o
|
||||
OBJS += ../vendor/trezor-crypto/hmac.o
|
||||
OBJS += ../vendor/trezor-crypto/ripemd160.o
|
||||
OBJS += ../vendor/trezor-crypto/secp256k1.small.o
|
||||
OBJS += ../vendor/trezor-crypto/sha2.o
|
||||
|
||||
CFLAGS += -DUSE_PRECOMPUTED_IV=0
|
||||
CFLAGS += -DUSE_PRECOMPUTED_CP=0
|
||||
|
@ -4,14 +4,14 @@ NAME = demo
|
||||
|
||||
OBJS += demo.o
|
||||
|
||||
OBJS += ../trezor-crypto/bignum.o
|
||||
OBJS += ../trezor-crypto/bip32.o
|
||||
OBJS += ../trezor-crypto/ecdsa.o
|
||||
OBJS += ../trezor-crypto/hmac.o
|
||||
OBJS += ../trezor-crypto/ripemd160.o
|
||||
OBJS += ../trezor-crypto/secp256k1.o
|
||||
OBJS += ../trezor-crypto/sha2.o
|
||||
OBJS += ../trezor-crypto/bip39.o
|
||||
OBJS += ../trezor-crypto/pbkdf2.o
|
||||
OBJS += ../vendor/trezor-crypto/bignum.o
|
||||
OBJS += ../vendor/trezor-crypto/bip32.o
|
||||
OBJS += ../vendor/trezor-crypto/ecdsa.o
|
||||
OBJS += ../vendor/trezor-crypto/hmac.o
|
||||
OBJS += ../vendor/trezor-crypto/ripemd160.o
|
||||
OBJS += ../vendor/trezor-crypto/secp256k1.o
|
||||
OBJS += ../vendor/trezor-crypto/sha2.o
|
||||
OBJS += ../vendor/trezor-crypto/bip39.o
|
||||
OBJS += ../vendor/trezor-crypto/pbkdf2.o
|
||||
|
||||
include ../Makefile.include
|
||||
|
@ -8,7 +8,7 @@ docker run -t -v $(pwd)/output:/output $IMAGETAG /bin/sh -c "\
|
||||
cd trezor-mcu && \
|
||||
git checkout $FIRMWARETAG && \
|
||||
git submodule update --init && \
|
||||
make -C libopencm3 && \
|
||||
make -C vendor/libopencm3 && \
|
||||
make && \
|
||||
make -C firmware && \
|
||||
cp firmware/trezor.bin /output/trezor-$FIRMWARETAG.bin"
|
||||
|
@ -19,25 +19,25 @@ OBJS += crypto.o
|
||||
|
||||
OBJS += debug.o
|
||||
|
||||
OBJS += ../trezor-crypto/bignum.o
|
||||
OBJS += ../trezor-crypto/ecdsa.o
|
||||
OBJS += ../trezor-crypto/secp256k1.o
|
||||
OBJS += ../trezor-crypto/nist256p1.o
|
||||
OBJS += ../trezor-crypto/hmac.o
|
||||
OBJS += ../trezor-crypto/bip32.o
|
||||
OBJS += ../trezor-crypto/bip39.o
|
||||
OBJS += ../trezor-crypto/pbkdf2.o
|
||||
OBJS += ../trezor-crypto/base58.o
|
||||
OBJS += ../vendor/trezor-crypto/bignum.o
|
||||
OBJS += ../vendor/trezor-crypto/ecdsa.o
|
||||
OBJS += ../vendor/trezor-crypto/secp256k1.o
|
||||
OBJS += ../vendor/trezor-crypto/nist256p1.o
|
||||
OBJS += ../vendor/trezor-crypto/hmac.o
|
||||
OBJS += ../vendor/trezor-crypto/bip32.o
|
||||
OBJS += ../vendor/trezor-crypto/bip39.o
|
||||
OBJS += ../vendor/trezor-crypto/pbkdf2.o
|
||||
OBJS += ../vendor/trezor-crypto/base58.o
|
||||
|
||||
OBJS += ../trezor-crypto/ripemd160.o
|
||||
OBJS += ../trezor-crypto/sha2.o
|
||||
OBJS += ../vendor/trezor-crypto/ripemd160.o
|
||||
OBJS += ../vendor/trezor-crypto/sha2.o
|
||||
|
||||
OBJS += ../trezor-crypto/aescrypt.o
|
||||
OBJS += ../trezor-crypto/aeskey.o
|
||||
OBJS += ../trezor-crypto/aestab.o
|
||||
OBJS += ../trezor-crypto/aes_modes.o
|
||||
OBJS += ../vendor/trezor-crypto/aescrypt.o
|
||||
OBJS += ../vendor/trezor-crypto/aeskey.o
|
||||
OBJS += ../vendor/trezor-crypto/aestab.o
|
||||
OBJS += ../vendor/trezor-crypto/aes_modes.o
|
||||
|
||||
OBJS += ../trezor-qrenc/qr_encode.o
|
||||
OBJS += ../vendor/trezor-qrenc/qr_encode.o
|
||||
|
||||
# OBJS += protob/pb_common.o
|
||||
OBJS += protob/pb_decode.o
|
||||
|
@ -1 +1 @@
|
||||
../../trezor-common/protob/messages.proto
|
||||
../../vendor/trezor-common/protob/messages.proto
|
@ -1 +1 @@
|
||||
../../trezor-common/protob/storage.proto
|
||||
../../vendor/trezor-common/protob/storage.proto
|
@ -1 +1 @@
|
||||
../../trezor-common/protob/types.proto
|
||||
../../vendor/trezor-common/protob/types.proto
|
2
gen/bitmaps/.gitignore
vendored
2
gen/bitmaps/.gitignore
vendored
@ -1,2 +0,0 @@
|
||||
*.c
|
||||
*.h
|
@ -1 +0,0 @@
|
||||
Subproject commit b1049f9a6f43882968dcf82ca1df3f1eee67e367
|
2
setup.c
2
setup.c
@ -25,7 +25,7 @@
|
||||
void setup(void)
|
||||
{
|
||||
// setup clock
|
||||
clock_scale_t clock = hse_8mhz_3v3[CLOCK_3V3_120MHZ];
|
||||
struct rcc_clock_scale clock = rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ];
|
||||
rcc_clock_setup_hse_3v3(&clock);
|
||||
|
||||
// enable GPIO clock - A (oled), B(oled), C (buttons)
|
||||
|
@ -1 +0,0 @@
|
||||
Subproject commit cbbc0bdc7197e74d647aedcbfd064c43544318cf
|
1
vendor/libopencm3
vendored
Submodule
1
vendor/libopencm3
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit e8a4a37b9c2f1f1cfad4d1f92b8151dac3f113c0
|
0
trezor-common → vendor/trezor-common
vendored
0
trezor-common → vendor/trezor-common
vendored
1
vendor/trezor-crypto
vendored
Submodule
1
vendor/trezor-crypto
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 3556c74740b64484eeec4716d57c197828b330a0
|
0
trezor-qrenc → vendor/trezor-qrenc
vendored
0
trezor-qrenc → vendor/trezor-qrenc
vendored
Loading…
Reference in New Issue
Block a user