hc
2023-11-06 9df731a176aab8e03b984b681b1bea01ccff6644
u-boot/drivers/mtd/mtd_blk.c
....@@ -22,9 +22,6 @@
2222 #endif
2323
2424 #define MTD_PART_NAND_HEAD "mtdparts="
25
-#define MTD_ROOT_PART_NUM "ubi.mtd="
26
-#define MTD_ROOT_PART_NAME_UBIFS "root=ubi0:rootfs"
27
-#define MTD_ROOT_PART_NAME_SQUASHFS "root=/dev/ubiblock0_0"
2825 #define MTD_PART_INFO_MAX_SIZE 512
2926 #define MTD_SINGLE_PART_INFO_MAX_SIZE 40
3027
....@@ -371,20 +368,7 @@
371368 mtd = (struct mtd_info *)dev_desc->bdev->priv;
372369 if (!mtd)
373370 return NULL;
374
-#ifndef CONFIG_SPL_BUILD
375
- char mtd_root_part_info[40] = {0};
376371
377
- p = part_get_info_by_name(dev_desc, PART_SYSTEM, &info);
378
- if (p > 0) {
379
- if (strstr(env_get("bootargs"), "rootfstype=squashfs"))
380
- snprintf(mtd_root_part_info, ARRAY_SIZE(mtd_root_part_info), "%s%d %s",
381
- MTD_ROOT_PART_NUM, p - 1, MTD_ROOT_PART_NAME_SQUASHFS);
382
- else
383
- snprintf(mtd_root_part_info, ARRAY_SIZE(mtd_root_part_info), "%s%d %s",
384
- MTD_ROOT_PART_NUM, p - 1, MTD_ROOT_PART_NAME_UBIFS);
385
- env_update("bootargs", mtd_root_part_info);
386
- }
387
-#endif
388372 mtd_part_info = (char *)calloc(MTD_PART_INFO_MAX_SIZE, sizeof(char));
389373 if (!mtd_part_info) {
390374 printf("%s: Fail to malloc!", __func__);