the mmcsd driver (and fdt slicer) declare dependencies on a non-exist…

…ence g_flashmap module, which should be geom_flashmap. with this change, we can access and mount drives on the StarFive VisionFive 2 after loading the mmcsd kld (still relying on the clock hack)
csgordon · Oct 9, 2023 · 95e24f5 · 95e24f5
1 parent fd72e1e
commit 95e24f5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/sys/dev/fdt/fdt_slicer.c b/sys/dev/fdt/fdt_slicer.c
@@ -180,5 +180,5 @@ static moduledata_t fdt_slicer_mod = {
 };
 
 DECLARE_MODULE(fdt_slicer, fdt_slicer_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
-MODULE_DEPEND(fdt_slicer, g_flashmap, 0, 0, 0);
+MODULE_DEPEND(fdt_slicer, geom_flashmap, 0, 0, 0);
 MODULE_VERSION(fdt_slicer, 1);
diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c
@@ -1564,5 +1564,5 @@ mmcsd_handler(module_t mod __unused, int what, void *arg __unused)
 }
 
 DRIVER_MODULE(mmcsd, mmc, mmcsd_driver, mmcsd_handler, NULL);
-MODULE_DEPEND(mmcsd, g_flashmap, 0, 0, 0);
+MODULE_DEPEND(mmcsd, geom_flashmap, 0, 0, 0);
 MMC_DEPEND(mmcsd);
diff --git a/sys/geom/geom_flashmap.c b/sys/geom/geom_flashmap.c
@@ -222,5 +222,5 @@ static struct g_class g_flashmap_class = {
 	.taste = g_flashmap_taste,
 };
 
-DECLARE_GEOM_CLASS(g_flashmap_class, g_flashmap);
-MODULE_VERSION(g_flashmap, 0);
+DECLARE_GEOM_CLASS(g_flashmap_class, geom_flashmap);
+MODULE_VERSION(geom_flashmap, 0);