~hc/RK356X_SDK_RELEASE.git

..	..	@@ -6,13 +6,14 @@
6	6	obj-$(CONFIG_MMC_ARMMMCI) += armmmci.o
7	7	armmmci-y := mmci.o
8	8	armmmci-$(CONFIG_MMC_QCOM_DML) += mmci_qcom_dml.o
	9	+armmmci-$(CONFIG_MMC_STM32_SDMMC) += mmci_stm32_sdmmc.o
9	10	obj-$(CONFIG_MMC_PXA) += pxamci.o
10	11	obj-$(CONFIG_MMC_MXC) += mxcmmc.o
11	12	obj-$(CONFIG_MMC_MXS) += mxs-mmc.o
12	13	obj-$(CONFIG_MMC_SDHCI) += sdhci.o
13	14	obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o
14	15	sdhci-pci-y += sdhci-pci-core.o sdhci-pci-o2micro.o sdhci-pci-arasan.o \
15		- sdhci-pci-dwc-mshc.o
	16	+ sdhci-pci-dwc-mshc.o sdhci-pci-gli.o
16	17	obj-$(subst m,y,$(CONFIG_MMC_SDHCI_PCI)) += sdhci-pci-data.o
17	18	obj-$(CONFIG_MMC_SDHCI_ACPI) += sdhci-acpi.o
18	19	obj-$(CONFIG_MMC_SDHCI_PXAV3) += sdhci-pxav3.o
..	..	@@ -20,9 +21,12 @@
20	21	obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o
21	22	obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o
22	23	obj-$(CONFIG_MMC_SDHCI_F_SDH30) += sdhci_f_sdh30.o
	24	+obj-$(CONFIG_MMC_SDHCI_MILBEAUT) += sdhci-milbeaut.o
23	25	obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o
	26	+obj-$(CONFIG_MMC_SDHCI_AM654) += sdhci_am654.o
24	27	obj-$(CONFIG_MMC_WBSD) += wbsd.o
25	28	obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
	29	+obj-$(CONFIG_MMC_ALCOR) += alcor.o
26	30	obj-$(CONFIG_MMC_MTK) += mtk-sd.o
27	31	obj-$(CONFIG_MMC_OMAP) += omap.o
28	32	obj-$(CONFIG_MMC_OMAP_HS) += omap_hsmmc.o
..	..	@@ -42,6 +46,7 @@
42	46	obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_core.o
43	47	obj-$(CONFIG_MMC_SDHI_SYS_DMAC) += renesas_sdhi_sys_dmac.o
44	48	obj-$(CONFIG_MMC_SDHI_INTERNAL_DMAC) += renesas_sdhi_internal_dmac.o
	49	+obj-$(CONFIG_MMC_UNIPHIER) += uniphier-sd.o
45	50	obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
46	51	obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
47	52	octeon-mmc-objs := cavium.o cavium-octeon.o
..	..	@@ -56,7 +61,7 @@
56	61	obj-$(CONFIG_MMC_DW_K3) += dw_mmc-k3.o
57	62	obj-$(CONFIG_MMC_DW_PCI) += dw_mmc-pci.o
58	63	obj-$(CONFIG_MMC_DW_ROCKCHIP) += dw_mmc-rockchip.o
59		-obj-$(CONFIG_MMC_DW_ROCKCHIP) += rk_sdmmc_ops.o
	64	+obj-$(CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE) += rk_sdmmc_ops.o
60	65	obj-$(CONFIG_MMC_DW_ZX) += dw_mmc-zx.o
61	66	obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o
62	67	obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o
..	..	@@ -64,12 +69,15 @@
64	69	obj-$(CONFIG_MMC_USHC) += ushc.o
65	70	obj-$(CONFIG_MMC_WMT) += wmt-sdmmc.o
66	71	obj-$(CONFIG_MMC_MESON_GX) += meson-gx-mmc.o
	72	+meson-mx-sdhc-objs := meson-mx-sdhc-clkc.o meson-mx-sdhc-mmc.o
	73	+obj-$(CONFIG_MMC_MESON_MX_SDHC) += meson-mx-sdhc.o
67	74	obj-$(CONFIG_MMC_MESON_MX_SDIO) += meson-mx-sdio.o
68	75	obj-$(CONFIG_MMC_MOXART) += moxart-mmc.o
69	76	obj-$(CONFIG_MMC_SUNXI) += sunxi-mmc.o
70	77	obj-$(CONFIG_MMC_USDHI6ROL0) += usdhi6rol0.o
71	78	obj-$(CONFIG_MMC_TOSHIBA_PCI) += toshsd.o
72	79	obj-$(CONFIG_MMC_BCM2835) += bcm2835.o
	80	+obj-$(CONFIG_MMC_OWL) += owl-mmc.o
73	81
74	82	obj-$(CONFIG_MMC_REALTEK_PCI) += rtsx_pci_sdmmc.o
75	83	obj-$(CONFIG_MMC_REALTEK_USB) += rtsx_usb_sdmmc.o
..	..	@@ -77,14 +85,17 @@
77	85	obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o
78	86	obj-$(CONFIG_MMC_SDHCI_CADENCE) += sdhci-cadence.o
79	87	obj-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o
	88	+obj-$(CONFIG_MMC_SDHCI_ESDHC_MCF) += sdhci-esdhc-mcf.o
80	89	obj-$(CONFIG_MMC_SDHCI_ESDHC_IMX) += sdhci-esdhc-imx.o
81	90	obj-$(CONFIG_MMC_SDHCI_DOVE) += sdhci-dove.o
82	91	obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-tegra.o
83	92	obj-$(CONFIG_MMC_SDHCI_OF_ARASAN) += sdhci-of-arasan.o
	93	+obj-$(CONFIG_MMC_SDHCI_OF_ASPEED) += sdhci-of-aspeed.o
84	94	obj-$(CONFIG_MMC_SDHCI_OF_AT91) += sdhci-of-at91.o
85	95	obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o
86	96	obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o
87	97	obj-$(CONFIG_MMC_SDHCI_OF_DWCMSHC) += sdhci-of-dwcmshc.o
	98	+obj-$(CONFIG_MMC_SDHCI_OF_SPARX5) += sdhci-of-sparx5.o
88	99	obj-$(CONFIG_MMC_SDHCI_BCM_KONA) += sdhci-bcm-kona.o
89	100	obj-$(CONFIG_MMC_SDHCI_IPROC) += sdhci-iproc.o
90	101	obj-$(CONFIG_MMC_SDHCI_MSM) += sdhci-msm.o
..	..	@@ -92,7 +103,10 @@
92	103	obj-$(CONFIG_MMC_SDHCI_MICROCHIP_PIC32) += sdhci-pic32.o
93	104	obj-$(CONFIG_MMC_SDHCI_BRCMSTB) += sdhci-brcmstb.o
94	105	obj-$(CONFIG_MMC_SDHCI_OMAP) += sdhci-omap.o
	106	+obj-$(CONFIG_MMC_SDHCI_SPRD) += sdhci-sprd.o
95	107	obj-$(CONFIG_MMC_CQHCI) += cqhci.o
	108	+cqhci-y += cqhci-core.o
	109	+cqhci-$(CONFIG_MMC_CRYPTO) += cqhci-crypto.o
96	110	obj-$(CONFIG_MMC_HSQ) += mmc_hsq.o
97	111
98	112	ifeq ($(CONFIG_CB710_DEBUG),y)