~ruther/qmk_firmware

b9f2121d109cf8c3c4ff8ba7cc382db34cc3e1e4 — Thomas Weißschuh 1 year, 8 months ago 12b3dd3
chibios: mark boot2 bootlader data readonly (#21986)

M platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash.c => platforms/chibios/drivers/wear_leveling/wear_leveling_rp2040_flash.c +2 -2
@@ 25,8 25,8 @@
#define FLASHCMD_READ_STATUS 0x05
#define FLASHCMD_WRITE_ENABLE 0x06

extern uint8_t  BOOT2_ROM[256];
static uint32_t BOOT2_ROM_RAM[64];
extern const uint8_t BOOT2_ROM[256];
static uint32_t      BOOT2_ROM_RAM[64];

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


M platforms/chibios/vendors/RP/stage2_bootloaders.c => platforms/chibios/vendors/RP/stage2_bootloaders.c +6 -6
@@ 13,7 13,7 @@

#if defined(RP2040_FLASH_AT25SF128A)

uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
  0x00, 0xb5, 0x31, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
  0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2d, 0x4b,
  0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,


@@ 40,7 40,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {

#elif defined(RP2040_FLASH_GD25Q64CS)

uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
  0x00, 0xb5, 0x31, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x98, 0x68, 0x02, 0x21,
  0x88, 0x43, 0x98, 0x60, 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x2d, 0x4b,
  0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61, 0x01, 0x21, 0xf0, 0x22,


@@ 67,7 67,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {

#elif defined(RP2040_FLASH_W25X10CL)

uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
  0x00, 0xb5, 0x14, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
  0x12, 0x49, 0x19, 0x60, 0x00, 0x21, 0x59, 0x60, 0x11, 0x49, 0x12, 0x48,
  0x01, 0x60, 0x01, 0x21, 0x99, 0x60, 0xbb, 0x21, 0x19, 0x66, 0x02, 0x21,


@@ 94,7 94,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {

#elif defined(RP2040_FLASH_IS25LP080)

uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
  0x00, 0xb5, 0x2b, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
  0x29, 0x49, 0x19, 0x60, 0x01, 0x21, 0x99, 0x60, 0x28, 0x48, 0x00, 0xf0,
  0x42, 0xf8, 0x28, 0x4a, 0x90, 0x42, 0x12, 0xd0, 0x06, 0x21, 0x19, 0x66,


@@ 121,7 121,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {

#elif defined(RP2040_FLASH_GENERIC_03H)

uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
const uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {
  0x00, 0xb5, 0x0c, 0x4b, 0x00, 0x21, 0x99, 0x60, 0x04, 0x21, 0x59, 0x61,
  0x0a, 0x49, 0x19, 0x60, 0x0a, 0x49, 0x0b, 0x48, 0x01, 0x60, 0x00, 0x21,
  0x59, 0x60, 0x01, 0x21, 0x99, 0x60, 0x01, 0xbc, 0x00, 0x28, 0x00, 0xd0,


@@ 148,7 148,7 @@ uint8_t BOOTLOADER_SECTION BOOT2_ROM[256] = {

#else

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

Do not follow this link