add BOOT_LOAD_PIN, update BL from SRAM and Jeff Probe Board #203

hlyi · 2023-07-21T20:13:27Z

This request to add the following features and board:

Add "Jeff Probe" board.
Add "BOOT_LOAD_PIN".
- The code was based upon SAM-BA. when boots, pulling BOOT_LOAD_PIN low would enter bootloader mode.
- The define can be set in board_config.h
- This feature costs about ~36 Bytes.
Add ability to update bootloader in UF2 mode without touching application flash
- The feature can be enable by adding "USE_SRAM_BL_FLASH = 1" in "board.mk" file.
- To enable this feature for the first time, add "CONV_SRAM_BL=1" option to make command. The "update-bootloader-.uf2" will still overwrite application flash
- For subsequent updates, do not use "CONV_SRAM_BL=1" option, the "update-bootloader-.uf2" will run from SRAM, and will not overwrite application flash.
- This feature costs about ~108 Bytes.

…h bootloader from SRAM which does not touch application code

do not leave dotstar on after exiting bootloader

…h bootloader from SRAM which does not touch application code

dhalbert

Some minor format cleanups: I'd like to be consistent about code formatting style.

These commits are several months old; I was confused, but I think you're just pushing them now?

Have you built and tested this code base on some standard board (say an Adafruit one) without the new options being enabled? Thanks.

dhalbert · 2024-01-21T19:52:39Z

src/fat.c

@@ -229,7 +239,22 @@ void write_block(uint32_t block_no, uint8_t *data, bool quiet, WriteState *state
        // copied from a device; we still want to count these blocks to reset properly
    } else {
        // logval("write block at", bl->targetAddr);
+#ifdef SRAM_BL_SIZE
+        if ( use_flash) {


Suggested change

if ( use_flash) {

if (use_flash) {

dhalbert · 2024-01-21T19:53:00Z

src/fat.c

+        if ( use_flash) {
+            flash_write_row((void *)bl->targetAddr, (void *)bl->data);
+            *DBL_TAP_PTR = 0;
+        }else{


Suggested change

}else{

} else {

dhalbert · 2024-01-21T19:53:46Z

src/main.c

+    uint32_t    addr_limit = boot_sram ? SRAM_BASE_ADDR+SRAM_BL_SIZE : FLASH_SIZE;
+
+    app_start_address = *(uint32_t *)( base_addr + 4 );
+    if ( app_start_address < base_addr || app_start_address > addr_limit ){


Suggested change

if ( app_start_address < base_addr || app_start_address > addr_limit ){

if (app_start_address < base_addr || app_start_address > addr_limit) {

dhalbert · 2024-01-21T19:54:04Z

src/fat.c

+            *DBL_TAP_PTR = 0;
+        }else{
+            memcpy((void*)bl->targetAddr, (void*)bl->data, FLASH_ROW_SIZE);
+            if ( bl->targetAddr == SRAM_BASE_ADDR ){


Suggested change

if ( bl->targetAddr == SRAM_BASE_ADDR ){

if (bl->targetAddr == SRAM_BASE_ADDR) {

dhalbert · 2024-01-21T19:54:18Z

src/fat.c

+            memcpy((void*)bl->targetAddr, (void*)bl->data, FLASH_ROW_SIZE);
+            if ( bl->targetAddr == SRAM_BASE_ADDR ){
+                uint32_t bootAddr = bl->data[4] | (bl->data[5]<<8) | (bl->data[6]<<16) | (bl->data[7]<<24);
+                if( bootAddr > SRAM_BASE_ADDR && bootAddr < (SRAM_BASE_ADDR + SRAM_BL_SIZE) ){


Suggested change

if( bootAddr > SRAM_BASE_ADDR && bootAddr < (SRAM_BASE_ADDR + SRAM_BL_SIZE) ){

if (bootAddr > SRAM_BASE_ADDR && bootAddr < (SRAM_BASE_ADDR + SRAM_BL_SIZE)) {

dhalbert · 2024-01-21T19:54:52Z

src/main.c

@@ -126,6 +159,10 @@ static void check_start_application(void) {
    if (RESET_CONTROLLER->RCAUSE.bit.POR) {
        *DBL_TAP_PTR = 0;
    }
+#ifdef SRAM_BL_SIZE
+    else if ( *DBL_TAP_PTR == DBL_TAP_MAGIC_SRAM_BL ) {


Suggested change

else if ( *DBL_TAP_PTR == DBL_TAP_MAGIC_SRAM_BL ) {

else if (*DBL_TAP_PTR == DBL_TAP_MAGIC_SRAM_BL) {

dhalbert · 2024-01-21T19:55:16Z

src/selfmain.c

@@ -191,8 +195,10 @@ int main(void) {
    // bootloader doesn't run us a second time. We don't need to erase to write
    // zeros. The remainder of the write unit will be set to 1s which should
    // preserve the existing values but its not critical.
+#if ( (! defined(SRAM_BL_SIZE)) || defined(USE_STD_FLASH_BL) )


Suggested change

#if ( (! defined(SRAM_BL_SIZE)) || defined(USE_STD_FLASH_BL) )

#if ((!defined(SRAM_BL_SIZE)) || defined(USE_STD_FLASH_BL))

dhalbert · 2024-01-21T19:55:27Z

src/utils.c

@@ -79,7 +79,12 @@ int writeNum(char *buf, uint32_t n, bool full) {
 void resetIntoApp() {
    // reset without waiting for double tap (only works for one reset)
    RGBLED_set_color(COLOR_LEAVE);
+#ifdef SRAM_BL_SIZE
+    if ( *DBL_TAP_PTR != DBL_TAP_MAGIC_SRAM_BL)


Suggested change

if ( *DBL_TAP_PTR != DBL_TAP_MAGIC_SRAM_BL)

if (*DBL_TAP_PTR != DBL_TAP_MAGIC_SRAM_BL)

add BOOT_LOAD_PIN support. add jeff probe board. And support for flas…

2b2c3b0

…h bootloader from SRAM which does not touch application code

pesco mentioned this pull request Jul 27, 2023

Upstream changes and fixes #204

Open

rlcamp and others added 6 commits October 2, 2023 07:33

do not leave dotstar on after exiting bootloader

fe875c4

Merge pull request adafruit#208 from rlcamp/do_not_leave_dotstar_on

a179d8e

do not leave dotstar on after exiting bootloader

add BOOT_LOAD_PIN support. add jeff probe board. And support for flas…

abf9802

…h bootloader from SRAM which does not touch application code

fixed compilation error; rebase to master branch

dc692af

merge file

8b08ccf

fixed self update and makefile

81b5a11

dhalbert reviewed Jan 21, 2024

View reviewed changes

hlyi added 6 commits January 21, 2024 14:01

update board.mk for jeff probe

8efb6d5

revert back makefile

f6f6ca6

allow board.mk passing CFLAGS to Makefile

73f02c2

add CRYSTALLESS to jeff probe build

169bbc8

working on selfmain

fb184ce

update board makefile

d0289bf

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add BOOT_LOAD_PIN, update BL from SRAM and Jeff Probe Board #203

add BOOT_LOAD_PIN, update BL from SRAM and Jeff Probe Board #203

hlyi commented Jul 21, 2023

dhalbert left a comment

dhalbert Jan 21, 2024

dhalbert Jan 21, 2024

dhalbert Jan 21, 2024

dhalbert Jan 21, 2024

dhalbert Jan 21, 2024

dhalbert Jan 21, 2024

dhalbert Jan 21, 2024

dhalbert Jan 21, 2024

	if ( app_start_address < base_addr \|\| app_start_address > addr_limit ){
	if (app_start_address < base_addr \|\| app_start_address > addr_limit) {

	if ( bl->targetAddr == SRAM_BASE_ADDR ){
	if (bl->targetAddr == SRAM_BASE_ADDR) {

	if( bootAddr > SRAM_BASE_ADDR && bootAddr < (SRAM_BASE_ADDR + SRAM_BL_SIZE) ){
	if (bootAddr > SRAM_BASE_ADDR && bootAddr < (SRAM_BASE_ADDR + SRAM_BL_SIZE)) {

	else if ( *DBL_TAP_PTR == DBL_TAP_MAGIC_SRAM_BL ) {
	else if (*DBL_TAP_PTR == DBL_TAP_MAGIC_SRAM_BL) {

	#if ( (! defined(SRAM_BL_SIZE)) \|\| defined(USE_STD_FLASH_BL) )
	#if ((!defined(SRAM_BL_SIZE)) \|\| defined(USE_STD_FLASH_BL))

	if ( *DBL_TAP_PTR != DBL_TAP_MAGIC_SRAM_BL)
	if (*DBL_TAP_PTR != DBL_TAP_MAGIC_SRAM_BL)

add BOOT_LOAD_PIN, update BL from SRAM and Jeff Probe Board #203

Are you sure you want to change the base?

add BOOT_LOAD_PIN, update BL from SRAM and Jeff Probe Board #203

Conversation

hlyi commented Jul 21, 2023

dhalbert left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment