commit 9765a037a1342b17c596f0aa70b410295bbc5f05
author Koushik Dutta <koushd@gmail.com> Sat Dec 18 21:31:02 2010 -0800
committer Koushik Dutta <koushd@gmail.com> Sat Dec 18 21:31:02 2010 -0800
tree 7878ba77a9ce264eadf9998c3d8b332c38050a10
parent 7c1bffefebcce8be953bbb3469ae25861eebbb58

Remove usage of BOARD_HAS_NO_MISC_PARTITION.

Change-Id: I5775f47fb1d5ef66e2461a0c53166af03354a6f6

recovery.c

diff --git a/recovery.c b/recovery.c
index 33b54ba..741d59e 100644
--- a/recovery.c
+++ b/recovery.c
@@ -43,6 +43,7 @@
 #include "encryptedfs_provisioning.h"
 
 #include "extendedcommands.h"
+#include "flashutils/flashutils.h"
 
 static const struct option OPTIONS[] = {
   { "send_intent", required_argument, NULL, 's' },
@@ -178,9 +179,9 @@
 get_args(int *argc, char ***argv) {
     struct bootloader_message boot;
     memset(&boot, 0, sizeof(boot));
-#ifndef BOARD_HAS_NO_MISC_PARTITION
-    get_bootloader_message(&boot);  // this may fail, leaving a zeroed structure
-#endif
+    if (device_flash_type() == MTD) {
+        get_bootloader_message(&boot);  // this may fail, leaving a zeroed structure
+    }
 
     if (boot.command[0] != 0 && boot.command[0] != 255) {
         LOGI("Boot command: %.*s\n", sizeof(boot.command), boot.command);
@@ -237,12 +238,11 @@
         strlcat(boot.recovery, (*argv)[i], sizeof(boot.recovery));
         strlcat(boot.recovery, "\n", sizeof(boot.recovery));
     }
-#ifndef BOARD_HAS_NO_MISC_PARTITION
-    set_bootloader_message(&boot);
-#endif
+    if (device_flash_type() == MTD) {
+        set_bootloader_message(&boot);
+    }
 }
 
-#ifndef BOARD_HAS_NO_MISC_PARTITION
 void
 set_sdcard_update_bootloader_message() {
     struct bootloader_message boot;
@@ -251,7 +251,6 @@
     strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery));
     set_bootloader_message(&boot);
 }
-#endif
 
 // How much of the temp log we have copied to the copy in cache.
 static long tmplog_offset = 0;
@@ -303,12 +302,12 @@
     copy_log_file(LAST_LOG_FILE, false);
     chmod(LAST_LOG_FILE, 0640);
 
-#ifndef BOARD_HAS_NO_MISC_PARTITION
-    // Reset to mormal system boot so recovery won't cycle indefinitely.
-    struct bootloader_message boot;
-    memset(&boot, 0, sizeof(boot));
-    set_bootloader_message(&boot);
-#endif
+    if (device_flash_type() == MTD) {
+        // Reset to mormal system boot so recovery won't cycle indefinitely.
+        struct bootloader_message boot;
+        memset(&boot, 0, sizeof(boot));
+        set_bootloader_message(&boot);
+    }
 
     // Remove the command file, so recovery won't repeat indefinitely.
     if (ensure_path_mounted(COMMAND_FILE) != 0 ||
@@ -797,6 +796,7 @@
     ui_print(EXPAND(RECOVERY_VERSION)"\n");
     load_volume_table();
     create_fstab();
+    LOGI("Processing arguments.\n");
     get_args(&argc, &argv);
 
     int previous_runs = 0;
@@ -807,6 +807,7 @@
     int toggle_secure_fs = 0;
     encrypted_fs_info encrypted_fs_data;
 
+    LOGI("Checking arguments.\n");
     int arg;
     while ((arg = getopt_long(argc, argv, "", OPTIONS, NULL)) != -1) {
         switch (arg) {
@@ -823,6 +824,7 @@
         }
     }
 
+    LOGI("device_recovery_start()\n");
     device_recovery_start();
 
     printf("Command:");