Skip to content

Commit e957b75

Browse files
t-8chLorenzo Castoldi
authored and
Lorenzo Castoldi
committed
chibios: mark boot2 bootlader data readonly (qmk#21986)
1 parent ed38588 commit e957b75

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#define FLASHCMD_READ_STATUS 0x05
2626
#define FLASHCMD_WRITE_ENABLE 0x06
2727

28-
extern uint8_t BOOT2_ROM[256];
29-
static uint32_t BOOT2_ROM_RAM[64];
28+
extern const uint8_t BOOT2_ROM[256];
29+
static uint32_t BOOT2_ROM_RAM[64];
3030

3131
static ssi_hw_t *const ssi = (ssi_hw_t *)XIP_SSI_BASE;
3232

platforms/chibios/vendors/RP/stage2_bootloaders.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#if defined(RP2040_FLASH_AT25SF128A)
1515

16-
uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
16+
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
1717
0x00, 0xb5, 0x31, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
1818
0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2d, 0x4b,
1919
0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,
@@ -40,7 +40,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
4040

4141
#elif defined(RP2040_FLASH_GD25Q64CS)
4242

43-
uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
43+
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
4444
0x00, 0xb5, 0x31, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
4545
0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2d, 0x4b,
4646
0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,
@@ -67,7 +67,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
6767

6868
#elif defined(RP2040_FLASH_W25X10CL)
6969

70-
uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
70+
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
7171
0x00, 0xb5, 0x14, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
7272
0x12, 0x49, 0x19, 0x60, 0x00, 0x21, 0x59, 0x60, 0x11, 0x49, 0x12, 0x48,
7373
0x01, 0x60, 0x01, 0x21, 0x99, 0x60, 0xbb, 0x21, 0x19, 0x66, 0x02, 0x21,
@@ -94,7 +94,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
9494

9595
#elif defined(RP2040_FLASH_IS25LP080)
9696

97-
uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
97+
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
9898
0x00, 0xb5, 0x2b, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
9999
0x29, 0x49, 0x19, 0x60, 0x01, 0x21, 0x99, 0x60, 0x28, 0x48, 0x00, 0xf0,
100100
0x42, 0xf8, 0x28, 0x4a, 0x90, 0x42, 0x12, 0xd0, 0x06, 0x21, 0x19, 0x66,
@@ -121,7 +121,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
121121

122122
#elif defined(RP2040_FLASH_GENERIC_03H)
123123

124-
uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
124+
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
125125
0x00, 0xb5, 0x0c, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
126126
0x0a, 0x49, 0x19, 0x60, 0x0a, 0x49, 0x0b, 0x48, 0x01, 0x60, 0x00, 0x21,
127127
0x59, 0x60, 0x01, 0x21, 0x99, 0x60, 0x01, 0xbc, 0x00, 0x28, 0x00, 0xd0,
@@ -148,7 +148,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
148148

149149
#else
150150

151-
uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
151+
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
152152
0x00, 0xb5, 0x32, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
153153
0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2e, 0x4b,
154154
0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,

0 commit comments

Comments
 (0)