1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-13 19:18:56 +00:00

include libopencm3 as submodule

This commit is contained in:
Pavol Rusnak 2015-12-15 00:20:34 +01:00
parent ed76d030ef
commit 8d183608c2
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
5 changed files with 11 additions and 13 deletions

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "trezor-qrenc"]
path = trezor-qrenc
url = https://github.com/trezor/trezor-qrenc.git
[submodule "libopencm3"]
path = libopencm3
url = https://github.com/libopencm3/libopencm3.git

View File

@ -9,12 +9,3 @@ RUN apt-get update
# install build tools and dependencies
RUN apt-get install -y build-essential git python gcc-arm-none-eabi
# clone the source code
RUN git clone https://github.com/libopencm3/libopencm3
# build libopencm3
ENV LIBOPENCM3_GITREV 7b29caed1a726b5cef4c269b6a6ef7a1f1dd105c
RUN cd libopencm3 && git checkout $LIBOPENCM3_GITREV && make

View File

@ -1,5 +1,5 @@
TOP_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
TOOLCHAIN_DIR ?= $(TOP_DIR)/../libopencm3
TOOLCHAIN_DIR ?= $(TOP_DIR)libopencm3
PREFIX ?= arm-none-eabi-
CC = $(PREFIX)gcc
@ -42,9 +42,9 @@ CFLAGS += $(OPTFLAGS) \
-DSTM32F2 \
-I$(TOOLCHAIN_DIR)/include \
-I$(TOP_DIR) \
-I$(TOP_DIR)/gen \
-I$(TOP_DIR)/trezor-crypto \
-I$(TOP_DIR)/trezor-qrenc
-I$(TOP_DIR)gen \
-I$(TOP_DIR)trezor-crypto \
-I$(TOP_DIR)trezor-qrenc
ifdef APPVER
CFLAGS += -DAPPVER=$(APPVER)

View File

@ -8,6 +8,9 @@ docker run -t -v $(pwd)/output:/output $IMAGETAG /bin/sh -c "\
cd trezor-mcu && \
git checkout $FIRMWARETAG && \
git submodule update --init && \
cd libopencm3 &&
make && \
cd .. && \
make && \
cd firmware && \
make && \

1
libopencm3 Submodule

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