ODROID-COMMON: android: Changed recovery process.

- In android reboot sequence, devtype and devnum are needed. so except
  fastboot sequence, other boot sequences are moved to script in boot.ini.

Change-Id: I6f0bdf960bdf37041e15b3cec06ded913213f559

Author: xiane

common/bootm.c

@@ -344,33 +344,6 @@ static int get_fdto_totalsize(u32 *tz)
 }
 #endif
 
-#if defined(CONFIG_ODROID_COMMON)
-extern int get_boot_device(void);
-static int bootm_add_ignore_mpt_to_fdt(void *fdth)
-{
-	bool is_emmc_boot = false;
-	const char * mmc_dev = getenv("mmc_dev");
-	const char * dev_type = getenv("devtype");
-	char boot_device[7];
-
-	if (mmc_dev == NULL)
-		is_emmc_boot = get_boot_device() == 1;
-	else
-		is_emmc_boot = simple_strtol(mmc_dev, NULL, 10) == 0;
-
-	memset(boot_device, 0x00, sizeof(boot_device));
-	if (!strncmp(dev_type, "mmc", sizeof("mmc"))) {
-		sprintf(boot_device, "%s%c", "mmcblk", is_emmc_boot? '0':'1');
-	} else {
-		sprintf(boot_device, "%s%c", "sd", is_emmc_boot ? 'a': 'b');
-	}
-
-	setenv("boot_device", boot_device);
-
-	return 0;
-}
-#endif
-
 #ifdef CONFIG_OF_LIBFDT_OVERLAY
 static int do_fdt_overlay(void)
 {
@@ -494,10 +467,6 @@ static int bootm_find_fdt(int flag, int argc, char * const argv[])
 
 	set_working_fdt_addr(images.ft_addr);
 
-#if defined(CONFIG_ODROID_COMMON)
-	bootm_add_ignore_mpt_to_fdt(images.ft_addr);
-#endif
-
 	#ifdef CONFIG_OF_LIBFDT_OVERLAY
 	do_fdt_overlay();
 	#endif

include/configs/odroid-g12-common.h

@@ -177,7 +177,7 @@
         "switch_bootmode=" \
             "get_rebootmode;" \
             "if test ${reboot_mode} = factory_reset; then " \
-                "run boot_recovery;" \
+                "run boot_default;" \
             "else if test ${reboot_mode} = selfinstall; then " \
                 "run boot_default;" \
             "else if test ${reboot_mode} = cold_boot; then " \
@@ -195,7 +195,8 @@
                 "cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse} "\
                 "androidboot.selinux=permissive jtag=disable "\
                 "androidboot.hardware=" CONFIG_DEVICE_PRODUCT " "\
-                "recovery_part=recovery recovery_offset=0; "\
+                "recovery_part=recovery recovery_offset=0 " \
+                "boot_device=${boot_device};" \
             "movi read dtbs 0 ${cramfsaddr}; " \
             "if test " CONFIG_DEVICE_PRODUCT " = odroidn2; then " \
                 "cramfsload ${dtb_mem_addr} meson64_" CONFIG_DEVICE_PRODUCT "_android.dtb;" \