don't boot from ext2fs boot.img if user requested recovery

rsrg · Mar 27, 2023 · b869a44 · b869a44
1 parent 549b4a2
commit b869a44
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
@@ -5316,13 +5316,17 @@ void aboot_init(const struct app_descriptor *app)
 	{
 		if (target_is_emmc_boot())
 		{
-			/* Try to boot from first fs we can find */
-			ssize_t loaded_file = fsboot_boot_first(target_get_scratch_address(), target_get_max_flash_size());
+			if(! boot_into_recovery) {
+				/* Try to boot from first fs we can find */
 
-			if (loaded_file > 0)
-				cmd_boot(NULL, target_get_scratch_address(), target_get_max_flash_size());
+				ssize_t loaded_file = fsboot_boot_first(target_get_scratch_address(), target_get_max_flash_size());
 
-			dprintf(CRITICAL, "Unable to load boot.img from ext2. Continuing legacy boot\n");
+				if (loaded_file > 0) {
+					dprintf(INFO, "Booting boot.img from ext2 %x %x\n", target_get_scratch_address(), target_get_max_flash_size());
+					cmd_boot(NULL, target_get_scratch_address(), loaded_file);
+					goto fastboot;
+				}
+			}
 
 			if(emmc_recovery_init())
 				dprintf(ALWAYS,"error in emmc_recovery_init\n");