update multi booter

switch order of picomite and sd_boot to make more space for progs of multi booter

bin folder name changed to firmware

ui interface improvments

Author: cuu

Code/pico_multi_booter/CMakeLists.txt

@@ -72,19 +72,19 @@ add_custom_target(BUILT_${BOOT}
 
 add_dependencies(BUILT_boot boot)
 
-add_dependencies(PREPARE_picomite BUILT_boot)
-add_dependencies(picomite PREPARE_picomite)
-add_dependencies(BUILT_picomite picomite)
-
-add_dependencies(PREPARE_sd_boot BUILT_picomite)
+add_dependencies(PREPARE_sd_boot BUILT_boot)
 add_dependencies(sd_boot PREPARE_sd_boot)
 add_dependencies(BUILT_sd_boot sd_boot)
 
+add_dependencies(PREPARE_picomite BUILT_sd_boot)
+add_dependencies(picomite PREPARE_picomite)
+add_dependencies(BUILT_picomite picomite)
+
 
 # ***************************************************************************
 # *     Join the BOOT and all APP '.uf2' files together                     *
 # ***************************************************************************
-set(UF2S boot.uf2 picomite.uf2 sd_boot.uf2)
+set(UF2S boot.uf2 sd_boot.uf2 picomite.uf2)
 
 add_custom_target(JOIN
     COMMENT "Combine the '.uf2' files"
@@ -95,7 +95,7 @@ add_custom_target(JOIN
             ${UF2S}
 )
 
-add_dependencies(JOIN BUILT_sd_boot)
+add_dependencies(JOIN BUILT_picomite)
 
 add_custom_target(${PROJECT} ALL DEPENDS JOIN)
 

Code/pico_multi_booter/README.md

@@ -3,8 +3,8 @@
 Here is a bootloader for PicoCalc combined slightly modified [PicoMite](https://github.com/madcock/PicoMiteAllVersions) and [SD boot](https://github.com/adwuard/Picocalc_SD_Boot)   
 
 - Pico1 
-- No sdcard inserted ,PicoMite will show up.  
-- Sdcard inserted, SD boot menu will show up, load third pico app bin to run at FLASH TARGET OFFSET 2048k-940k  
+- No sdcard inserted,load default app to run from flash. 
+- Sdcard inserted, SD boot menu will show up, load third pico app bin to run at FLASH TARGET OFFSET 2048k-152k
 
 ## How to compile
 ```
@@ -29,13 +29,13 @@ configuration.h
 
 config.h
 ```
-#define SD_BOOT_FLASH_OFFSET         (940 * 1024)
+#define SD_BOOT_FLASH_OFFSET         (152 * 1024)
 ```
 
 ### SD Card Application Build and Deployment
 **Important Note:**   
 ```
-Applications intended for SD card boot "MUST REBUILD" using a custom linker script to accommodate the program's offset(940k) address.
+Applications intended for SD card boot "MUST REBUILD" using a custom linker script to accommodate the program's offset(152k) address.
 
 Applications intended for SD card boot is in **bin** format, not uf2.
  
@@ -81,7 +81,7 @@ make
 ```
 
 #### Step 3 Your Custom Application Is Ready For SD Card Boot 
-Once the build is complete, copy the generated `.bin` file to the `/sd` directory of the SD card.  
+Once the build is complete, copy the generated `.bin` file to the `/firmware` directory of the SD card.  
 
 
 

Code/pico_multi_booter/boot.c

@@ -150,6 +150,7 @@ int main(void) {
         printf("max %d \n",max);
 
         // Choose an app to launch
+		/*
         int chosen;
 		if(!sd_card_inserted()){
 		  printf("No sd card\n");
@@ -159,7 +160,8 @@ int main(void) {
 		  chosen = max-1;
 		  if(chosen <0 ) chosen = 0;
 		}		
-
+		*/
+		int chosen = 0;
         // Get start address of app
         addr = PEEK32( info + ((chosen * 16)));
         printf("Application at %08lX\n",  addr);

Code/pico_multi_booter/linker_scripts/memmap_default.ld.mp.rp2040

@@ -1,7 +1,7 @@
 /*arduino-pico*/
 MEMORY
 {
-    FLASH(rx) : ORIGIN = 0x10000000 + 940k, LENGTH = __FLASH_LENGTH__ - 940k
+    FLASH(rx) : ORIGIN = 0x10000000 + 152k, LENGTH = __FLASH_LENGTH__ - 152k
     RAM(rwx) : ORIGIN =  0x20000000, LENGTH = __RAM_LENGTH__
     SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k

Code/pico_multi_booter/linker_scripts/memmap_mp_rp2040.ld

@@ -24,7 +24,7 @@
 
 MEMORY
 {
-    FLASH(rx) : ORIGIN = 0x10000000 + 940k, LENGTH = 2048k - 940k
+    FLASH(rx) : ORIGIN = 0x10000000 + 152k, LENGTH = 2048k - 152k
     RAM(rwx) : ORIGIN =  0x20000000, LENGTH = 256k
     SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k

Code/pico_multi_booter/linker_scripts/rpi-pico.ld

@@ -4,7 +4,7 @@
 
 MEMORY
 {
-    FLASH(rx)      : ORIGIN = 0x10000000 + 940k, LENGTH = 2048k - 940k
+    FLASH(rx)      : ORIGIN = 0x10000000 + 152k, LENGTH = 2048k - 152k
     RAM(rwx)       : ORIGIN = 0x20000000, LENGTH = 256k
     SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k

Code/pico_multi_booter/memmap_default_rp2040.ld

@@ -1,6 +1,6 @@
 MEMORY
 {
-    FLASH(rx) : ORIGIN = 0x10000000 + 940k, LENGTH = 2048k - 940k
+    FLASH(rx) : ORIGIN = 0x10000000 + 152k, LENGTH = 2048k - 152k
     RAM(rwx) : ORIGIN =  0x20000000, LENGTH = 256k
     SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k

Code/pico_multi_booter/memmap_default_rp2350.ld

@@ -23,7 +23,7 @@
 
 MEMORY
 {
-    FLASH(rx) : ORIGIN = 0x10000000 + 940k, LENGTH = 4096k - 940k
+    FLASH(rx) : ORIGIN = 0x10000000 + 152k, LENGTH = 4096k - 152k
     RAM(rwx) : ORIGIN =  0x20000000, LENGTH = 512k
     SCRATCH_X(rwx) : ORIGIN = 0x20080000, LENGTH = 4k
     SCRATCH_Y(rwx) : ORIGIN = 0x20081000, LENGTH = 4k

Code/pico_multi_booter/sd_boot/config.h

@@ -36,7 +36,7 @@
 // According to the applink.map ,with combined PicoMite, here is 920k
 // This offset is used to ensure that the bootloader does not get overwritten
 // when loading a new application from the SD card
-#define SD_BOOT_FLASH_OFFSET         (940 * 1024)
+#define SD_BOOT_FLASH_OFFSET         (152 * 1024)
 
 // Maximum size of the application that can be loaded
 // This ensures we don't overwrite the bootloader itself

Code/pico_multi_booter/sd_boot/main.c

@@ -207,15 +207,18 @@ int load_firmware_by_path(const char *path)
 
     // Attempt to load the application from the SD card
     // bool load_success = load_program(FIRMWARE_PATH);
-    bool load_success = load_program(path);
+    bool load_success=false;
 
     // Get the pointer to the application flash area
     uint32_t *app_location = (uint32_t *)(XIP_BASE + SD_BOOT_FLASH_OFFSET);
-
     // Check if there is an already valid application in flash
     bool has_valid_app = is_valid_application(app_location);
 
-
+    if(path == NULL) {
+        load_success = true;
+    }else{
+        load_success = load_program(path);
+    }
 
     if (load_success || has_valid_app)
     {
@@ -245,11 +248,21 @@ int load_firmware_by_path(const char *path)
 
 void final_selection_callback(const char *path)
 {
+    char status_message[128];
+    const char *extension = ".bin"; 
+    if(path == NULL) {
+        //load default app from flash
+
+        snprintf(status_message, sizeof(status_message), "SEL: %s", "FLASH+152k");
+        text_directory_ui_set_status(status_message);
+        sleep_ms(200);
+        load_firmware_by_path(path);
+        return;
+    }
     // Trigger firmware loading with the selected path
     DEBUG_PRINT("selected: %s\n", path);
 
-    char status_message[128];
-    const char *extension = ".bin";
+
     size_t path_len = strlen(path);
     size_t ext_len = strlen(extension);
 
@@ -286,7 +299,6 @@ int main()
     keypad_init();
     lcd_init();
     lcd_clear();
-    text_directory_ui_init();
 
     // Check for SD card presence
     DEBUG_PRINT("Checking for SD card...\n");