Skip to contentSkip to conversation

sh: remove CONFIG_IDE from most defconfig

PATCH In review Christoph Hellwig 4 participants 5 messages Sep 24, 2020 – Jan 18, 2021 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sh: remove CONFIG_IDE from most defconfig

Remove CONFIG_IDE from defconfigs that did not actually select chipset drivers, and switch ones that have libata drivers to libata.

arch/sh/configs/sh03_defconfig +0 -0
index f0073ed3994771..48b457d59e790a 100644
---
 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(-)
arch/sh/configs/landisk_defconfig +4 -5
index ba6ec042606f5d..e6c5ddf070c008 100644
@@ -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
arch/sh/configs/microdev_defconfig +0 -2
index c65667d00313ba..e9825196dd66af 100644
@@ -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
arch/sh/configs/sdk7780_defconfig +2 -4
index d10a0414123a51..d00376eb044f8a 100644
@@ -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
arch/sh/configs/sdk7786_defconfig +0 -3
index 61bec46ebd66a8..4a44cac640bc94 100644
@@ -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
arch/sh/configs/se7750_defconfig +0 -1
index 3f1c13799d799c..4defc7628a498a 100644
@@ -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
arch/sh/configs/sh03_defconfig +0 -3
index f0073ed3994771..48b457d59e790a 100644
@@ -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
Signature · 1 line
2.28.0
#1 lore raw

Hi Christoph,

Quoted 4 lines · Christoph Hellwig

Remove CONFIG_IDE from defconfigs that did not actually select chipset drivers, and switch ones that have libata drivers to libata.

Thanks for your patch!

Quoted 4 lines
arch/sh/configs/landisk_defconfig +0 -0
@@ -27,13 +27,12 @@ CONFIG_NETFILTER=y
 CONFIG_ATALK=m

arch/sh/configs/landisk_defconfig CONFIG_NETFILTER=y · line 32

Quoted 10 lines
arch/sh/configs/landisk_defconfig +3 -5
 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

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
#2 lore raw
In reply to Christoph Hellwig

Hello!

Quoted 4 lines · Christoph Hellwig

Remove CONFIG_IDE from defconfigs that did not actually select chipset drivers, and switch ones that have libata drivers to libata.

[...]

arch/sh/configs/sdk7786_defconfig CONFIG_MTD_UBI_GLUEBI=m · line 121

Quoted 11 lines
arch/sh/configs/sdk7786_defconfig +0 -3
index 61bec46ebd66a8..4a44cac640bc94 100644
@@ -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?

arch/sh/configs/sdk7786_defconfig CONFIG_MTD_UBI_GLUEBI=m · line 121

Quoted 3 lines
arch/sh/configs/sdk7786_defconfig +0 -0
  CONFIG_BLK_DEV_SD=y
  CONFIG_BLK_DEV_SR=y
  CONFIG_SCSI_MULTI_LUN=y

[...]

MBR, Sergei

#3 lore raw
In reply to Christoph Hellwig
Quoted 5 lines · Sergei Shtylyov
Quoted 4 lines

Remove CONFIG_IDE from defconfigs that did not actually select chipset drivers, and switch ones that have libata drivers to libata.

[...]

Quoted 14 lines

arch/sh/configs/sdk7786_defconfig

Quoted 12 lines
arch/sh/configs/sdk7786_defconfig +0 -0
index 61bec46ebd66a8..4a44cac640bc94 100644
@@ -116,9 +116,6 @@ CONFIG_MTD_UBI_GLUEBI=m

  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_CRYPTOLOOP=y
  CONFIG_BLK_DEV_RAM=y

arch/sh/configs/sdk7786_defconfig +0 -3
-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. :-)

Quoted 4 lines
Quoted 3 lines

  CONFIG_BLK_DEV_SD=y
  CONFIG_BLK_DEV_SR=y
  CONFIG_SCSI_MULTI_LUN=y

[...]

MBR, Sergei

#4 lore raw
In reply to Christoph Hellwig

Hello!

Quoted 106 lines · Christoph Hellwig

Remove CONFIG_IDE from defconfigs that did not actually select chipset drivers, and switch ones that have libata drivers to libata.

arch/sh/configs/sh03_defconfig +0 -1
index f0073ed3994771..48b457d59e790a 100644
---
 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(-)
arch/sh/configs/landisk_defconfig +4 -5
index ba6ec042606f5d..e6c5ddf070c008 100644
@@ -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
arch/sh/configs/microdev_defconfig +0 -2
index c65667d00313ba..e9825196dd66af 100644
@@ -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
arch/sh/configs/sdk7780_defconfig +2 -4
index d10a0414123a51..d00376eb044f8a 100644
@@ -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
arch/sh/configs/sdk7786_defconfig +0 -3
index 61bec46ebd66a8..4a44cac640bc94 100644
@@ -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
arch/sh/configs/se7750_defconfig +0 -1
index 3f1c13799d799c..4defc7628a498a 100644
@@ -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
arch/sh/configs/sh03_defconfig +0 -0
index f0073ed3994771..48b457d59e790a 100644

arch/sh/configs/sh03_defconfig CONFIG_IP_PNP_RARP=y · line 44

Quoted 9 lines
arch/sh/configs/sh03_defconfig +0 -3
@@ -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

Seems this has fallen off the table. What about the change that Geert suggested with regards the LANDISK board?

Adrian

Signature · 4 lines
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - [email protected]
`. `'   Freie Universitaet Berlin - [email protected]
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913