From a5b901720823ac4250d69d749759965431a434e1 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Tue, 20 Aug 2024 22:54:50 +1000 Subject: [PATCH] Adjust TS101 logo to 99K offset --- source/Core/BSP/Miniware/configuration.h | 12 ++++++------ source/Makefile | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/Core/BSP/Miniware/configuration.h b/source/Core/BSP/Miniware/configuration.h index 8a58f9ed13..c1e9c3513f 100644 --- a/source/Core/BSP/Miniware/configuration.h +++ b/source/Core/BSP/Miniware/configuration.h @@ -272,12 +272,12 @@ #endif /* TS80P */ #ifdef MODEL_TS101 -// For whatever reason, Miniware decided to only allow their bootloader to work on 4k page sizes -// So we have to locate the boot-logo on a different 4k page to the settings -// And also, it doesnt let me write to the last page on my DFU version -// So, we put settings on the last section (as we can work with it fine) -// And then we use the N-1'th 4K for logo -#define FLASH_LOGOADDR (0x08000000 + (124 * 1024)) +// For whatever reason, Miniware decided to not build a reliable DFU bootloader +// It can't appear to flash to some of the upper pages of flash, +// I'm slightly suspect a watchdog or something runs out +// as device resets before file finishes copying +// So logo has to be located on page 99 or else it cant be flashed on stock bootloader +#define FLASH_LOGOADDR (0x08000000 + (99 * 1024)) #define SETTINGS_START_PAGE (0x08000000 + (127 * 1024)) #else #define FLASH_LOGOADDR (0x08000000 + (62 * 1024)) diff --git a/source/Makefile b/source/Makefile index 5142461a29..0754d7c6a5 100644 --- a/source/Makefile +++ b/source/Makefile @@ -84,8 +84,8 @@ DEVICE_BSP_DIR=./Core/BSP/Miniware LDSCRIPT=./Core/BSP/Miniware/stm32f103.ld ifeq ($(model),$(filter $(model),TS101)) -# 128K - 8K for settings & logo -flash_size=119k +# 128K, but logo must be at 99K so their broken ass DFU can flash it +flash_size=98k bootldr_size=0x8000 DEVICE_DFU_ADDRESS=0x08008000 else