arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00
Code Issues Releases Wiki Activity

legacy/bootloader: don't include FONT_FIXED

Browse Source
This commit is contained in:
Pavol Rusnak 2019-11-09 18:54:13 +00:00
parent 054bb3a67a
commit 7476e9463f
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/bootloader/Makefile
View File

@ -4,6 +4,13 @@ OBJS += bootloader.o
OBJS += signatures.o
OBJS += usb.o
# overrides from libtrezor
CFLAGS += -DFONT_SKIP_FIXED=1
OBJS += ../gen/fonts.small.o
# overrides from trezor-crypto
CFLAGS += -DUSE_PRECOMPUTED_IV=0
CFLAGS += -DUSE_PRECOMPUTED_CP=0
OBJS += ../vendor/trezor-crypto/bignum.small.o
OBJS += ../vendor/trezor-crypto/ecdsa.small.o
OBJS += ../vendor/trezor-crypto/secp256k1.small.o
@ -11,9 +18,6 @@ OBJS += ../vendor/trezor-crypto/sha2.small.o
OBJS += ../vendor/trezor-crypto/memzero.small.o
OBJS += ../vendor/trezor-crypto/hmac_drbg.small.o
CFLAGS += -DUSE_PRECOMPUTED_IV=0
CFLAGS += -DUSE_PRECOMPUTED_CP=0
OPTFLAGS ?= -Os
include ../Makefile.include

4
legacy/gen/fonts.c
View File

@ -1,14 +1,14 @@
#include "fonts.h"
#define FONTS 2
const uint8_t *const font_data[FONTS][128 - 32] = {
{
#include "font.inc"
},
#ifndef FONT_SKIP_FIXED
{
#include "fontfixed.inc"
},
#endif
};
int fontCharWidth(uint8_t font, uint8_t c) {

9
legacy/gen/fonts.h
View File

@ -5,10 +5,17 @@
#define FONT_HEIGHT 8
#define FONT_STANDARD 0
#ifndef FONT_SKIP_FIXED
#define FONT_FIXED 1
#define FONTS 2
#else
#define FONTS 1
#endif
#define FONT_DOUBLE 0x80
extern const uint8_t *const font_data[2][128 - 32];
extern const uint8_t *const font_data[FONTS][128 - 32];
int fontCharWidth(uint8_t font, uint8_t c);
const uint8_t *fontCharData(uint8_t font, uint8_t c);