From: Tony Ambardar Date: Thu, 6 Aug 2020 13:46:11 +0000 (-0700) Subject: malta: disable unnecessary built-in CDROM support X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=da4651833ce6a4aad0ce0664b48c10f22197fb48;p=openwrt%2Fstaging%2Fnbd.git malta: disable unnecessary built-in CDROM support The CDROM is not needed for booting and can be included by selecting the loadable module as a package instead. This also avoids triggering a memory allocation failure during probing of the CDROM due to lack of low 16MB DMA memory, as decribed in FS#3278: https://bugs.openwrt.org/index.php?do=details&task_id=3278 Signed-off-by: Tony Ambardar Link: https://github.com/openwrt/openwrt/pull/3289 Signed-off-by: Yousong Zhou --- diff --git a/target/linux/malta/config-4.19 b/target/linux/malta/config-4.19 index f66036e27b..fdf5f0ee89 100644 --- a/target/linux/malta/config-4.19 +++ b/target/linux/malta/config-4.19 @@ -26,15 +26,12 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=y -# CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_BLK_MQ_PCI=y CONFIG_BLK_SCSI_REQUEST=y CONFIG_BOARD_SCACHE=y CONFIG_BOOT_ELF32=y CONFIG_BOUNCE=y CONFIG_BUILTIN_DTB=y -CONFIG_CDROM=y CONFIG_CEVT_R4K=y CONFIG_CLKBLD_I8253=y CONFIG_CLKDEV_LOOKUP=y diff --git a/target/linux/malta/config-5.4 b/target/linux/malta/config-5.4 index 10ad795480..56336875b6 100644 --- a/target/linux/malta/config-5.4 +++ b/target/linux/malta/config-5.4 @@ -33,15 +33,12 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=y -# CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_BLK_MQ_PCI=y CONFIG_BLK_SCSI_REQUEST=y CONFIG_BOARD_SCACHE=y CONFIG_BOOT_ELF32=y CONFIG_BOUNCE=y CONFIG_BUILTIN_DTB=y -CONFIG_CDROM=y CONFIG_CEVT_R4K=y # CONFIG_CGROUPS is not set CONFIG_CLKBLD_I8253=y