diff options
| author | Jindong <jindong.yue@nxp.com> | 2019-10-22 10:26:40 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2020-05-18 09:45:08 +0800 |
| commit | 285d7dec6f8db665b456b638fdf4fc8c409337e7 (patch) | |
| tree | aa02feef05d00ed5a5eb70ac4bebdad6212f8a5f /common | |
| parent | 8568bbdfbc374c397357c84bc6d673b18b404647 (diff) | |
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 <jindong.yue@nxp.com>
(cherry picked from commit 6a5534d13b9e7fe14a457c5f4664b054382d35e3)
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-android.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/common/image-android.c b/common/image-android.c index 3335a7afb7..377e073eab 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -158,34 +158,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, |