From b0a8cacd1dd11dbf6f8f7b46675d89e5b5b32920 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sat, 30 Mar 2024 15:02:22 +0000 Subject: rolo: simplify parsing scramble header in load_firmware() The standard load_firmware() function is used on targets which use the "scramble -add" method for generating Rockbox binaries. While it tries to be a bit more generic and allows the CRC/data offsets to be placed anywhere in the file, there are no targets which actually need this flexibility, because they are all using plain old "scramble -add". So we can actually simplify load_firmware() and remove defines from the target headers. All the targets used CRC offset = 0 and data offset = 8, except for a few which I assume never supported ROLO or were never tested -- eg. samsungyh820: the CRC and data offsets cannot both be 0. The actual motivation for this is removing the calls to lseek(), which can help make bootloaders a tiny bit smaller, as lseek is typically not used anywhere else in bootloaders. Change-Id: Ic2d01e5b75a32e88363f085e3e839146a0710bf4 --- firmware/export/config/sansaclipplus.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'firmware/export/config/sansaclipplus.h') diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index 99eb1d8832..37142c6992 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h @@ -5,8 +5,6 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 66 #define MODEL_NAME "Sandisk Sansa Clip+" -#define FIRMWARE_OFFSET_FILE_DATA 8 -#define FIRMWARE_OFFSET_FILE_CRC 0 /* Define if boot data from bootloader has been enabled for the target */ #define HAVE_BOOTDATA /* define boot redirect file name allows booting from external drives */ -- cgit v1.2.3