Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 561e624c350ee5c281da46d23aee70b0523d4d39

Authored by Simon Glass
Committed by sjg
1 parent d5fe013cee
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

dm: mmc: Support erase 

At present erase is not suported with CONFIG_DM_OPS. Add it so that MMC
devices can be erased.

Signed-off-by: Simon Glass <sjg@chromium.org>

Showing 3 changed files with 11 additions and 4 deletions Side-by-side Diff

drivers/mmc/mmc-uclass.c
Diff comments   View file @ 561e624
... ... @@ -262,6 +262,7 @@
262 262 .read = mmc_bread,
263 263 #ifndef CONFIG_SPL_BUILD
264 264 .write = mmc_bwrite,
  265 + .erase = mmc_berase,
265 266 #endif
266 267 .select_hwpart = mmc_select_hwpart,
267 268 };
drivers/mmc/mmc_private.h
Diff comments   View file @ 561e624
... ... @@ -29,15 +29,15 @@
29 29 #endif
30 30  
31 31 #if !(defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_SAVEENV))
32   -unsigned long mmc_berase(struct blk_desc *block_dev, lbaint_t start,
33   - lbaint_t blkcnt);
34 32  
35 33 #ifdef CONFIG_BLK
36 34 ulong mmc_bwrite(struct udevice *dev, lbaint_t start, lbaint_t blkcnt,
37 35 const void *src);
  36 +ulong mmc_berase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt);
38 37 #else
39 38 ulong mmc_bwrite(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
40 39 const void *src);
  40 +ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt);
41 41 #endif
42 42  
43 43 #else /* CONFIG_SPL_BUILD and CONFIG_SPL_SAVEENV is not defined */
drivers/mmc/mmc_write.c
Diff comments   View file @ 561e624
... ... @@ -66,9 +66,15 @@
66 66 return err;
67 67 }
68 68  
69   -unsigned long mmc_berase(struct blk_desc *block_dev, lbaint_t start,
70   - lbaint_t blkcnt)
  69 +#ifdef CONFIG_BLK
  70 +ulong mmc_berase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt)
  71 +#else
  72 +ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt)
  73 +#endif
71 74 {
  75 +#ifdef CONFIG_BLK
  76 + struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
  77 +#endif
72 78 int dev_num = block_dev->devnum;
73 79 int err = 0;
74 80 u32 start_rem, blkcnt_rem;