From: George Hilliard <thirtythreeforty@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: George Hilliard <thirtythreeforty@gmail.com>,
linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
NeilBrown <neil@brown.name>,
sergio.paracuellos@gmail.com
Subject: [PATCH v5] staging: Mediatek: Use individual config flags in Makefile
Date: Tue, 15 Jan 2019 23:48:43 -0700 [thread overview]
Message-ID: <20190116064842.5911-1-thirtythreeforty@gmail.com> (raw)
In-Reply-To: <20190115174346.GA11832@kroah.com>
These drivers can be useful on other MT76xx SoCs, which have compatible
peripherals. The drivers were selectable in Kconfig, but they were
quietly excluded from the build because the SOC_MT7621 chip was not
selected. So, make the Makefiles use the same flags as Kconfig for
these drivers.
mt7621-dma and mt7621-dts are left alone because they truly do require
that SoC.
I have personally confirmed that the mt7621-spi driver works on the
MT7688, which was what prompted this change.
Cc: linux-kernel@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Cc: NeilBrown <neil@brown.name>
Cc: sergio.paracuellos@gmail.com
Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
---
Changelog:
v2:
- Also make the change for skipped/forgotten drivers such as mt7621-eth
v3..v4:
- Rebase against staging-testing
- Also make the change for new PCIe PHY driver
- Slightly change commit wording
v5:
- Fix dependency issue in mt7621-mmc/Kconfig; it now needs to
explicitly depend on RALINK because SOC_MT7621 is not required now
- Remove check for nonexistent config MTD_NAND_RALINK from
mt7621-mmc/Kconfig
drivers/staging/Makefile | 14 +++++++-------
drivers/staging/mt7621-mmc/Kconfig | 2 +-
drivers/staging/mt7621-pci-phy/Makefile | 2 +-
drivers/staging/mt7621-pci/Makefile | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 4d563ed0bc79..cc5530cc996b 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -41,14 +41,14 @@ obj-$(CONFIG_GREYBUS) += greybus/
obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
obj-$(CONFIG_DRM_VBOXVIDEO) += vboxvideo/
obj-$(CONFIG_PI433) += pi433/
-obj-$(CONFIG_SOC_MT7621) += mt7621-pci/
-obj-$(CONFIG_SOC_MT7621) += mt7621-pci-phy/
-obj-$(CONFIG_SOC_MT7621) += mt7621-pinctrl/
-obj-$(CONFIG_SOC_MT7621) += mt7621-spi/
+obj-$(CONFIG_PCI_MT7621) += mt7621-pci/
+obj-$(CONFIG_PCI_MT7621_PHY) += mt7621-pci-phy/
+obj-$(CONFIG_PINCTRL_RT2880) += mt7621-pinctrl/
+obj-$(CONFIG_SPI_MT7621) += mt7621-spi/
obj-$(CONFIG_SOC_MT7621) += mt7621-dma/
-obj-$(CONFIG_SOC_MT7621) += ralink-gdma/
-obj-$(CONFIG_SOC_MT7621) += mt7621-mmc/
-obj-$(CONFIG_SOC_MT7621) += mt7621-eth/
+obj-$(CONFIG_DMA_RALINK) += ralink-gdma/
+obj-$(CONFIG_MTK_MMC) += mt7621-mmc/
+obj-$(CONFIG_NET_MEDIATEK_SOC_STAGING) += mt7621-eth/
obj-$(CONFIG_SOC_MT7621) += mt7621-dts/
obj-$(CONFIG_STAGING_GASKET_FRAMEWORK) += gasket/
obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/
diff --git a/drivers/staging/mt7621-mmc/Kconfig b/drivers/staging/mt7621-mmc/Kconfig
index c6dfe8c637dc..1eb79cd6e22f 100644
--- a/drivers/staging/mt7621-mmc/Kconfig
+++ b/drivers/staging/mt7621-mmc/Kconfig
@@ -1,6 +1,6 @@
config MTK_MMC
tristate "MTK SD/MMC"
- depends on !MTD_NAND_RALINK && MMC
+ depends on RALINK && MMC
config MTK_AEE_KDUMP
bool "MTK AEE KDUMP"
diff --git a/drivers/staging/mt7621-pci-phy/Makefile b/drivers/staging/mt7621-pci-phy/Makefile
index 2b82ccfc28c6..a970056f05c1 100644
--- a/drivers/staging/mt7621-pci-phy/Makefile
+++ b/drivers/staging/mt7621-pci-phy/Makefile
@@ -1 +1 @@
-obj-$(CONFIG_SOC_MT7621) += pci-mt7621-phy.o
+obj-$(CONFIG_PCI_MT7621_PHY) += pci-mt7621-phy.o
diff --git a/drivers/staging/mt7621-pci/Makefile b/drivers/staging/mt7621-pci/Makefile
index 607b84bedcc3..d4655a726b61 100644
--- a/drivers/staging/mt7621-pci/Makefile
+++ b/drivers/staging/mt7621-pci/Makefile
@@ -1 +1 @@
-obj-$(CONFIG_SOC_MT7621) += pci-mt7621.o
+obj-$(CONFIG_PCI_MT7621) += pci-mt7621.o
--
2.20.1
next prev parent reply other threads:[~2019-01-16 6:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CACmrr9gHucWaWtz07kQms6AsquLKAHbK+_Q0kF=92RGo6HmAFA@mail.gmail.com>
2019-01-11 0:43 ` [PATCH v2 1/2] Move ralink-gdma to its own directory thirtythreeforty
2019-01-11 0:43 ` [PATCH v2 2/2] Mediatek staging: Use individual config flags in Makefile thirtythreeforty
2019-01-15 15:30 ` [PATCH v2 2/2] staging: Mediatek: " Greg Kroah-Hartman
2019-01-15 17:02 ` [PATCH v3] " George Hilliard
2019-01-15 17:20 ` Greg Kroah-Hartman
2019-01-15 17:29 ` [PATCH v4] " George Hilliard
2019-01-15 17:43 ` Greg Kroah-Hartman
2019-01-16 6:48 ` George Hilliard [this message]
2019-01-16 4:43 ` kbuild test robot
2019-01-15 17:32 ` [PATCH v3] " George Hilliard
2019-01-11 1:21 ` [PATCH v2 1/2] Move ralink-gdma to its own directory NeilBrown
2019-01-11 2:13 ` George Hilliard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190116064842.5911-1-thirtythreeforty@gmail.com \
--to=thirtythreeforty@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neil@brown.name \
--cc=sergio.paracuellos@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).