diff options
| author | Sungbo Eo <mans0n@gorani.run> | 2021-06-20 22:51:50 +0900 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-03 01:13:12 +0200 |
| commit | dbfebd14f6155801cec8e88806d70472efdbb56e (patch) | |
| tree | 6b19d8c7bdcaa2c7379090e499ed2932cf460930 | |
| parent | 2d977eb3d53a9fb442bc8847f41b88c5c4128c8a (diff) | |
| download | upstream-dbfebd14f6155801cec8e88806d70472efdbb56e.tar.gz upstream-dbfebd14f6155801cec8e88806d70472efdbb56e.tar.bz2 upstream-dbfebd14f6155801cec8e88806d70472efdbb56e.zip | |
kirkwood: solidify SATA_PMP config
SATA_PMP option is no longer exposed when no SATA host driver is enabled
since upstream linux commit bd322af15ce9 ("ata: make SATA_PMP option
selectable only if any SATA host driver is enabled").
Commit 1bb3f593ee73 ("kirkwood: update config for kernel 5.10") manually
added CONFIG_SATA_PMP=y to config file, but the config will disappear for
every kernel_oldconfig refresh.
To prevent this, a small hack is added, which selects SATA_HOST
automatically when SATA_PMP is enabled. This patch can be dropped if
SATA_MV is ever re-added into kernel config file.
Tested-by: Pawel Dembicki <paweldembicki@gmail.com>
Signed-off-by: Sungbo Eo <mans0n@gorani.run>
[Move patch to generic/hack-5.10]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | target/linux/generic/hack-5.10/252-SATA_PMP.patch | 23 | ||||
| -rw-r--r-- | target/linux/kirkwood/config-5.10 | 1 |
2 files changed, 24 insertions, 0 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 new file mode 100644 index 0000000000..6502d1d6ed --- /dev/null +++ b/target/linux/generic/hack-5.10/252-SATA_PMP.patch @@ -0,0 +1,23 @@ +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/config-5.10 b/target/linux/kirkwood/config-5.10 index 238a33c138..28a23506e8 100644 --- a/target/linux/kirkwood/config-5.10 +++ b/target/linux/kirkwood/config-5.10 @@ -234,6 +234,7 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_MV=y CONFIG_RTC_I2C_AND_SPI=y CONFIG_RTC_MC146818_LIB=y +CONFIG_SATA_HOST=y CONFIG_SATA_PMP=y CONFIG_SCSI=y CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y |