Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2025-04-26 18:09:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add hardcoded preloaded app size

Browse Source 
- Enable TKEY_DEBUG
- Wait for something on CDC before continuing
This commit is contained in:
Michael Cardell Widerkrantz 2025-03-13 16:02:02 +01:00 committed by Mikael Ågren
parent 0917aa2a1b
commit 8274f6f9a1
No known key found for this signature in database
GPG Key ID: E02DA3D397792C46
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/application_fpga/Makefile
View File

@ -195,7 +195,7 @@ tkey-libs:
$(FIRMWARE_OBJS): $(FIRMWARE_DEPS) $(FIRMWARE_OBJS): $(FIRMWARE_DEPS)
$(TESTFW_OBJS): $(FIRMWARE_DEPS) $(TESTFW_OBJS): $(FIRMWARE_DEPS)
#firmware.elf: CFLAGS += -DTKEY_DEBUG firmware.elf: CFLAGS += -DTKEY_DEBUG
firmware.elf: tkey-libs $(FIRMWARE_OBJS) $(P)/fw/tk1/firmware.lds firmware.elf: tkey-libs $(FIRMWARE_OBJS) $(P)/fw/tk1/firmware.lds
$(CC) $(CFLAGS) $(FIRMWARE_OBJS) $(LDFLAGS) -o $@ > $(basename $@).map $(CC) $(CFLAGS) $(FIRMWARE_OBJS) $(LDFLAGS) -o $@ > $(basename $@).map

19
hw/application_fpga/fw/tk1/main.c
View File

@ -496,6 +496,21 @@ int main(void)
scramble_ram(); scramble_ram();
// Wait for terminal program and a character to be typed
enum ioend endpoint = IO_NONE;
uint8_t available = 0;
uint8_t in = 0;
if (readselect(IO_CDC, &endpoint, &available) < 0) {
// readselect failed! I/O broken? Just redblink.
assert(1 == 2);
}
if (read(IO_CDC, &in, 1, 1) < 0) {
// read failed! I/O broken? Just redblink.
assert(1 == 2);
}
if (part_table_read(&part_table) != 0) { if (part_table_read(&part_table) != 0) {
// Couldn't read or create partition table // Couldn't read or create partition table
assert(1 == 2); assert(1 == 2);
@ -506,6 +521,10 @@ int main(void)
run(&ctx); run(&ctx);
#endif #endif
// Lie and tell filesystem we have a 128 kiB device app on
// flash.
part_table.pre_app_data.size = 0x20000;
// Just start the preloaded app. // Just start the preloaded app.
if (preload_load(&part_table) == -1) { if (preload_load(&part_table) == -1) {
state = FW_STATE_FAIL; state = FW_STATE_FAIL;