m68k: defconfig: Update defconfigs for v5.4-rc1
diff mbox series

Message ID 20191001073539.4488-1-geert@linux-m68k.org
State Accepted
Commit 84ba838990fcbdf84f87d11ce97779ce28ade5c8
Headers show
Series
  • m68k: defconfig: Update defconfigs for v5.4-rc1
Related show

Commit Message

Geert Uytterhoeven Oct. 1, 2019, 7:35 a.m. UTC
Actual changes:
    -# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
    -CONFIG_CRYPTO_AEGIS128L=m
    -CONFIG_CRYPTO_AEGIS256=m
    -CONFIG_CRYPTO_MORUS1280=m
    -CONFIG_CRYPTO_MORUS640=m
    +CONFIG_DM_CLONE=m
    +CONFIG_EROFS_FS=m
    -# CONFIG_LCD_CLASS_DEVICE is not set

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Should support for ICY and LTC2990 be enabled in amiga_defconfig and/or
multi_defconfig?

    +CONFIG_I2C=m
    +CONFIG_I2C_CHARDEV=m
    +CONFIG_I2C_ICY=m

    +CONFIG_HWMON=m
    +CONFIG_SENSORS_LTC2990=m
---
 arch/m68k/configs/amiga_defconfig    | 8 ++------
 arch/m68k/configs/apollo_defconfig   | 8 ++------
 arch/m68k/configs/atari_defconfig    | 8 ++------
 arch/m68k/configs/bvme6000_defconfig | 8 ++------
 arch/m68k/configs/hp300_defconfig    | 8 ++------
 arch/m68k/configs/mac_defconfig      | 8 ++------
 arch/m68k/configs/multi_defconfig    | 8 ++------
 arch/m68k/configs/mvme147_defconfig  | 8 ++------
 arch/m68k/configs/mvme16x_defconfig  | 8 ++------
 arch/m68k/configs/q40_defconfig      | 8 ++------
 arch/m68k/configs/sun3_defconfig     | 8 ++------
 arch/m68k/configs/sun3x_defconfig    | 8 ++------
 12 files changed, 24 insertions(+), 72 deletions(-)

Comments

Max Staudt Oct. 1, 2019, 10:55 a.m. UTC | #1
On 10/01/2019 09:35 AM, Geert Uytterhoeven wrote:
> Should support for ICY and LTC2990 be enabled in amiga_defconfig and/or
> multi_defconfig?
> 
>     +CONFIG_I2C=m
>     +CONFIG_I2C_CHARDEV=m
>     +CONFIG_I2C_ICY=m
> 
>     +CONFIG_HWMON=m
>     +CONFIG_SENSORS_LTC2990=m

Sounds like a good idea to me.


Thanks Geert!
Max
Max Staudt Oct. 7, 2019, 2:11 p.m. UTC | #2
Hi Geert,

(CC linux-ide)

As for the Amiga defconfig, how about moving from IDE drivers to ATA?

The old IDE stack is slated for removal in less than 2 years, and people should probably move over to libata instead.

How about the following changes?
Is there any Amiga IDE controller left without a libata equivalent?

CONFIG_IDE=n
CONFIG_IDE_GD_ATAPI=n
CONFIG_BLK_DEV_IDECD=n
CONFIG_BLK_DEV_GAYLE=n
CONFIG_BLK_DEV_BUDDHA=n

CONFIG_ATA=y
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_PATA_GAYLE=y
CONFIG_PATA_BUDDHA=y


Thanks,
Max
Geert Uytterhoeven Nov. 4, 2019, 11:06 a.m. UTC | #3
Hi Max,

On Mon, Oct 7, 2019 at 4:12 PM Max Staudt <max@enpas.org> wrote:
> (CC linux-ide)
>
> As for the Amiga defconfig, how about moving from IDE drivers to ATA?
>
> The old IDE stack is slated for removal in less than 2 years, and people should probably move over to libata instead.
>
> How about the following changes?
> Is there any Amiga IDE controller left without a libata equivalent?
>
> CONFIG_IDE=n
> CONFIG_IDE_GD_ATAPI=n
> CONFIG_BLK_DEV_IDECD=n
> CONFIG_BLK_DEV_GAYLE=n
> CONFIG_BLK_DEV_BUDDHA=n
>
> CONFIG_ATA=y
> CONFIG_ATA_VERBOSE_ERROR=y
> CONFIG_PATA_GAYLE=y
> CONFIG_PATA_BUDDHA=y

Amiga is fine.

Mac and Q40 are not, apparently.

Gr{oetje,eeting}s,

                        Geert
Max Staudt Nov. 4, 2019, 9:15 p.m. UTC | #4
On 11/04/2019 12:06 PM, Geert Uytterhoeven wrote:
>> As for the Amiga defconfig, how about moving from IDE drivers to ATA?
>>
>> The old IDE stack is slated for removal in less than 2 years, and people should probably move over to libata instead.
>>
>> How about the following changes?
>> Is there any Amiga IDE controller left without a libata equivalent?
>>
>> CONFIG_IDE=n
>> CONFIG_IDE_GD_ATAPI=n
>> CONFIG_BLK_DEV_IDECD=n
>> CONFIG_BLK_DEV_GAYLE=n
>> CONFIG_BLK_DEV_BUDDHA=n
>>
>> CONFIG_ATA=y
>> CONFIG_ATA_VERBOSE_ERROR=y
>> CONFIG_PATA_GAYLE=y
>> CONFIG_PATA_BUDDHA=y
> 
> Amiga is fine.
> 
> Mac and Q40 are not, apparently.

Sigh. I guess we have to keep CONFIG_IDE then. Thank you for checking!

How about:

CONFIG_BLK_DEV_GAYLE=n
CONFIG_BLK_DEV_BUDDHA=n

CONFIG_ATA=y
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_PATA_GAYLE=y
CONFIG_PATA_BUDDHA=y

for the multi_defconfig, and the following *only* for amiga_defconfig (as it's useless without drivers on Amiga):

CONFIG_IDE=n
CONFIG_IDE_GD_ATAPI=n
CONFIG_BLK_DEV_IDECD=n


Max
Christoph Hellwig Nov. 5, 2019, 12:01 a.m. UTC | #5
On Mon, Nov 04, 2019 at 12:06:05PM +0100, Geert Uytterhoeven wrote:
> Amiga is fine.
> 
> Mac and Q40 are not, apparently.

Can any users of those legacy ide drivers please get in contact
with Bartlomiej Zolnierkiewicz to ensure we have a tested libata
driver quickly?
John Paul Adrian Glaubitz Nov. 5, 2019, 12:14 a.m. UTC | #6
On 11/4/19 12:06 PM, Geert Uytterhoeven wrote:
> Amiga is fine.
> 
> Mac and Q40 are not, apparently.

I have not been able to come by a Q40 or 68k-Mac with an
IDE controller, unfortunately.

If the Mac IDE controller is the same as on the PowerBook
3400c, I would be able to test a converted driver as I have
that PowerBook.

Adrian
Brad Boyer Nov. 5, 2019, 12:53 a.m. UTC | #7
On Tue, Nov 05, 2019 at 01:14:04AM +0100, John Paul Adrian Glaubitz wrote:
> On 11/4/19 12:06 PM, Geert Uytterhoeven wrote:
> > Amiga is fine.
> > 
> > Mac and Q40 are not, apparently.
> 
> I have not been able to come by a Q40 or 68k-Mac with an
> IDE controller, unfortunately.
> 
> If the Mac IDE controller is the same as on the PowerBook
> 3400c, I would be able to test a converted driver as I have
> that PowerBook.

I have a couple old macs with IDE. I have a PowerBook 190 and a
Performa (a 636? - it's buried away so I'm not 100% sure) both with
IDE drives. I'll try to find time to pull one of them out and see if
they still run. Can Linux run on a system with a 68LC040 these days?
I know there were issues with FPU emulation at various points. Both
of those would lack FPU due to using a 68LC040 chip.

The 3400c is PCI based and so probably isn't at all compatible. It
should be using the same driver as the other PCI models. There is
already a PATA_MACIO configuration option for that style. The 5300
is the one that's basically an upgraded 68k model (it's nearly
identical to the 190 internally).

	Brad Boyer
	flar@allandria.com
Finn Thain Nov. 5, 2019, 2:33 a.m. UTC | #8
Hi Brad,

On Mon, 4 Nov 2019, Brad Boyer wrote:

> 
> I have a couple old macs with IDE. I have a PowerBook 190 and a Performa 
> (a 636? - it's buried away so I'm not 100% sure) both with IDE drives. 
> I'll try to find time to pull one of them out and see if they still run. 
> Can Linux run on a system with a 68LC040 these days? I know there were 
> issues with FPU emulation at various points. Both of those would lack 
> FPU due to using a 68LC040 chip.
> 

All the PB 190 machines that I've come across have a late revision 68LC040 
CPU that is free of errata. Please see,
http://www.mac.linux-m68k.org/docs/faq.php#sec-4.5

The Performa 636 is highly likely to be affected, but you can run Linux 
from initramfs to avoid page faults in code sections. That would allow you 
to test the IDE driver.

Or you can just replace the CPU with a full 68040, since it is socketed. 

But watch out for leaking capacitors and batteries...

--
Brad Boyer Nov. 5, 2019, 3:19 a.m. UTC | #9
On Tue, Nov 05, 2019 at 01:33:00PM +1100, Finn Thain wrote:
> All the PB 190 machines that I've come across have a late revision 68LC040 
> CPU that is free of errata. Please see,
> http://www.mac.linux-m68k.org/docs/faq.php#sec-4.5
> 
> The Performa 636 is highly likely to be affected, but you can run Linux 
> from initramfs to avoid page faults in code sections. That would allow you 
> to test the IDE driver.
> 
> Or you can just replace the CPU with a full 68040, since it is socketed. 

I'll try the PB190 first anyway. It should be easier due to not needing
to setup a monitor. I'm not sure if I ever booted Linux on either of
them, since I acquired both about the time I started getting too busy
to spend time on such things. I just found the Performa, and it's actually
a Performa 630CD but I don't see any obvious difference based on the specs.

I just took a look at the macide driver, and it appears to do basically
nothing other than pass a list of addresses into the core ide code. It's
one of the smallest drivers I've ever seen.

> But watch out for leaking capacitors and batteries...

I should pull out every machine in my collection and look for those sorts
of issues. None of them have been checked in at least 5 or 6 years.

	Brad Boyer
	flar@allandria.com
Finn Thain Nov. 5, 2019, 4:13 a.m. UTC | #10
On Mon, 4 Nov 2019, Brad Boyer wrote:

> 
> I'll try the PB190 first anyway. It should be easier due to not needing 
> to setup a monitor. 

I think you can put the 630 into a standard VESA video mode (with MacOS or 
Linux) given the right adapter/cable. I have a pin-out somewhere.

> I'm not sure if I ever booted Linux on either of them, since I acquired 
> both about the time I started getting too busy to spend time on such 
> things. I just found the Performa, and it's actually a Performa 630CD 
> but I don't see any obvious difference based on the specs.
> 
> I just took a look at the macide driver, and it appears to do basically
> nothing other than pass a list of addresses into the core ide code. It's
> one of the smallest drivers I've ever seen.
> 

The fly in the ointment is interrupt handling. There is a theoretical bug. 
(Though it doesn't seem to hurt in practice.)

AFAIK the hardware is publicly undocumented and so we need to do 
experiments like this:
https://github.com/fthain/linux/commit/01405199e8d05500bf458df690027655f526a7fd

My suspicion is that macide_clear_irq() does nothing useful. It's not 
called on a Powerbook 190. Maybe it is needed on a PowerBook 150 and 
Performa 630, maybe not...

> > But watch out for leaking capacitors and batteries...
> 
> I should pull out every machine in my collection and look for those 
> sorts of issues. None of them have been checked in at least 5 or 6 
> years.
> 

None of the machines in my collection have any batteries now. Desoldering 
the Ni-Cd PRAM battery from a Powerbook 14x/16x/170/180 is difficult but 
necessary. Powerbook 150 and 190 are easier (no desoldering needed).
Brad Boyer Nov. 5, 2019, 8:36 p.m. UTC | #11
On Tue, Nov 05, 2019 at 03:13:31PM +1100, Finn Thain wrote:
> On Mon, 4 Nov 2019, Brad Boyer wrote:
> > I'll try the PB190 first anyway. It should be easier due to not needing 
> > to setup a monitor. 
> 
> I think you can put the 630 into a standard VESA video mode (with MacOS or 
> Linux) given the right adapter/cable. I have a pin-out somewhere.

I have an adapter. I also own several official Apple monitors of various
styles and capabilities. The problem is desk space. I need to clean before
I have enough room to setup anything bigger than a laptop.

> > I just took a look at the macide driver, and it appears to do basically
> > nothing other than pass a list of addresses into the core ide code. It's
> > one of the smallest drivers I've ever seen.
> > 
> 
> The fly in the ointment is interrupt handling. There is a theoretical bug. 
> (Though it doesn't seem to hurt in practice.)
> 
> AFAIK the hardware is publicly undocumented and so we need to do 
> experiments like this:
> https://github.com/fthain/linux/commit/01405199e8d05500bf458df690027655f526a7fd
> 
> My suspicion is that macide_clear_irq() does nothing useful. It's not 
> called on a Powerbook 190. Maybe it is needed on a PowerBook 150 and 
> Performa 630, maybe not...

My understanding has always been that Apple was really sloppy with how
the hardware handled interrupts. On many models, you can't actually
block interrupts in a sane fashion. Because of that, you usually have
to shut up the interrupts by talking to the actual device.

I would not be surprised in the slightest to see that register write
do absolutely nothing. It might be more interesting to just disable
the clear function for all models and see if it still works. I don't
have a PB 150 to test that style, but I do have the other two.

> > > But watch out for leaking capacitors and batteries...
> > 
> > I should pull out every machine in my collection and look for those 
> > sorts of issues. None of them have been checked in at least 5 or 6 
> > years.
> > 
> 
> None of the machines in my collection have any batteries now. Desoldering 
> the Ni-Cd PRAM battery from a Powerbook 14x/16x/170/180 is difficult but 
> necessary. Powerbook 150 and 190 are easier (no desoldering needed).

That makes sense. I need to do the same. It's just a pain since a few
models won't boot without a battery.

	Brad Boyer
	flar@allandria.com

Patch
diff mbox series

diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 9a33c1c006a1f9b8..6c9d4e47cf1745dd 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -355,6 +355,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -432,8 +433,6 @@  CONFIG_FB_AMIGA_OCS=y
 CONFIG_FB_AMIGA_ECS=y
 CONFIG_FB_AMIGA_AGA=y
 CONFIG_FB_FM2=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 CONFIG_SOUND=m
@@ -490,6 +489,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -560,10 +560,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 7fdbc797a05d4d65..caa0558abcdbdeb3 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -334,6 +334,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -393,8 +394,6 @@  CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PTP_1588_CLOCK=m
 # CONFIG_HWMON is not set
 CONFIG_FB=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -450,6 +449,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -520,10 +520,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 087dd8482c1131c8..83d8486524bda8cb 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -350,6 +350,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -417,8 +418,6 @@  CONFIG_PTP_1588_CLOCK=m
 # CONFIG_HWMON is not set
 CONFIG_FB=y
 CONFIG_FB_ATARI=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 CONFIG_SOUND=m
@@ -479,6 +478,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -549,10 +549,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 91154d6acb313c72..4ffc1e5646d5139d 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -332,6 +332,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -390,8 +391,6 @@  CONFIG_NTP_PPS=y
 CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PTP_1588_CLOCK=m
 # CONFIG_HWMON is not set
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_HID=m
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
@@ -443,6 +442,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -513,10 +513,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index c398c4a94d95c666..806da3d97ca4e939 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -333,6 +333,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -395,8 +396,6 @@  CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PTP_1588_CLOCK=m
 # CONFIG_HWMON is not set
 CONFIG_FB=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
@@ -452,6 +451,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -522,10 +522,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 350d004559be8431..250da20e291c83e0 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -342,6 +342,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -419,8 +420,6 @@  CONFIG_PTP_1588_CLOCK=m
 CONFIG_FB=y
 CONFIG_FB_VALKYRIE=y
 CONFIG_FB_MAC=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 CONFIG_HID=m
@@ -474,6 +473,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -544,10 +544,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index b838dd820348ede0..45654650f50a32fa 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -386,6 +386,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -495,8 +496,6 @@  CONFIG_FB_FM2=y
 CONFIG_FB_ATARI=y
 CONFIG_FB_VALKYRIE=y
 CONFIG_FB_MAC=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 CONFIG_SOUND=m
@@ -556,6 +555,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -626,10 +626,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 3f8dd61559cf06b4..7800d3a8d46e3e59 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -331,6 +331,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -389,8 +390,6 @@  CONFIG_NTP_PPS=y
 CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PTP_1588_CLOCK=m
 # CONFIG_HWMON is not set
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_HID=m
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
@@ -442,6 +441,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -512,10 +512,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index ae3b2d4f636c7562..c32dc2d2058d32bf 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -332,6 +332,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -390,8 +391,6 @@  CONFIG_NTP_PPS=y
 CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PTP_1588_CLOCK=m
 # CONFIG_HWMON is not set
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_HID=m
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
@@ -443,6 +442,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -513,10 +513,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index cd61ef14b582812f..bf0a65ce57e0606d 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -339,6 +339,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -404,8 +405,6 @@  CONFIG_PPS_CLIENT_PARPORT=m
 CONFIG_PTP_1588_CLOCK=m
 # CONFIG_HWMON is not set
 CONFIG_FB=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 CONFIG_SOUND=m
@@ -461,6 +460,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -531,10 +531,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 151f5371cd3d42e1..5f3cfa2926d22960 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -329,6 +329,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -390,8 +391,6 @@  CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PTP_1588_CLOCK=m
 # CONFIG_HWMON is not set
 CONFIG_FB=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 CONFIG_HID=m
@@ -445,6 +444,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -515,10 +515,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 1dcb0ee1fe989522..58354d2018d5151e 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -329,6 +329,7 @@  CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=m
@@ -389,8 +390,6 @@  CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PTP_1588_CLOCK=m
 # CONFIG_HWMON is not set
 CONFIG_FB=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 CONFIG_HID=m
@@ -444,6 +443,7 @@  CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
@@ -514,10 +514,6 @@  CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m