diff mbox series

sh: remove CONFIG_IDE from most defconfig

Message ID 20200924043139.522028-1-hch@lst.de
State New
Headers show
Series sh: remove CONFIG_IDE from most defconfig | expand

Commit Message

Christoph Hellwig Sept. 24, 2020, 4:31 a.m. UTC
Remove CONFIG_IDE from defconfigs that did not actually select chipset
drivers, and switch ones that have libata drivers to libata.

Signed-off-by: Christoph Hellwig <hch@lst.de>
+++ b/arch/sh/configs/sh03_defconfig
---
 arch/sh/configs/landisk_defconfig  | 9 ++++-----
 arch/sh/configs/microdev_defconfig | 2 --
 arch/sh/configs/sdk7780_defconfig  | 6 ++----
 arch/sh/configs/sdk7786_defconfig  | 3 ---
 arch/sh/configs/se7750_defconfig   | 1 -
 arch/sh/configs/sh03_defconfig     | 3 ---
 6 files changed, 6 insertions(+), 18 deletions(-)

Comments

Geert Uytterhoeven Sept. 24, 2020, 7:33 a.m. UTC | #1
Hi Christoph,

On Thu, Sep 24, 2020 at 6:31 AM Christoph Hellwig <hch@lst.de> wrote:
> Remove CONFIG_IDE from defconfigs that did not actually select chipset
> drivers, and switch ones that have libata drivers to libata.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Thanks for your patch!

> --- a/arch/sh/configs/landisk_defconfig
> +++ b/arch/sh/configs/landisk_defconfig
> @@ -27,13 +27,12 @@ CONFIG_NETFILTER=y
>  CONFIG_ATALK=m
>  CONFIG_BLK_DEV_LOOP=y
>  CONFIG_BLK_DEV_RAM=y
> -CONFIG_IDE=y
> -CONFIG_BLK_DEV_IDECD=y
> -CONFIG_BLK_DEV_OFFBOARD=y
> -CONFIG_BLK_DEV_GENERIC=y
> -CONFIG_BLK_DEV_AEC62XX=y
> +CONFIG_ATA=y
> +CONFIG_ATA_GENERIC=y
> +CONFIG_PATA_ATP867X=y

Landisk should also have

    +CONFIG_PATA_PLATFORM=y

but as it didn't have CONFIG_BLK_DEV_PLATFORM=y before neither,
probably that should be a separate patch anyway?

Gr{oetje,eeting}s,

                        Geert
Sergei Shtylyov Sept. 25, 2020, 8:30 a.m. UTC | #2
Hello!

On 24.09.2020 7:31, Christoph Hellwig wrote:

> Remove CONFIG_IDE from defconfigs that did not actually select chipset
> drivers, and switch ones that have libata drivers to libata.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
[...]
> diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig
> index 61bec46ebd66a8..4a44cac640bc94 100644
> --- a/arch/sh/configs/sdk7786_defconfig
> +++ b/arch/sh/configs/sdk7786_defconfig
> @@ -116,9 +116,6 @@ CONFIG_MTD_UBI_GLUEBI=m
>   CONFIG_BLK_DEV_LOOP=y
>   CONFIG_BLK_DEV_CRYPTOLOOP=y
>   CONFIG_BLK_DEV_RAM=y
> -CONFIG_IDE=y
> -CONFIG_BLK_DEV_IDECD=y
> -CONFIG_BLK_DEV_PLATFORM=y

    How about CONFIG_PATA_PLATFORM=y here?

>   CONFIG_BLK_DEV_SD=y
>   CONFIG_BLK_DEV_SR=y
>   CONFIG_SCSI_MULTI_LUN=y
[...]

MBR, Sergei
Sergei Shtylyov Sept. 29, 2020, 8:21 a.m. UTC | #3
On 25.09.2020 11:30, Sergei Shtylyov wrote:

>> Remove CONFIG_IDE from defconfigs that did not actually select chipset
>> drivers, and switch ones that have libata drivers to libata.
>>
>> Signed-off-by: Christoph Hellwig <hch@lst.de>
> [...]
>> diff --git a/arch/sh/configs/sdk7786_defconfig 
>> b/arch/sh/configs/sdk7786_defconfig
>> index 61bec46ebd66a8..4a44cac640bc94 100644
>> --- a/arch/sh/configs/sdk7786_defconfig
>> +++ b/arch/sh/configs/sdk7786_defconfig
>> @@ -116,9 +116,6 @@ CONFIG_MTD_UBI_GLUEBI=m
>>   CONFIG_BLK_DEV_LOOP=y
>>   CONFIG_BLK_DEV_CRYPTOLOOP=y
>>   CONFIG_BLK_DEV_RAM=y
>> -CONFIG_IDE=y
>> -CONFIG_BLK_DEV_IDECD=y
>> -CONFIG_BLK_DEV_PLATFORM=y
> 
>     How about CONFIG_PATA_PLATFORM=y here?

    Ah, it enables both IDE and PATA drivers! Sorry for the noise then. :-)

>>   CONFIG_BLK_DEV_SD=y
>>   CONFIG_BLK_DEV_SR=y
>>   CONFIG_SCSI_MULTI_LUN=y
> [...]

MBR, Sergei
diff mbox series

Patch

diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig
index f0073ed3994771..48b457d59e790a 100644
--- a/arch/sh/configs/sh03_defconfig
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig
index ba6ec042606f5d..e6c5ddf070c008 100644
--- a/arch/sh/configs/landisk_defconfig
+++ b/arch/sh/configs/landisk_defconfig
@@ -27,13 +27,12 @@  CONFIG_NETFILTER=y
 CONFIG_ATALK=m
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_OFFBOARD=y
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_BLK_DEV_AEC62XX=y
+CONFIG_ATA=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_ATP867X=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
diff --git a/arch/sh/configs/microdev_defconfig b/arch/sh/configs/microdev_defconfig
index c65667d00313ba..e9825196dd66af 100644
--- a/arch/sh/configs/microdev_defconfig
+++ b/arch/sh/configs/microdev_defconfig
@@ -20,8 +20,6 @@  CONFIG_IP_PNP=y
 # CONFIG_IPV6 is not set
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_RAM=y
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECD=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_SMC91X=y
diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig
index d10a0414123a51..d00376eb044f8a 100644
--- a/arch/sh/configs/sdk7780_defconfig
+++ b/arch/sh/configs/sdk7780_defconfig
@@ -44,16 +44,14 @@  CONFIG_NET_SCHED=y
 CONFIG_PARPORT=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_PLATFORM=y
-CONFIG_BLK_DEV_GENERIC=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_FC_ATTRS=y
 CONFIG_ATA=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_PLATFORM=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_NETDEVICES=y
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig
index 61bec46ebd66a8..4a44cac640bc94 100644
--- a/arch/sh/configs/sdk7786_defconfig
+++ b/arch/sh/configs/sdk7786_defconfig
@@ -116,9 +116,6 @@  CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_CRYPTOLOOP=y
 CONFIG_BLK_DEV_RAM=y
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_PLATFORM=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_SCSI_MULTI_LUN=y
diff --git a/arch/sh/configs/se7750_defconfig b/arch/sh/configs/se7750_defconfig
index 3f1c13799d799c..4defc7628a498a 100644
--- a/arch/sh/configs/se7750_defconfig
+++ b/arch/sh/configs/se7750_defconfig
@@ -29,7 +29,6 @@  CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_ROM=y
-CONFIG_IDE=y
 CONFIG_SCSI=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig
index f0073ed3994771..48b457d59e790a 100644
--- a/arch/sh/configs/sh03_defconfig
+++ b/arch/sh/configs/sh03_defconfig
@@ -39,9 +39,6 @@  CONFIG_IP_PNP_RARP=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_NBD=y
 CONFIG_BLK_DEV_RAM=y
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_SCSI=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_BLK_DEV_SR=m