diff --git a/config/boards/bananapicm4io.conf b/config/boards/bananapicm4io.conf index 6d935d4812..5b6f8c304d 100644 --- a/config/boards/bananapicm4io.conf +++ b/config/boards/bananapicm4io.conf @@ -4,6 +4,7 @@ BOARDFAMILY="meson-g12b" BOARD_MAINTAINER="pyavitz" BOOTCONFIG="bananapi-cm4-cm4io_defconfig" KERNEL_TARGET="current,edge" +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="yes" SERIALCON="ttyAML0" BOOT_LOGO="desktop" diff --git a/config/boards/bananapim2pro.conf b/config/boards/bananapim2pro.conf index 33c57a89ae..eed7f13c9a 100644 --- a/config/boards/bananapim2pro.conf +++ b/config/boards/bananapim2pro.conf @@ -5,6 +5,7 @@ BOARD_MAINTAINER="bretmlw" BOOTCONFIG="bananapi-m2-pro_defconfig" BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m2-pro.dtb" KERNEL_TARGET="current,edge" +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="yes" SERIALCON="ttyAML0" BOOT_LOGO="desktop" diff --git a/config/boards/bananapim2s.conf b/config/boards/bananapim2s.conf index f518d5babd..0440e1c74e 100644 --- a/config/boards/bananapim2s.conf +++ b/config/boards/bananapim2s.conf @@ -4,6 +4,7 @@ BOARDFAMILY="meson-g12b" BOARD_MAINTAINER="pyavitz jeanrhum" BOOTCONFIG="bananapi-m2s_defconfig" KERNEL_TARGET="current,edge" +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="yes" SERIALCON="ttyAML0" BOOT_LOGO="desktop" diff --git a/config/boards/bananapim5.conf b/config/boards/bananapim5.conf index 8a5a4ac151..e2dc91a99f 100644 --- a/config/boards/bananapim5.conf +++ b/config/boards/bananapim5.conf @@ -5,6 +5,7 @@ BOARD_MAINTAINER="bretmlw" BOOTCONFIG="bananapi-m5_defconfig" BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m5.dtb" KERNEL_TARGET="current,edge" +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="yes" SERIALCON="ttyAML0" BOOT_LOGO="desktop" diff --git a/config/boards/khadas-vim3l.conf b/config/boards/khadas-vim3l.conf index 9837827a68..55f3902423 100644 --- a/config/boards/khadas-vim3l.conf +++ b/config/boards/khadas-vim3l.conf @@ -4,6 +4,7 @@ BOARDFAMILY="meson-sm1" BOARD_MAINTAINER="rpardini" BOOTCONFIG="khadas-vim3l_defconfig" KERNEL_TARGET="current,edge" +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="yes" SERIALCON="ttyAML0" BOOT_LOGO="desktop" diff --git a/config/boards/odroidc4.csc b/config/boards/odroidc4.csc index 5d045bf42a..3e51cb3a0a 100644 --- a/config/boards/odroidc4.csc +++ b/config/boards/odroidc4.csc @@ -4,6 +4,7 @@ BOARDFAMILY="meson-sm1" BOARD_MAINTAINER="" BOOTCONFIG="odroid-c4_defconfig" KERNEL_TARGET="current,edge" +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="yes" SERIALCON="ttyAML0" BOOT_LOGO="desktop" diff --git a/config/boards/odroidhc4.csc b/config/boards/odroidhc4.csc index a8a08e39a1..a0df6d3ec7 100644 --- a/config/boards/odroidhc4.csc +++ b/config/boards/odroidhc4.csc @@ -4,6 +4,7 @@ BOARDFAMILY="meson-sm1" BOARD_MAINTAINER="" BOOTCONFIG="odroid-c4_defconfig" # But also 'odroid-hc4_defconfig', see below at UBOOT_TARGET_MAP KERNEL_TARGET="current,edge" +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="no" SERIALCON="ttyAML0" BOOT_FDT_FILE="amlogic/meson-sm1-odroid-hc4.dtb" diff --git a/config/boards/odroidn2.csc b/config/boards/odroidn2.csc index c7733f3026..122aebe9a6 100644 --- a/config/boards/odroidn2.csc +++ b/config/boards/odroidn2.csc @@ -3,6 +3,7 @@ BOARD_NAME="Odroid N2" BOARDFAMILY="meson-g12b" BOARD_MAINTAINER="NicoD-SBC" KERNEL_TARGET="current,edge" +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="yes" FORCE_BOOTSCRIPT_UPDATE="yes" BOOT_LOGO="desktop" diff --git a/config/boards/odroidn2l.csc b/config/boards/odroidn2l.csc index 8ca18bab35..5cc9546ba0 100644 --- a/config/boards/odroidn2l.csc +++ b/config/boards/odroidn2l.csc @@ -3,6 +3,7 @@ BOARD_NAME="Odroid N2L" BOARDFAMILY="meson-g12b" BOARD_MAINTAINER="" KERNEL_TARGET="edge" # @TODO: DTB for N2L is only in 6.3+; add current when we bump it to 6.3 or newer. +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOTCONFIG="odroid-n2l_defconfig" diff --git a/config/boards/radxa-zero.conf b/config/boards/radxa-zero.conf index 500a37e699..0ff506037b 100644 --- a/config/boards/radxa-zero.conf +++ b/config/boards/radxa-zero.conf @@ -6,6 +6,7 @@ BOOTCONFIG="radxa-zero_config" CPUMIN=6660000 CPUMAX=1800000 KERNEL_TARGET="current,edge" +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="yes" FORCE_BOOTSCRIPT_UPDATE="yes" BOOT_LOGO="desktop" diff --git a/config/boards/radxa-zero2.wip b/config/boards/radxa-zero2.wip index b2d5555448..06ab35bb68 100644 --- a/config/boards/radxa-zero2.wip +++ b/config/boards/radxa-zero2.wip @@ -4,6 +4,7 @@ BOARDFAMILY="meson-g12b" BOARD_MAINTAINER="monkaBlyat" BOOTCONFIG="radxa-zero2_config" KERNEL_TARGET="current,edge" +MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost FULL_DESKTOP="yes" BOOT_LOGO="desktop" ASOUND_STATE="asound.state.radxa-zero2"