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 000000000..096e998d5 Binary files /dev/null and b/micropython/firmware/vendorheader.bin differ