Make stv0299 as module for all

ghani-1977 · Dec 8, 2020 · 583a025 · 583a025
1 parent 467b454
commit 583a025
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 21 deletions.
diff --git a/conf/machine/include/dreambox.inc b/conf/machine/include/dreambox.inc
@@ -5,12 +5,13 @@ MACHINE_FEATURES_BACKFILL_CONSIDERED += "rtc"
 EXTRA_IMAGEDEPENDS += "dreambox-secondstage-${MACHINE}"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "\
+	dreambox-boot-progress \
 	dreambox-dvb-modules-${MACHINE} \
 	gstreamer1.0-plugin-dvbmediasink \
+	${@bb.utils.contains_any("MACHINE", "dm8000 dm7020hd dm800sev2 dm500hdv2", "kernel-module-ecb", "", d)} \
 	kernel-module-hmac \
 	kernel-module-md4 \
-	${@bb.utils.contains_any("MACHINE", "dm8000 dm7020hd dm800sev2 dm500hdv2", "kernel-module-ecb", "", d)} \
-	dreambox-boot-progress \
+	kernel-module-stv0299 \
 	"
 
 MACHINE_FEATURES += "alsa usbhost switchoff dreambox"

diff --git a/recipes-bsp/drivers/dreambox-dvb-modules-dm7020hd_3.2-20161019.bb b/recipes-bsp/drivers/dreambox-dvb-modules-dm7020hd_3.2-20161019.bb
@@ -3,6 +3,4 @@ require dreambox-dvb-modules.inc
 SRC_URI[modules.md5sum] = "8cb23d8897b175684d19072087298db7"
 SRC_URI[modules.sha256sum] = "017198bf264be62206979cb80549d1c74fe539b6a4467b2b35843b27843affec"
 
-RDEPENDS_${PN} += "kernel-module-stv0299"
-
 COMPATIBLE_MACHINE = "^(dm7020hd)$"
diff --git a/recipes-bsp/drivers/dreambox-dvb-modules-dm8000_3.2-20140604a.bb b/recipes-bsp/drivers/dreambox-dvb-modules-dm8000_3.2-20140604a.bb
@@ -3,6 +3,4 @@ require dreambox-dvb-modules.inc
 SRC_URI[modules.md5sum] = "ed55fd9ef298cd582e1f08322c8d9649"
 SRC_URI[modules.sha256sum] = "3a11801794c7ac7cf04be41c65591bb2e81f4c6b08c1f33c86d17154f08f16be"
 
-RDEPENDS_${PN} += "kernel-module-stv0299"
-
 COMPATIBLE_MACHINE = "^(dm8000)$"
diff --git a/recipes-bsp/drivers/dreambox-dvb-modules-dm800sev2_3.2-20151201.bb b/recipes-bsp/drivers/dreambox-dvb-modules-dm800sev2_3.2-20151201.bb
@@ -3,6 +3,4 @@ require dreambox-dvb-modules.inc
 SRC_URI[modules.md5sum] = "b17d215333da3d43e3f8fd6a69462077"
 SRC_URI[modules.sha256sum] = "6bed413c13b53b178cbbcfb91522145443d74a4230bb7be6b8b735351579e3e6"
 
-RDEPENDS_${PN} += "kernel-module-stv0299"
-
 COMPATIBLE_MACHINE = "^(dm800sev2)$"
diff --git a/recipes-bsp/linux/linux-dreambox-3.2/dm7020hd/defconfig b/recipes-bsp/linux/linux-dreambox-3.2/dm7020hd/defconfig
@@ -1903,7 +1903,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m

diff --git a/recipes-bsp/linux/linux-dreambox-3.2/dm8000/defconfig b/recipes-bsp/linux/linux-dreambox-3.2/dm8000/defconfig
@@ -1900,7 +1900,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m

diff --git a/recipes-bsp/linux/linux-dreambox-3.2/dm800sev2/defconfig b/recipes-bsp/linux/linux-dreambox-3.2/dm800sev2/defconfig
@@ -1919,7 +1919,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m

diff --git a/recipes-bsp/linux/linux-dreambox.inc b/recipes-bsp/linux/linux-dreambox.inc
@@ -11,16 +11,6 @@ PACKAGES_DYNAMIC = "kernel-*"
 # the kernel here, so that it is known that the kernel has them built in.
 KERNEL_BUILTIN_MODULES = "kernel-module-block2mtd"
 
-KERNEL_BUILTIN_MODULES_dm8000 = "\
-	kernel-module-stv0299 \
-	"
-KERNEL_BUILTIN_MODULES_dm800sev2 = "\
-	kernel-module-stv0299 \
-	"
-KERNEL_BUILTIN_MODULES_dm7020hd = "\
-	kernel-module-stv0299 \
-	"
-
 # By default, kernel.bbclass modifies package names to allow multiple kernels
 # to be installed in parallel. We revert this change and rprovide the versioned
 # package names instead, to allow only one kernel to be installed.