From 1a9508dceb924c4663366fb1b50d917bffa9744b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 4 Feb 2013 21:57:09 +0100 Subject: [PATCH 01/11] projects/RPi/linux: enable debugfs Signed-off-by: Stephan Raue --- projects/RPi/linux/linux.arm.conf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 2967f6f57e..0f0b78147a 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -163,6 +163,7 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y # # GCOV-based kernel profiling # +# CONFIG_GCOV_KERNEL is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -675,6 +676,7 @@ CONFIG_CFG80211=y # CONFIG_CFG80211_REG_DEBUG is not set # CONFIG_CFG80211_CERTIFICATION_ONUS is not set CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set # CONFIG_CFG80211_INTERNAL_REGDB is not set CONFIG_CFG80211_WEXT=y # CONFIG_LIB80211 is not set @@ -687,6 +689,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set @@ -925,8 +928,10 @@ CONFIG_ATH9K_COMMON=m CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_AHB=y +# CONFIG_ATH9K_DEBUGFS is not set CONFIG_ATH9K_RATE_CONTROL=y CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y CONFIG_CARL9170_WPC=y @@ -2131,6 +2136,7 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set CONFIG_REISERFS_FS=y # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set @@ -2335,7 +2341,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_READABLE_ASM is not set # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_DEBUG_KERNEL=y @@ -2381,6 +2387,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_LKDTM is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set @@ -2392,6 +2399,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set From 09109e9259eb051f34f771929b6a02635806404c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 4 Feb 2013 23:43:48 +0200 Subject: [PATCH 02/11] intel-gpu-tools: add script to set colorspace. thanks to fritsch --- packages/x11/other/intel-gpu-tools/install | 1 + .../scripts/set-intel-color-space | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100755 packages/x11/other/intel-gpu-tools/scripts/set-intel-color-space diff --git a/packages/x11/other/intel-gpu-tools/install b/packages/x11/other/intel-gpu-tools/install index cbf471cdad..21f521f3bd 100755 --- a/packages/x11/other/intel-gpu-tools/install +++ b/packages/x11/other/intel-gpu-tools/install @@ -24,3 +24,4 @@ mkdir -p $INSTALL/usr/bin cp -R $PKG_BUILD/tools/intel_reg_write $INSTALL/usr/bin + cp -P $PKG_DIR/scripts/set-intel-color-space $INSTALL/usr/bin diff --git a/packages/x11/other/intel-gpu-tools/scripts/set-intel-color-space b/packages/x11/other/intel-gpu-tools/scripts/set-intel-color-space new file mode 100755 index 0000000000..be054bd483 --- /dev/null +++ b/packages/x11/other/intel-gpu-tools/scripts/set-intel-color-space @@ -0,0 +1,47 @@ +#!/bin/sh + +################################################################################ +# Copyright (C) 2009-2010 OpenELEC.tv +# http://www.openelec.tv +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ +# Enable Limited or RGB full on intel Computers +# Usage: +# Set Limited mode: +# ./set-intel-color-space limited +# Set Full mode: +# ./set-intel-color-space full +################################################################################ + +if [ $# -gt 0 ] ; then + OUTPUT=`xrandr -display :0 -q | sed '/ connected/!d;s/ .*//;q'` + if [ "$1" = "limited" ] ; then + # limited modes + intel_reg_write 0x70008 0xC0000000 + intel_reg_write 0x70180 0xD8004400 + xrandr --output $OUTPUT --set "Broadcast RGB" "Limited 16:235" + elif [ "$1" == "full" ] ; then + # reset old mode + xrandr --output $OUTPUT --set "Broadcast RGB" "Limited 16:235" + intel_reg_write 0x70008 0xC4002000 + intel_reg_write 0x70180 0xDA004400 + # set new mode + xrandr --output $OUTPUT --set "Broadcast RGB" "Full" + fi +else + echo "Usage: $0 limited | full" +fi From af68bee9dc9aa1073106b55f47132ef185fb488f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 5 Feb 2013 00:19:18 +0200 Subject: [PATCH 03/11] tvheadend: depend on 'curl', required for imagecache --- packages/addons/service/multimedia/tvheadend/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta index 5502c6f7af..75b6582070 100644 --- a/packages/addons/service/multimedia/tvheadend/meta +++ b/packages/addons/service/multimedia/tvheadend/meta @@ -26,8 +26,8 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" #PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS="$ICONV avahi openssl" -PKG_BUILD_DEPENDS="toolchain $ICONV avahi openssl" +PKG_DEPENDS="$ICONV avahi openssl curl" +PKG_BUILD_DEPENDS="toolchain $ICONV avahi openssl curl" PKG_PRIORITY="optional" PKG_SECTION="service/multimedia" PKG_SHORTDESC="tvheadend (Version: $PKG_VERSION): a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources." From 43006644d623a98f1395e5a7cd8f768d845344eb Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 5 Feb 2013 00:20:34 +0200 Subject: [PATCH 04/11] tvheadend: disable libav --- packages/addons/service/multimedia/tvheadend/build | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/service/multimedia/tvheadend/build b/packages/addons/service/multimedia/tvheadend/build index 7a69774b76..90c4c4481c 100755 --- a/packages/addons/service/multimedia/tvheadend/build +++ b/packages/addons/service/multimedia/tvheadend/build @@ -35,6 +35,7 @@ cd $PKG_BUILD --cpu=$TARGET_CPU \ --cc=$TARGET_CC \ --enable-timeshift \ + --disable-libav \ --enable-bundle make From 087741801e340213f9af7cff79da34c78438aaf2 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 5 Feb 2013 11:20:41 +0200 Subject: [PATCH 05/11] xf86-video-nvidia: fix build with kernel 3.6.7 --- .../patches.upstream/kernel-3.7.6-fix.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7.6-fix.patch diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7.6-fix.patch b/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7.6-fix.patch new file mode 100644 index 0000000000..1b16475384 --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7.6-fix.patch @@ -0,0 +1,11 @@ +--- a/kernel/conftest.sh 2013-02-04 15:10:20.669633666 -0500 ++++ b/kernel/conftest.sh 2013-02-04 15:10:34.283334673 -0500 +@@ -1701,7 +1701,7 @@ + SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) + + if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ +- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then ++ -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then + SELECTED_MAKEFILE=Makefile.kbuild + RET=0 + fi From cb3c9bfba04bd86622e866781720652263a797e2 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 5 Feb 2013 11:21:27 +0200 Subject: [PATCH 06/11] xf86-video-nvidia-legacy: fix build with kernel 3.6.7 --- .../patches.upstream/kernel-3.7.6-fix.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7.6-fix.patch diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7.6-fix.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7.6-fix.patch new file mode 100644 index 0000000000..1b16475384 --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7.6-fix.patch @@ -0,0 +1,11 @@ +--- a/kernel/conftest.sh 2013-02-04 15:10:20.669633666 -0500 ++++ b/kernel/conftest.sh 2013-02-04 15:10:34.283334673 -0500 +@@ -1701,7 +1701,7 @@ + SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) + + if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ +- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then ++ -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then + SELECTED_MAKEFILE=Makefile.kbuild + RET=0 + fi From 0e084e8fa63b6da8eb7296f9802f6d6f6bbfeb7b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 5 Feb 2013 19:59:02 +0200 Subject: [PATCH 07/11] xf86-video-nvidia: update kernel-3.7-fix.patch. do not check patchlevel / sublevel --- .../patches.upstream/kernel-3.7-fix.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7-fix.patch diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7-fix.patch b/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7-fix.patch new file mode 100644 index 0000000000..16cbfd1fbf --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7-fix.patch @@ -0,0 +1,16 @@ +diff --git a/kernel/conftest.sh b/kernel/conftest.sh +index 8eff4d7..2bf3318 100755 +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -1716,11 +1716,8 @@ case "$6" in + PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) + SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) + +- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ +- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then + SELECTED_MAKEFILE=Makefile.kbuild + RET=0 +- fi + fi + fi + From 6c7a388ce11e326fccced457b99065527df616de Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 5 Feb 2013 20:00:00 +0200 Subject: [PATCH 08/11] xf86-video-nvidia-legacy: update kernel-3.7-fix.patch. do not check patchlevel / sublevel --- .../patches.upstream/kernel-3.7-fix.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7-fix.patch diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7-fix.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7-fix.patch new file mode 100644 index 0000000000..16cbfd1fbf --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7-fix.patch @@ -0,0 +1,16 @@ +diff --git a/kernel/conftest.sh b/kernel/conftest.sh +index 8eff4d7..2bf3318 100755 +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -1716,11 +1716,8 @@ case "$6" in + PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) + SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) + +- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ +- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then + SELECTED_MAKEFILE=Makefile.kbuild + RET=0 +- fi + fi + fi + From 35fdb1f672ef8fe5dc35c2851f455538ff5b97b1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 6 Feb 2013 00:47:16 +0100 Subject: [PATCH 09/11] xf86-video-nvidia: remove old patch Signed-off-by: Stephan Raue --- .../patches.upstream/kernel-3.7.6-fix.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7.6-fix.patch diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7.6-fix.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7.6-fix.patch deleted file mode 100644 index 1b16475384..0000000000 --- a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/kernel-3.7.6-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/kernel/conftest.sh 2013-02-04 15:10:20.669633666 -0500 -+++ b/kernel/conftest.sh 2013-02-04 15:10:34.283334673 -0500 -@@ -1701,7 +1701,7 @@ - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - - if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then -+ -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 - fi From c76d5574b767ae0b3aa523cbcd40172974bb0064 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 6 Feb 2013 00:47:26 +0100 Subject: [PATCH 10/11] xf86-video-nvidia: remove old patch Signed-off-by: Stephan Raue --- .../patches.upstream/kernel-3.7.6-fix.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7.6-fix.patch diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7.6-fix.patch b/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7.6-fix.patch deleted file mode 100644 index 1b16475384..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.7.6-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/kernel/conftest.sh 2013-02-04 15:10:20.669633666 -0500 -+++ b/kernel/conftest.sh 2013-02-04 15:10:34.283334673 -0500 -@@ -1701,7 +1701,7 @@ - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - - if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then -+ -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 - fi From 13afe88c7e50c913ac6847418d56f3d8134d2423 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 6 Feb 2013 00:48:04 +0100 Subject: [PATCH 11/11] linux: add upstream patches, this fix #1841 Signed-off-by: Stephan Raue --- ...inux-990.03-media-ds3000_firmware-01.patch | 11 +++ ...inux-990.03-media-ds3000_firmware-02.patch | 87 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-01.patch create mode 100644 packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-02.patch diff --git a/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-01.patch b/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-01.patch new file mode 100644 index 0000000000..a09ddf98e7 --- /dev/null +++ b/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-01.patch @@ -0,0 +1,11 @@ +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=drivers%2Fmedia%2Fdvb-frontends%2Fds3000.c;h=c84cd98a91504dcf2995a75a1e8d6e5013cf4f2d;hp=5b639087ce45623f7a2f1be7e1b6216c1bc686a8;hb=feadd7d3eca4da531b35b2af3623dd992f2d988d;hpb=6c17c24d384ce69893e191c94b500c97bd263c27 + +diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c +index 5b63908..c84cd98 100644 +--- a/drivers/media/dvb-frontends/ds3000.c ++++ b/drivers/media/dvb-frontends/ds3000.c +@@ -1316,3 +1316,4 @@ MODULE_DESCRIPTION("DVB Frontend module for Montage Technology " + "DS3000/TS2020 hardware"); + MODULE_AUTHOR("Konstantin Dimitrov"); + MODULE_LICENSE("GPL"); ++MODULE_FIRMWARE(DS3000_DEFAULT_FIRMWARE); diff --git a/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-02.patch b/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-02.patch new file mode 100644 index 0000000000..23785d5832 --- /dev/null +++ b/packages/linux/patches/3.7.6/linux-990.03-media-ds3000_firmware-02.patch @@ -0,0 +1,87 @@ +From b41a536cf9806c3478b2fa68d59edafd0787e8aa Mon Sep 17 00:00:00 2001 +From: =?utf8?q?R=C3=A9mi=20Cardona?= +Date: Fri, 28 Sep 2012 08:59:27 -0300 +Subject: [PATCH] [media] ds3000: remove useless 'locking' +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Since b9bf2eafaad9c1ef02fb3db38c74568be601a43a, the function +ds3000_firmware_ondemand() is called only once during init. This +locking scheme may have been useful when the firmware was loaded at +each tune. +Furthermore, it looks like this 'lock' was put in to prevent concurrent +access (and not recursion as the comments suggest). However, this open- +coded mechanism is anything but race-free and should have used a proper +mutex. + +Signed-off-by: Rémi Cardona +Reviewed-by: Antti Palosaari +Signed-off-by: Mauro Carvalho Chehab +--- + drivers/media/dvb-frontends/ds3000.c | 14 -------------- + 1 files changed, 0 insertions(+), 14 deletions(-) + +diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c +index c84cd98..60a529e 100644 +--- a/drivers/media/dvb-frontends/ds3000.c ++++ b/drivers/media/dvb-frontends/ds3000.c +@@ -30,7 +30,6 @@ + #include "ds3000.h" + + static int debug; +-static int force_fw_upload; + + #define dprintk(args...) \ + do { \ +@@ -234,7 +233,6 @@ struct ds3000_state { + struct i2c_adapter *i2c; + const struct ds3000_config *config; + struct dvb_frontend frontend; +- u8 skip_fw_load; + /* previous uncorrected block counter for DVB-S2 */ + u16 prevUCBS2; + }; +@@ -397,9 +395,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe) + if (ret < 0) + return ret; + +- if (state->skip_fw_load || !force_fw_upload) +- return 0; /* Firmware already uploaded, skipping */ +- + /* Load firmware */ + /* request the firmware, this will block until someone uploads it */ + printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n", __func__, +@@ -413,9 +408,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe) + return ret; + } + +- /* Make sure we don't recurse back through here during loading */ +- state->skip_fw_load = 1; +- + ret = ds3000_load_firmware(fe, fw); + if (ret) + printk("%s: Writing firmware to device failed\n", __func__); +@@ -425,9 +417,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe) + dprintk("%s: Firmware upload %s\n", __func__, + ret == 0 ? "complete" : "failed"); + +- /* Ensure firmware is always loaded if required */ +- state->skip_fw_load = 0; +- + return ret; + } + +@@ -1309,9 +1298,6 @@ static struct dvb_frontend_ops ds3000_ops = { + module_param(debug, int, 0644); + MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)"); + +-module_param(force_fw_upload, int, 0644); +-MODULE_PARM_DESC(force_fw_upload, "Force firmware upload (default:0)"); +- + MODULE_DESCRIPTION("DVB Frontend module for Montage Technology " + "DS3000/TS2020 hardware"); + MODULE_AUTHOR("Konstantin Dimitrov"); +-- +1.7.6.5 +