From 5224c5b168fc97100cbe7ece2ee39f96cf259036 Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Tue, 13 Aug 2024 10:59:45 +0300 Subject: [PATCH] JetHome: Put module blacklist in the board configs of the respective boards --- config/boards/jethubj100.conf | 2 ++ config/boards/jethubj80.conf | 2 ++ config/sources/families/jethub.conf | 13 ------------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/config/boards/jethubj100.conf b/config/boards/jethubj100.conf index 559be2b85fc3..8aeb37ef8583 100644 --- a/config/boards/jethubj100.conf +++ b/config/boards/jethubj100.conf @@ -6,3 +6,5 @@ BOOTCONFIG="jethub_j100_defconfig" KERNEL_TARGET="current,edge" PACKAGE_LIST_BOARD="libubootenv-tool apparmor rfkill bluetooth bluez bluez-tools python3-pip watchdog python3-serial python3-intelhex python3-intelhex" DEFAULT_CONSOLE="serial" +HAS_VIDEO_OUTPUT="no" +MODULES_BLACKLIST="rtw88_8822cs" diff --git a/config/boards/jethubj80.conf b/config/boards/jethubj80.conf index 2b1db83a0aef..e9a7491c951e 100644 --- a/config/boards/jethubj80.conf +++ b/config/boards/jethubj80.conf @@ -6,3 +6,5 @@ BOOTCONFIG="jethub_j80_defconfig" KERNEL_TARGET="current,edge" PACKAGE_LIST_BOARD="libubootenv-tool apparmor rfkill bluetooth bluez bluez-tools python3-pip watchdog python3-serial python3-intelhex python3-intelhex" DEFAULT_CONSOLE="serial" +HAS_VIDEO_OUTPUT="no" +MODULES_BLACKLIST="rtw88_8822cs" diff --git a/config/sources/families/jethub.conf b/config/sources/families/jethub.conf index e8149c55ac26..c4f5845bf6ec 100644 --- a/config/sources/families/jethub.conf +++ b/config/sources/families/jethub.conf @@ -35,19 +35,6 @@ elif [[ "$BOARD" == "jethubj200" ]]; then BOOTPATCHDIR="v2024.07" fi -######## -# @TODO: Put this in the board configs of the respective boards -######## -if [[ "$BOARD" == "jethubj80" ]] || [[ "$BOARD" == "jethubj100" ]]; then - function family_tweaks__blacklistrtw88() { - if [[ "$BOARD" == jethubj80 ]] || [[ "$BOARD" == jethubj100 ]]; then - mkdir -p "${destination}"/etc/modprobe.d - echo "blacklist rtw88_8822cs" > "${destination}"/etc/modprobe.d/rtw88_8822cs.conf - fi - display_alert "Added rtw88_8822cs to blacklist" "${BOARD}" "info" - } -fi - # JetHub builds userspace tooling with c++ (gpp) toolchain in buildjethomecmds() below. # The C++ compiler is no longer included by default in the Armbian build system. # Enable the extension that brings includes it. It could've been an inline extension (eg: the function right here),