From 966b4ed590ed6d8b4b7885cc611ec8e5f34c17a5 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sun, 19 Sep 2021 23:09:14 -0400
Subject: [PATCH] config: drop CONFIG_IDE*
Drop references to config_ide, since the driver has been removed
from the 5.14 kernel:
commit b7fb14d3ac63117e0e8beabe75f4ea52051fbe3a
Author: Christoph Hellwig <hch@lst.de>
Date: Wed Jun 16 15:46:58 2021 +0200
ide: remove the legacy ide driver
The legay ide driver has been replace with libata starting in 2003 and has
been scheduled for removal for a while. Finally kill it off so that we
can start cleaning up various bits of cruft it forced on the block layer.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/common-pc/common-pc-drivers.cfg | 4 ----
bsp/mti-malta32/mti-malta32-common.cfg | 3 ---
bsp/mti-malta64/mti-malta64-common.cfg | 3 ---
bsp/qemu-ppc32/qemu-ppc32.cfg | 1 -
cfg/boot-live.cfg | 1 -
5 files changed, 12 deletions(-)
diff --git a/bsp/common-pc/common-pc-drivers.cfg b/bsp/common-pc/common-pc-drivers.cfg
index 617ab3f77..fafbc537a 100644
--- a/bsp/common-pc/common-pc-drivers.cfg
+++ b/bsp/common-pc/common-pc-drivers.cfg
@@ -51,13 +51,9 @@ CONFIG_USB_SERIAL_PL2303=y
CONFIG_I2C=y
CONFIG_I2C_I801=y
-CONFIG_IDE=y
-CONFIG_IDE_GD=y
-CONFIG_BLK_DEV_PIIX=y
CONFIG_SATA_AHCI=y
-CONFIG_BLK_DEV_IDECD=y
CONFIG_BLK_DEV_FD=m
CONFIG_EEPROM_AT24=m
diff --git a/bsp/mti-malta32/mti-malta32-common.cfg b/bsp/mti-malta32/mti-malta32-common.cfg
index ca712a1d0..268317d86 100644
--- a/bsp/mti-malta32/mti-malta32-common.cfg
+++ b/bsp/mti-malta32/mti-malta32-common.cfg
@@ -39,11 +39,8 @@ CONFIG_BLK_DEV_SD=m
CONFIG_BLK_DEV_SR=m
CONFIG_CHR_DEV_SG=m
-CONFIG_IDE=y
-CONFIG_IDE_GENERIC=y
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_PIIX=y
CONFIG_BLK_DEV_IDEDMA=y
CONFIG_PCNET32=y
diff --git a/bsp/mti-malta64/mti-malta64-common.cfg b/bsp/mti-malta64/mti-malta64-common.cfg
index ea9a335bf..9abdda753 100644
--- a/bsp/mti-malta64/mti-malta64-common.cfg
+++ b/bsp/mti-malta64/mti-malta64-common.cfg
@@ -42,11 +42,8 @@ CONFIG_BLK_DEV_SD=m
CONFIG_BLK_DEV_SR=m
CONFIG_CHR_DEV_SG=m
-CONFIG_IDE=y
-CONFIG_IDE_GENERIC=y
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_PIIX=y
CONFIG_BLK_DEV_IDEDMA=y
CONFIG_PCNET32=y
diff --git a/bsp/qemu-ppc32/qemu-ppc32.cfg b/bsp/qemu-ppc32/qemu-ppc32.cfg
index 7f6b55deb..05731b8f5 100644
--- a/bsp/qemu-ppc32/qemu-ppc32.cfg
+++ b/bsp/qemu-ppc32/qemu-ppc32.cfg
@@ -17,7 +17,6 @@ CONFIG_NE2K_PCI=y
CONFIG_MACE=y
CONFIG_BMAC=y
-CONFIG_IDE=y
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_BLK_DEV_IDE_PMAC=y
diff --git a/cfg/boot-live.cfg b/cfg/boot-live.cfg
index 03705e76f..e13d04b56 100644
--- a/cfg/boot-live.cfg
+++ b/cfg/boot-live.cfg
@@ -2,7 +2,6 @@
CONFIG_BLK_DEV_LOOP=y
CONFIG_RD_GZIP=y
# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_IDECD=y
CONFIG_ISO9660_FS=y
CONFIG_BLK_DEV_SR=y
CONFIG_ZISOFS=y
--
GitLab