Commit 6b86e4fb9403d7c0c2fd475a910e09965758f355
1 parent
40419231e2
Exists in
smarc_8mm-imx_v2019.04_4.19.35_1.1.0
and in
1 other branch
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>
Showing 1 changed file with 0 additions and 28 deletions Side-by-side Diff
common/image-android.c
| ... | ... | @@ -153,34 +153,6 @@ |
| 153 | 153 | " androidboot.boot_device_root=mmcblk%d", mmc_map_to_kernel_blk(mmc_get_env_dev())); |
| 154 | 154 | strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); |
| 155 | 155 | |
| 156 | - char *storage_type = env_get("storage_type"); | |
| 157 | - if (storage_type) { | |
| 158 | - sprintf(newbootargs, | |
| 159 | - " androidboot.storage_type=%s", | |
| 160 | - storage_type); | |
| 161 | - strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); | |
| 162 | - } else { | |
| 163 | - int bootdev = get_boot_device(); | |
| 164 | - if (bootdev == SD1_BOOT || bootdev == SD2_BOOT || | |
| 165 | - bootdev == SD3_BOOT || bootdev == SD4_BOOT) { | |
| 166 | - sprintf(newbootargs, | |
| 167 | - " androidboot.storage_type=sd"); | |
| 168 | - } else if (bootdev == MMC1_BOOT || bootdev == MMC2_BOOT || | |
| 169 | - bootdev == MMC3_BOOT || bootdev == MMC4_BOOT) { | |
| 170 | - sprintf(newbootargs, | |
| 171 | - " androidboot.storage_type=emmc"); | |
| 172 | - } else if (bootdev == NAND_BOOT) { | |
| 173 | - sprintf(newbootargs, | |
| 174 | - " androidboot.storage_type=nand"); | |
| 175 | - } else | |
| 176 | - printf("boot device type is incorrect.\n"); | |
| 177 | - strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); | |
| 178 | - if (bootloader_gpt_overlay()) { | |
| 179 | - sprintf(newbootargs, " gpt"); | |
| 180 | - strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); | |
| 181 | - } | |
| 182 | - } | |
| 183 | - | |
| 184 | 156 | /* boot metric variables */ |
| 185 | 157 | metrics.ble_1 = get_timer(0); |
| 186 | 158 | sprintf(newbootargs, |