aboot: Enable recovery features if the OS is Android

Android could run on mainline kernel...

Fix up some logic and code style in `_emmc_recovery_init()` while at it.

Author: me-cafebabe

app/aboot/aboot.c

@@ -1576,6 +1576,56 @@ void get_recovery_dtbo_info(uint32_t *dtbo_size, void **dtbo_buf)
 	return;
 }
 
+bool detect_android_from_mmc(void)
+{
+	const char *ptn_names[] = {"boot", "real_boot"};
+	unsigned int i;
+	int index = INVALID_PTN;
+	unsigned long long ptn = 0;
+	uint64_t image_size = 0;
+	bool partition_found = false;
+	boot_img_hdr *hdr = (void*) buf;
+	static bool detected = false, result = false;
+
+	if (detected)
+		return result;
+
+	for (i = 0; i < ARRAY_SIZE(ptn_names); i++) {
+		index = partition_get_index(ptn_names[i]);
+		if (index != INVALID_PTN) {
+			ptn = partition_get_offset(index);
+			image_size = partition_get_size(index);
+		}
+		if (index != INVALID_PTN && ptn != 0 && image_size != 0) {
+			partition_found = true;
+			break;
+		}
+		dprintf(CRITICAL, "ERROR: No %s partition found\n", ptn_names[i]);
+	}
+
+	if (!partition_found) {
+		detected = true;
+		return result;
+	}
+
+	/* Set Lun for boot & recovery partitions */
+	mmc_set_lun(partition_get_lun(index));
+
+	if (mmc_read(ptn, (uint32_t *) buf, page_size)) {
+		dprintf(CRITICAL, "ERROR: Cannot read boot image header\n");
+		detected = true;
+		return result;
+	}
+
+	if (strstr((const char *)hdr->cmdline, "androidboot.")) {
+		dprintf(INFO, "Detected Android boot parameter\n");
+		result = true;
+	}
+
+	detected = true;
+	return result;
+}
+
 int boot_linux_from_mmc(void)
 {
 	boot_img_hdr *hdr = (void*) buf;
@@ -1627,7 +1677,7 @@ int boot_linux_from_mmc(void)
 	int current_active_slot = INVALID;
 	bool try_alternate_partition = false;
 
-	if (!IS_ENABLED(ABOOT_STANDALONE) && check_format_bit())
+	if (detect_android_from_mmc() && check_format_bit())
 		boot_into_recovery = 1;
 
 	if (!IS_ENABLED(ABOOT_STANDALONE) && !boot_into_recovery) {
@@ -5673,7 +5723,7 @@ void aboot_init(const struct app_descriptor *app)
 
 		if (target_is_emmc_boot())
 		{
-			if(!IS_ENABLED(ABOOT_STANDALONE) && emmc_recovery_init())
+			if(detect_android_from_mmc() && emmc_recovery_init())
 				dprintf(ALWAYS,"error in emmc_recovery_init\n");
 			if(target_use_signed_kernel())
 			{

app/aboot/recovery.c

@@ -396,7 +396,7 @@ int send_recovery_cmd(const char *command)
 
 int _emmc_recovery_init(void)
 {
-	int update_status = 0;
+	int update_status __attribute__((unused)) = 0;
 	struct recovery_message *msg;
 	uint32_t block_size = 0;
 
@@ -428,6 +428,7 @@ int _emmc_recovery_init(void)
 		boot_into_recovery = 1;
 	}
 
+#if !ABOOT_STANDALONE
 	if (!strcmp("update-radio",msg->command))
 	{
 		/* We're now here due to radio update, so check for update status */
@@ -460,6 +461,7 @@ int _emmc_recovery_init(void)
 	emmc_set_recovery_msg(msg);	// send recovery message
 
 out:
+#endif
 	if(msg)
 		free(msg);
 	return 0;

app/aboot/rules.mk

@@ -13,7 +13,6 @@ OBJS += \
 
 ifeq ($(ABOOT_STANDALONE), 1)
 DEFINES += ABOOT_STANDALONE=1
-OBJS := $(filter-out $(LOCAL_DIR)/recovery.o, $(OBJS))
 DEFINES := $(filter-out SSD_ENABLE TZ_SAVE_KERNEL_HASH TZ_TAMPER_FUSE, $(DEFINES))
 endif