aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2022-09-30 11:42:06 +0200
committerFelix Fietkau <nbd@nbd.name>2022-09-30 12:59:19 +0200
commit2e375e9b3148cfdb9b19494a25eebc2fa7b256a3 (patch)
treee5ea72ab63c875031cd666298a656e1b99c6e64e /target
parent4363faef8a8c975410f001858b010170942aacfc (diff)
downloadupstream-2e375e9b3148cfdb9b19494a25eebc2fa7b256a3.tar.gz
upstream-2e375e9b3148cfdb9b19494a25eebc2fa7b256a3.tar.bz2
upstream-2e375e9b3148cfdb9b19494a25eebc2fa7b256a3.zip
kernel: remove hack patch, move kirkwood specific kmods to target modules.mk
Tweaking the KCONFIG line of kmod-ata-marvell-sata makes the hack patch unnecessary Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/hack-5.10/252-SATA_PMP.patch23
-rw-r--r--target/linux/generic/hack-5.15/252-SATA_PMP.patch23
-rw-r--r--target/linux/kirkwood/modules.mk30
3 files changed, 30 insertions, 46 deletions
diff --git a/target/linux/generic/hack-5.10/252-SATA_PMP.patch b/target/linux/generic/hack-5.10/252-SATA_PMP.patch
deleted file mode 100644
index 6502d1d6ed..0000000000
--- a/target/linux/generic/hack-5.10/252-SATA_PMP.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8c817e33be829c7249c2cfd59ff48ad5fac6a31d Mon Sep 17 00:00:00 2001
-From: Sungbo Eo <mans0n@gorani.run>
-Date: Fri, 7 Jul 2017 17:09:21 +0200
-Subject: [PATCH] kconfig: solidify SATA_PMP config
-
-SATA_PMP option in kernel config file disappears for every kernel_oldconfig refresh.
-To prevent this, SATA_HOST is now selected automatically when SATA_PMP is enabled.
-This patch can be dropped if SATA_MV is ever re-added into the config.
----
- drivers/ata/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/ata/Kconfig
-+++ b/drivers/ata/Kconfig
-@@ -112,7 +112,7 @@ config SATA_ZPODD
-
- config SATA_PMP
- bool "SATA Port Multiplier support"
-- depends on SATA_HOST
-+ select SATA_HOST
- default y
- help
- This option adds support for SATA Port Multipliers
diff --git a/target/linux/generic/hack-5.15/252-SATA_PMP.patch b/target/linux/generic/hack-5.15/252-SATA_PMP.patch
deleted file mode 100644
index 6502d1d6ed..0000000000
--- a/target/linux/generic/hack-5.15/252-SATA_PMP.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8c817e33be829c7249c2cfd59ff48ad5fac6a31d Mon Sep 17 00:00:00 2001
-From: Sungbo Eo <mans0n@gorani.run>
-Date: Fri, 7 Jul 2017 17:09:21 +0200
-Subject: [PATCH] kconfig: solidify SATA_PMP config
-
-SATA_PMP option in kernel config file disappears for every kernel_oldconfig refresh.
-To prevent this, SATA_HOST is now selected automatically when SATA_PMP is enabled.
-This patch can be dropped if SATA_MV is ever re-added into the config.
----
- drivers/ata/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/ata/Kconfig
-+++ b/drivers/ata/Kconfig
-@@ -112,7 +112,7 @@ config SATA_ZPODD
-
- config SATA_PMP
- bool "SATA Port Multiplier support"
-- depends on SATA_HOST
-+ select SATA_HOST
- default y
- help
- This option adds support for SATA Port Multipliers
diff --git a/target/linux/kirkwood/modules.mk b/target/linux/kirkwood/modules.mk
new file mode 100644
index 0000000000..1543098cd4
--- /dev/null
+++ b/target/linux/kirkwood/modules.mk
@@ -0,0 +1,30 @@
+define KernelPackage/ata-marvell-sata
+ TITLE:=Marvell Serial ATA support
+ DEPENDS:=@TARGET_kirkwood
+ KCONFIG:=CONFIG_SATA_MV CONFIG_SATA_PMP=y
+ FILES:=$(LINUX_DIR)/drivers/ata/sata_mv.ko
+ AUTOLOAD:=$(call AutoLoad,41,sata_mv,1)
+ $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-marvell-sata/description
+ SATA support for marvell chipsets
+endef
+
+$(eval $(call KernelPackage,ata-marvell-sata))
+
+define KernelPackage/mvsdio
+ SUBMENU:=$(OTHER_MENU)
+ TITLE:=Marvell MMC/SD/SDIO host driver
+ DEPENDS:=+kmod-mmc @TARGET_kirkwood
+ KCONFIG:= CONFIG_MMC_MVSDIO
+ FILES:= \
+ $(LINUX_DIR)/drivers/mmc/host/mvsdio.ko
+ AUTOLOAD:=$(call AutoProbe,mvsdio,1)
+endef
+
+define KernelPackage/mvsdio/description
+ Kernel support for the Marvell SDIO host driver.
+endef
+
+$(eval $(call KernelPackage,mvsdio))