teensy fixes

tannewt · tannewt · commit 9f4ea2122a34 · 2020-01-17T18:35:09.000-08:00
diff --git a/ports/mimxrt10xx/boards/teensy40/flash_config.c b/ports/mimxrt10xx/boards/teensy40/flash_config.c
@@ -68,7 +68,7 @@ const flexspi_nor_config_t qspiflash_config = {
             .deviceType    = kFlexSpiDeviceType_SerialNOR,
             .sflashPadType = kSerialFlash_4Pads,
             .serialClkFreq = kFlexSpiSerialClk_60MHz, // 03
-            .sflashA1Size  = 0x00200000,
+            .sflashA1Size  = FLASH_SIZE,
             .lookupTable =
                 {
                     // FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
@@ -162,10 +162,10 @@ void SystemInitHook(void) {
     // we can ignore 1/8th size chunks. So, we ignore the last 1MB using the subregion.
     uint32_t remainder = (1u << (region_size + 1)) - filesystem_size;
     uint32_t subregion_size = (1u << (region_size + 1)) / 8;
-    uint16_t subregion_mask = 0xff00 >> (remainder / subregion_size);
+    uint8_t subregion_mask = (0xff00 >> (remainder / subregion_size)) & 0xff;
 
     MPU->RBAR = ARM_MPU_RBAR(11, 0x60100000U);
-    MPU->RASR = ARM_MPU_RASR(EXECUTION, ARM_MPU_AP_FULL, NORMAL, NOT_SHAREABLE, CACHEABLE, BUFFERABLE, (uint8_t) subregion_mask, region_size);
+    MPU->RASR = ARM_MPU_RASR(EXECUTION, ARM_MPU_AP_FULL, NORMAL, NOT_SHAREABLE, CACHEABLE, BUFFERABLE, subregion_mask, region_size);
 
     // This the ITCM. Set it to read-only because we've loaded everything already and it's easy to
     // accidentally write the wrong value to 0x00000000 (aka NULL).

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ const flexspi_nor_config_t qspiflash_config = {`
`68`	`68`	`.deviceType = kFlexSpiDeviceType_SerialNOR,`
`69`	`69`	`.sflashPadType = kSerialFlash_4Pads,`
`70`	`70`	`.serialClkFreq = kFlexSpiSerialClk_60MHz, // 03`
`71`		`- .sflashA1Size = 0x00200000,`
	`71`	`+ .sflashA1Size = FLASH_SIZE,`
`72`	`72`	`.lookupTable =`
`73`	`73`	`{`
`74`	`74`	`// FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)`