From 6b86e4fb9403d7c0c2fd475a910e09965758f355 Mon Sep 17 00:00:00 2001 From: Jindong Date: Tue, 22 Oct 2019 10:26:40 +0800 Subject: [PATCH] MA-15678 image-android: remove deprecated androidboot.storage_type androidboot.storage_type has been replaced by androidboot.boot_device_root. Change-Id: Ibec80808e6ae720be128c0a2d9e2f4d325c56716 Signed-off-by: Jindong --- common/image-android.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/common/image-android.c b/common/image-android.c index 3bcf4b2b3f..de253fcfb8 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -153,34 +153,6 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, " androidboot.boot_device_root=mmcblk%d", mmc_map_to_kernel_blk(mmc_get_env_dev())); strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); - char *storage_type = env_get("storage_type"); - if (storage_type) { - sprintf(newbootargs, - " androidboot.storage_type=%s", - storage_type); - strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); - } else { - int bootdev = get_boot_device(); - if (bootdev == SD1_BOOT || bootdev == SD2_BOOT || - bootdev == SD3_BOOT || bootdev == SD4_BOOT) { - sprintf(newbootargs, - " androidboot.storage_type=sd"); - } else if (bootdev == MMC1_BOOT || bootdev == MMC2_BOOT || - bootdev == MMC3_BOOT || bootdev == MMC4_BOOT) { - sprintf(newbootargs, - " androidboot.storage_type=emmc"); - } else if (bootdev == NAND_BOOT) { - sprintf(newbootargs, - " androidboot.storage_type=nand"); - } else - printf("boot device type is incorrect.\n"); - strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); - if (bootloader_gpt_overlay()) { - sprintf(newbootargs, " gpt"); - strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); - } - } - /* boot metric variables */ metrics.ble_1 = get_timer(0); sprintf(newbootargs, -- 2.17.1