From 7cb7a90d27a40bcc4ab7cc7f248d4dc02439cb22 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 1 Apr 2017 20:21:02 +0200 Subject: [PATCH] build: include vendorheader.bin in source tree --- .travis.yml | 1 - Makefile | 3 +++ Makefile.firmware | 3 --- micropython/firmware/.gitignore | 1 - micropython/firmware/vendorheader.bin | Bin 0 -> 4608 bytes 5 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 micropython/firmware/vendorheader.bin diff --git a/.travis.yml b/.travis.yml index 23b85562b..4f6e1a8bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ before_install: install: - sudo apt-get install -y build-essential gcc-multilib gcc-arm-embedded - - sudo apt-get install python3-pil script: - make build_cross diff --git a/Makefile b/Makefile index 08d426ee5..c0de4a294 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,9 @@ vendor: ## update git submodules res: ## update resources ./tools/res_collect +vendorheader: ## contruct default vendor header + ./tools/build_vendorheader '0000000000000000000000000000000000000000000000000000000000000000,0000000000000000000000000000000000000000000000000000000000000000,0000000000000000000000000000000000000000000000000000000000000000' 2 1.1 SatoshiLabs assets/satoshilabs_120.png micropython/firmware/vendorheader.bin + ## emulator commands: run: ## run unix port diff --git a/Makefile.firmware b/Makefile.firmware index 9cddcfecd..da74b1622 100644 --- a/Makefile.firmware +++ b/Makefile.firmware @@ -400,9 +400,6 @@ QSTR_GEN_EXTRA_CFLAGS += -DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB -DN_ARM -DN_XTENSA all: $(BUILD)/$(TARGET).bin -$(SRCDIR_FW)/firmware/vendorheader.bin: assets/satoshilabs_120.png - ./tools/build_vendorheader '0000000000000000000000000000000000000000000000000000000000000000,0000000000000000000000000000000000000000000000000000000000000000,0000000000000000000000000000000000000000000000000000000000000000' 2 1.1 SatoshiLabs assets/satoshilabs_120.png micropython/firmware/vendorheader.bin - $(BUILD_FW)/firmware/vendorheader.o: $(SRCDIR_FW)/firmware/vendorheader.bin $(Q)$(OBJCOPY) -I binary -O elf32-littlearm -B arm \ --rename-section .data=.vendorheader,alloc,load,readonly,contents \ diff --git a/micropython/firmware/.gitignore b/micropython/firmware/.gitignore index ef13ad637..567609b12 100644 --- a/micropython/firmware/.gitignore +++ b/micropython/firmware/.gitignore @@ -1,2 +1 @@ build/ -vendorheader.bin diff --git a/micropython/firmware/vendorheader.bin b/micropython/firmware/vendorheader.bin new file mode 100644 index 0000000000000000000000000000000000000000..096e998d5e7d7d3b5aa1a4aabf2b30de222156bf GIT binary patch literal 4608 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 N%JScPdHla-{tr@s$BqC1 literal 0 HcmV?d00001