Author: manu
Date: Wed Aug 29 14:01:27 2018
New Revision: 338371
URL: https://svnweb.freebsd.org/changeset/base/338371
Log:
arm64: GENERIC-MMCCAM: Fix build and module depend
Fix the build of the GENERIC-MMCCAM kernel config after the sdhci_xenon
driver was commited.
While here correct sdhci_fdt and tegra_sdhci, even with MMCCAM they do
need to depend on sdhci(4)
Reported by: Reshetnikov Dmitriy <gens...@hotmail.com>
Approved by: re (kib)
Sponsored by: Rubicon Communications, LLC ("NetGate")
Modified:
head/sys/arm/nvidia/tegra_sdhci.c
head/sys/dev/sdhci/sdhci_fdt.c
head/sys/dev/sdhci/sdhci_xenon.c
Modified: head/sys/arm/nvidia/tegra_sdhci.c
==============================================================================
--- head/sys/arm/nvidia/tegra_sdhci.c Wed Aug 29 12:24:19 2018
(r338370)
+++ head/sys/arm/nvidia/tegra_sdhci.c Wed Aug 29 14:01:27 2018
(r338371)
@@ -465,7 +465,7 @@ static DEFINE_CLASS_0(sdhci, tegra_sdhci_driver, tegra
sizeof(struct tegra_sdhci_softc));
DRIVER_MODULE(sdhci_tegra, simplebus, tegra_sdhci_driver, tegra_sdhci_devclass,
NULL, NULL);
-#ifndef MMCCAM
MODULE_DEPEND(sdhci_tegra, sdhci, 1, 1, 1);
+#ifndef MMCCAM
MMC_DECLARE_BRIDGE(sdhci);
#endif
Modified: head/sys/dev/sdhci/sdhci_fdt.c
==============================================================================
--- head/sys/dev/sdhci/sdhci_fdt.c Wed Aug 29 12:24:19 2018
(r338370)
+++ head/sys/dev/sdhci/sdhci_fdt.c Wed Aug 29 14:01:27 2018
(r338371)
@@ -353,7 +353,7 @@ static devclass_t sdhci_fdt_devclass;
DRIVER_MODULE(sdhci_fdt, simplebus, sdhci_fdt_driver, sdhci_fdt_devclass,
NULL, NULL);
-#ifndef MMCCAM
MODULE_DEPEND(sdhci_fdt, sdhci, 1, 1, 1);
+#ifndef MMCCAM
MMC_DECLARE_BRIDGE(sdhci_fdt);
#endif
Modified: head/sys/dev/sdhci/sdhci_xenon.c
==============================================================================
--- head/sys/dev/sdhci/sdhci_xenon.c Wed Aug 29 12:24:19 2018
(r338370)
+++ head/sys/dev/sdhci/sdhci_xenon.c Wed Aug 29 14:01:27 2018
(r338371)
@@ -61,6 +61,8 @@ __FBSDID("$FreeBSD$");
#include "mmcbr_if.h"
#include "sdhci_if.h"
+#include "opt_mmccam.h"
+
#define MAX_SLOTS 6
static struct ofw_compat_data compat_data[] = {
@@ -542,5 +544,8 @@ static devclass_t sdhci_xenon_devclass;
DRIVER_MODULE(sdhci_xenon, simplebus, sdhci_xenon_driver, sdhci_xenon_devclass,
NULL, NULL);
+
MODULE_DEPEND(sdhci_xenon, sdhci, 1, 1, 1);
+#ifndef MMCCAM
MMC_DECLARE_BRIDGE(sdhci_xenon);
+#endif
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
