Permalink
Browse files

projects/Amlogic: revert dvb to 8.95.1 state

  • Loading branch information...
adamg88 committed Sep 14, 2018
1 parent dbc5320 commit e6e4c8cb8a38e3368b700554f8135e938732f209
Showing with 174 additions and 1,429 deletions.
  1. +11 −4 packages/linux-driver-addons/dvb/crazycat/package.mk
  2. +13 −0 ...dons/dvb/crazycat/patches/amlogic-3.10/driver.dvb.crazycat-01-add-AML-specific-to-backports.patch
  3. +11 −0 ...inux-driver-addons/dvb/crazycat/patches/amlogic-3.10/driver.dvb.crazycat-02-media_build-fix.patch
  4. +12 −0 ...ver-addons/dvb/crazycat/patches/amlogic-3.10/driver.dvb.crazycat-03-frame_vector_workaround.patch
  5. +18 −0 ...ages/linux-driver-addons/dvb/crazycat/patches/amlogic-3.10/driver.dvb.crazycat-04-AML-hacks.patch
  6. +29 −0 ...nux-driver-addons/dvb/crazycat/patches/amlogic-3.10/driver.dvb.crazycat-06-sched_signal-fix.patch
  7. +29 −0 ...s/linux-driver-addons/dvb/crazycat/patches/rockchip/driver.dvb.crazycat-06-sched_signal-fix.patch
  8. +1 −1 packages/linux-driver-addons/dvb/depends/media_tree/package.mk
  9. +0 −1,282 packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-01-hauppauge.patch
  10. +0 −52 ...ver-addons/dvb/depends/media_tree/patches/media_tree-02-linux-901-extend-rc6-toggle-support.patch
  11. +0 −27 packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk
  12. +0 −52 ...dons/dvb/depends/media_tree_cc/patches/media_tree_cc-02-linux-901-extend-rc6-toggle-support.patch
  13. +2 −2 packages/linux-driver-addons/dvb/digital_devices/package.mk
  14. BIN packages/linux-driver-addons/dvb/dvb-latest/icon/icon.png
  15. 0 packages/linux-driver-addons/dvb/{dvb-latest → hauppauge}/changelog.txt
  16. BIN packages/linux-driver-addons/dvb/hauppauge/icon/icon.png
  17. +9 −7 packages/linux-driver-addons/dvb/{dvb-latest → hauppauge}/package.mk
  18. 0 ...ts.patch → hauppauge/patches/amlogic/driver.dvb.hauppauge-01-add-AML-specific-to-backports.patch}
  19. 0 ....dvb-latest-03-versions.patch → hauppauge/patches/amlogic/driver.dvb.hauppauge-03-versions.patch}
  20. 0 ...est-05-compat_h-fix.patch → hauppauge/patches/amlogic/driver.dvb.hauppauge-05-compat_h-fix.patch}
  21. 0 ...ched_signal-fix.patch → hauppauge/patches/amlogic/driver.dvb.hauppauge-06-sched_signal-fix.patch}
  22. 0 ....dvb.dvb-latest-08-pr-fmt.patch → hauppauge/patches/amlogic/driver.dvb.hauppauge-08-pr-fmt.patch}
  23. 0 ...atest-01-remove-rmmod.pl.patch → hauppauge/patches/driver.dvb.hauppauge-01-remove-rmmod.pl.patch}
  24. +8 −0 ...est-02-add-to-backports.patch → hauppauge/patches/driver.dvb.hauppauge-02-add-to-backports.patch}
  25. +29 −0 ...linux-driver-addons/dvb/hauppauge/patches/rockchip/driver.dvb.hauppauge-06-sched_signal-fix.patch
  26. 0 packages/linux-driver-addons/dvb/{dvb-latest → hauppauge}/source/default.py
  27. 0 packages/linux-driver-addons/dvb/{dvb-latest → hauppauge}/sources/backports/hauppauge.patch
  28. 0 ...river-addons/dvb/{dvb-latest → hauppauge}/sources/backports/linux-301-AML-videobuf-resource.patch
  29. 0 ...river-addons/dvb/{dvb-latest → hauppauge}/sources/backports/linux-302-AML-amlogic-video-dev.patch
  30. 0 ...s/linux-driver-addons/dvb/{dvb-latest → hauppauge}/sources/backports/linux-303-AML-meson-ir.patch
  31. 0 .../linux-driver-addons/dvb/{dvb-latest → hauppauge}/sources/backports/linux-304-AML-wetekplay.patch
  32. 0 ...ages/linux-driver-addons/dvb/{dvb-latest → hauppauge}/sources/backports/linux-305-AML-dmx_h.patch
  33. 0 ...ux-driver-addons/dvb/{dvb-latest → hauppauge}/sources/backports/linux-306-AML-build-dvb-avl.patch
  34. +2 −2 projects/Amlogic/options
@@ -11,17 +11,21 @@ PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain linux"
PKG_NEED_UNPACK="$LINUX_DEPENDS"
PKG_SECTION="driver.dvb"
PKG_LONGDESC="DVB driver for TBS cards with CrazyCats additions"
PKG_LONGDESC="DVB driver for TBS cards with CrazyCats additions."
PKG_IS_ADDON="embedded"
PKG_IS_KERNEL_PKG="yes"
PKG_ADDON_IS_STANDALONE="yes"
PKG_ADDON_NAME="DVB drivers for TBS"
PKG_ADDON_NAME="DVB drivers for TBS (CrazyCat)"
PKG_ADDON_TYPE="xbmc.service"
PKG_ADDON_VERSION="${ADDON_VERSION}.${PKG_REV}"
if [ $LINUX = "amlogic-3.14" ]; then
if [ $LINUX = "amlogic-3.10" ]; then
PKG_PATCH_DIRS="amlogic-3.10"
elif [ $LINUX = "amlogic-3.14" ]; then
PKG_PATCH_DIRS="amlogic-3.14"
elif [ $LINUX = "rockchip-4.4" ]; then
PKG_PATCH_DIRS="rockchip"
fi
pre_make_target() {
@@ -44,9 +48,12 @@ make_target() {
fi
# hack to workaround media_build bug
if [ $LINUX = "amlogic-3.14" ]; then
if [ $LINUX = "amlogic-3.14" -o $LINUX = "amlogic-3.10" ]; then
sed -e 's/CONFIG_VIDEO_TVP5150=m/# CONFIG_VIDEO_TVP5150 is not set/g' -i v4l/.config
sed -e 's/CONFIG_DVB_LGDT3306A=m/# CONFIG_DVB_LGDT3306A is not set/g' -i v4l/.config
if [ $LINUX = "amlogic-3.10" ]; then
sed -e 's/CONFIG_IR_NUVOTON=m/# CONFIG_IR_NUVOTON is not set/g' -i v4l/.config
fi
elif [ "$PROJECT" = Rockchip ]; then
sed -e 's/CONFIG_DVB_CXD2820R=m/# CONFIG_DVB_CXD2820R is not set/g' -i v4l/.config
sed -e 's/CONFIG_DVB_LGDT3306A=m/# CONFIG_DVB_LGDT3306A is not set/g' -i v4l/.config
@@ -0,0 +1,13 @@
diff -Naur a/backports/backports.txt b/backports/backports.txt
--- a/backports/backports.txt 2017-12-30 22:14:58.000000000 +0200
+++ b/backports/backports.txt 2018-02-23 13:50:01.327967293 +0200
@@ -21,6 +21,9 @@
# All supported versions need those patches
[9.255.255]
+add linux-301-AML-videobuf-resource.patch
+add linux-302-AML-amlogic-video-dev.patch
+add linux-303-AML-meson-ir.patch
add api_version.patch
add pr_fmt.patch
add debug.patch
@@ -0,0 +1,11 @@
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1588,7 +1588,7 @@
#endif
#ifdef NEED_WRITEL_RELAXED
-#define writel_relaxed writel
+// #define writel_relaxed writel
#endif
#ifdef NEED_GET_USER_PAGES_UNLOCKED
@@ -0,0 +1,12 @@
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -92,9 +92,6 @@ ifneq ($(filter $(no-makefile-media-targets), $(MAKECMDGOALS)),)
endif
makefile-mm := 1
-ifeq ($(wildcard $(SUBDIRS)/../linux/mm/frame_vector.c),)
- makefile-mm := 0
-endif
# If version not yet detected, we can't create/have these files yet
ifeq ($(KERNELRELEASE),)
@@ -0,0 +1,18 @@
diff -Naur a/linux/Makefile b/linux/Makefile
--- a/linux/Makefile 2017-12-30 22:01:38.000000000 +0200
+++ b/linux/Makefile 2018-02-23 13:25:54.025763853 +0200
@@ -112,6 +112,14 @@
untar: linux-media.tar.bz2
tar xfj linux-media.tar.bz2
+ mkdir -p drivers/media/amlogic/
+ # Copy amlvideodri module
+ cp -a "$(SRCDIR)/drivers/amlogic/video_dev" "drivers/media/amlogic"
+ sed -i 's,common/,,g; s,"trace/,",g' `find drivers/media/amlogic/video_dev/ -type f`
+ # Copy videobuf-res module
+ cp -a "$(SRCDIR)/drivers/media/v4l2-core/videobuf-res.c" "drivers/media/v4l2-core/"
+ cp -a "$(SRCDIR)/include/media/videobuf-res.h" "include/media/"
+
-rm -f .patches_applied .linked_dir .git_log.md5
clean:
@@ -0,0 +1,29 @@
remove media_build patch due "rm -rf drivers/staging/media/atomisp" hack at LE/tools/mkpkg/mkpkg_pvr
diff --git a/backports/v4.10_sched_signal.patch b/backports/v4.10_sched_signal.patch
index af66823..67ed344 100644
--- a/backports/v4.10_sched_signal.patch
+++ b/backports/v4.10_sched_signal.patch
@@ -257,19 +257,6 @@ index add2edb..8eb0f49 100644
#include <linux/slab.h>
#include <linux/interrupt.h>
-diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
-index 79bd540..c9a61ba 100644
---- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
-+++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
-@@ -34,7 +34,7 @@
- #include <linux/errno.h>
- #include <linux/io.h>
- #include <asm/current.h>
--#include <linux/sched/signal.h>
-+#include <linux/sched.h>
- #include <linux/file.h>
-
- #include <asm/set_memory.h>
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index a7b3f7c..a63034b 100644
--- a/include/media/v4l2-ioctl.h
--
2.14.1
@@ -0,0 +1,29 @@
remove media_build patch due "rm -rf drivers/staging/media/atomisp" hack at LE/tools/mkpkg/mkpkg_pvr
diff --git a/backports/v4.10_sched_signal.patch b/backports/v4.10_sched_signal.patch
index af66823..67ed344 100644
--- a/backports/v4.10_sched_signal.patch
+++ b/backports/v4.10_sched_signal.patch
@@ -257,19 +257,6 @@ index add2edb..8eb0f49 100644
#include <linux/slab.h>
#include <linux/interrupt.h>
-diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
-index 79bd540..c9a61ba 100644
---- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
-+++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
-@@ -34,7 +34,7 @@
- #include <linux/errno.h>
- #include <linux/io.h>
- #include <asm/current.h>
--#include <linux/sched/signal.h>
-+#include <linux/sched.h>
- #include <linux/file.h>
-
- #include <asm/set_memory.h>
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index a7b3f7c..a63034b 100644
--- a/include/media/v4l2-ioctl.h
--
2.14.1
@@ -26,7 +26,7 @@ unpack() {
$PKG_BUILD/drivers/staging/media/Kconfig
# hack/workaround to make aml work
if [ $LINUX = "amlogic-3.14" ]; then
if [ $LINUX = "amlogic-3.14" -o $LINUX = "amlogic-3.10" ]; then
# Copy amlvideodri module
mkdir -p $PKG_BUILD/drivers/media/amlogic/
cp -a "$(kernel_path)/drivers/amlogic/video_dev" "$PKG_BUILD/drivers/media/amlogic"
Oops, something went wrong.

0 comments on commit e6e4c8c

Please sign in to comment.