diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2019-01-29 17:10:17 -0800 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2019-01-31 11:42:15 -0800 |
| commit | ec0388704095a7d3ab0cda65509db2fa0ef589dc (patch) | |
| tree | 3f08775b00c552d21466c43e5a4faefb801b492e /supervisor | |
| parent | 4672866eecebffed383b7882db13c71d3495d846 (diff) | |
Fix hallowing and nrf builds
Diffstat (limited to 'supervisor')
| -rw-r--r-- | supervisor/shared/display.c | 2 | ||||
| -rw-r--r-- | supervisor/supervisor.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c index 4da44eb3b..3a430f568 100644 --- a/supervisor/shared/display.c +++ b/supervisor/shared/display.c @@ -94,7 +94,7 @@ void supervisor_display_move_memory(void) { } uint16_t total_tiles = grid->width_in_tiles * grid->height_in_tiles; - tilegrid_tiles = allocate_memory(total_tiles, false); + tilegrid_tiles = allocate_memory(align32_size(total_tiles), false); if (tilegrid_tiles != NULL) { memcpy(tilegrid_tiles->ptr, grid->tiles, total_tiles); grid->tiles = (uint8_t*) tilegrid_tiles->ptr; diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 0e315a742..f21365d2a 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -92,11 +92,12 @@ autogen_usb_descriptor.intermediate: ../../tools/gen_usb_descriptor.py Makefile --output_c_file $(BUILD)/autogen_usb_descriptor.c\ --output_h_file $(BUILD)/genhdr/autogen_usb_descriptor.h -CIRCUITPY_DISPLAY_FONT = "../../tools/Tecate-bitmap-fonts/bitmap/cherry/cherry-10-r.bdf" +CIRCUITPY_DISPLAY_FONT = "../../tools/Tecate-bitmap-fonts/bitmap/terminus-font-4.39/ter-u12n.bdf" $(BUILD)/autogen_display_resources.c: ../../tools/gen_display_resources.py $(HEADER_BUILD)/qstrdefs.generated.h Makefile | $(HEADER_BUILD) $(STEPECHO) "GEN $@" $(Q)install -d $(BUILD)/genhdr $(Q)$(PYTHON3) ../../tools/gen_display_resources.py \ --font $(CIRCUITPY_DISPLAY_FONT) \ + --sample_file $(HEADER_BUILD)/qstrdefs.generated.h \ --output_c_file $(BUILD)/autogen_display_resources.c |