From cdaa16b347cf353d4e074f14864fde0474862fb6 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Thu, 12 Sep 2024 15:44:19 +0200 Subject: [PATCH] fix(core): fix storage offsets [no changelog] --- core/embed/models/D002/memory.ld | 2 +- core/embed/models/D002/model_D002.h | 2 +- core/embed/models/T3B1/memory.ld | 2 +- core/embed/models/T3B1/model_T3B1.h | 2 +- core/embed/models/T3T1/memory.ld | 2 +- core/embed/models/T3T1/model_T3T1.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/embed/models/D002/memory.ld b/core/embed/models/D002/memory.ld index 3f5648b56..aa927f052 100644 --- a/core/embed/models/D002/memory.ld +++ b/core/embed/models/D002/memory.ld @@ -6,7 +6,7 @@ BOOTLOADER_START = 0xc010000; KERNEL_START = 0xc050000; FIRMWARE_START = 0xc050000; STORAGE_1_OFFSET = 0x30000; -STORAGE_2_OFFSET = 0x50000; +STORAGE_2_OFFSET = 0x40000; NORCOW_SECTOR_SIZE = 0x10000; BOARDLOADER_IMAGE_MAXSIZE = 0xc000; BOOTLOADER_IMAGE_MAXSIZE = 0x20000; diff --git a/core/embed/models/D002/model_D002.h b/core/embed/models/D002/model_D002.h index 48c43dad0..25ec69810 100644 --- a/core/embed/models/D002/model_D002.h +++ b/core/embed/models/D002/model_D002.h @@ -34,7 +34,7 @@ #define KERNEL_START 0x0C050000 #define FIRMWARE_START 0x0C050000 #define STORAGE_1_OFFSET 0x30000 -#define STORAGE_2_OFFSET 0x50000 +#define STORAGE_2_OFFSET 0x40000 #define NORCOW_SECTOR_SIZE (8 * 8 * 1024) // 64 kB #define BOARDLOADER_IMAGE_MAXSIZE (6 * 8 * 1024) // 48 kB #define BOOTLOADER_IMAGE_MAXSIZE (16 * 8 * 1024) // 128 kB diff --git a/core/embed/models/T3B1/memory.ld b/core/embed/models/T3B1/memory.ld index 29bfa1952..7a1ecab27 100644 --- a/core/embed/models/T3B1/memory.ld +++ b/core/embed/models/T3B1/memory.ld @@ -6,7 +6,7 @@ BOOTLOADER_START = 0xc010000; KERNEL_START = 0xc050000; FIRMWARE_START = 0xc050000; STORAGE_1_OFFSET = 0x30000; -STORAGE_2_OFFSET = 0x50000; +STORAGE_2_OFFSET = 0x40000; NORCOW_SECTOR_SIZE = 0x10000; BOARDLOADER_IMAGE_MAXSIZE = 0xc000; BOOTLOADER_IMAGE_MAXSIZE = 0x20000; diff --git a/core/embed/models/T3B1/model_T3B1.h b/core/embed/models/T3B1/model_T3B1.h index 6dc327e01..d50bb4dec 100644 --- a/core/embed/models/T3B1/model_T3B1.h +++ b/core/embed/models/T3B1/model_T3B1.h @@ -34,7 +34,7 @@ #define KERNEL_START 0x0C050000 #define FIRMWARE_START 0x0C050000 #define STORAGE_1_OFFSET 0x30000 -#define STORAGE_2_OFFSET 0x50000 +#define STORAGE_2_OFFSET 0x40000 #define NORCOW_SECTOR_SIZE (8 * 8 * 1024) // 64 kB #define BOARDLOADER_IMAGE_MAXSIZE (6 * 8 * 1024) // 48 kB #define BOOTLOADER_IMAGE_MAXSIZE (16 * 8 * 1024) // 128 kB diff --git a/core/embed/models/T3T1/memory.ld b/core/embed/models/T3T1/memory.ld index 29bfa1952..7a1ecab27 100644 --- a/core/embed/models/T3T1/memory.ld +++ b/core/embed/models/T3T1/memory.ld @@ -6,7 +6,7 @@ BOOTLOADER_START = 0xc010000; KERNEL_START = 0xc050000; FIRMWARE_START = 0xc050000; STORAGE_1_OFFSET = 0x30000; -STORAGE_2_OFFSET = 0x50000; +STORAGE_2_OFFSET = 0x40000; NORCOW_SECTOR_SIZE = 0x10000; BOARDLOADER_IMAGE_MAXSIZE = 0xc000; BOOTLOADER_IMAGE_MAXSIZE = 0x20000; diff --git a/core/embed/models/T3T1/model_T3T1.h b/core/embed/models/T3T1/model_T3T1.h index 35643b895..c5424a775 100644 --- a/core/embed/models/T3T1/model_T3T1.h +++ b/core/embed/models/T3T1/model_T3T1.h @@ -34,7 +34,7 @@ #define KERNEL_START 0x0C050000 #define FIRMWARE_START 0x0C050000 #define STORAGE_1_OFFSET 0x30000 -#define STORAGE_2_OFFSET 0x50000 +#define STORAGE_2_OFFSET 0x40000 #define NORCOW_SECTOR_SIZE (8 * 8 * 1024) // 64 kB #define BOARDLOADER_IMAGE_MAXSIZE (6 * 8 * 1024) // 48 kB #define BOOTLOADER_IMAGE_MAXSIZE (16 * 8 * 1024) // 128 kB