From 357c00e39a12ac725bfe2f428995bce82a0fc274 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 17 Feb 2013 23:12:43 +0100 Subject: [PATCH 1/3] bcm2835-bootloader: install and use start_x.elf and fixup_x.dat per default Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/install | 6 ++---- packages/tools/bcm2835-bootloader/scripts/update.sh | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/tools/bcm2835-bootloader/install b/packages/tools/bcm2835-bootloader/install index 83ee16b9eb..7e95187b99 100755 --- a/packages/tools/bcm2835-bootloader/install +++ b/packages/tools/bcm2835-bootloader/install @@ -25,10 +25,8 @@ mkdir -p $INSTALL/usr/share/bootloader cp $PKG_BUILD/LICENCE* $INSTALL/usr/share/bootloader cp $PKG_BUILD/bootcode.bin $INSTALL/usr/share/bootloader - cp $PKG_BUILD/fixup.dat $INSTALL/usr/share/bootloader - cp $PKG_BUILD/fixup_x.dat $INSTALL/usr/share/bootloader - cp $PKG_BUILD/start.elf $INSTALL/usr/share/bootloader - cp $PKG_BUILD/start_x.elf $INSTALL/usr/share/bootloader + cp $PKG_BUILD/fixup_x.dat $INSTALL/usr/share/bootloader/fixup.dat + cp $PKG_BUILD/start_x.elf $INSTALL/usr/share/bootloader/start.elf cp $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader cp $PKG_DIR/files/3rdparty/bootloader/config.txt $INSTALL/usr/share/bootloader diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh index dab5d0e29f..67603a2644 100755 --- a/packages/tools/bcm2835-bootloader/scripts/update.sh +++ b/packages/tools/bcm2835-bootloader/scripts/update.sh @@ -30,12 +30,12 @@ cp $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT cp $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT cp $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT - cp $SYSTEM_ROOT/usr/share/bootloader/fixup_x.dat $BOOT_ROOT cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT - cp $SYSTEM_ROOT/usr/share/bootloader/start_x.elf $BOOT_ROOT # cleanup not more needed files rm -rf $BOOT_ROOT/loader.bin + rm -rf $BOOT_ROOT/fixup_x.dat + rm -rf $BOOT_ROOT/start_x.elf # some config.txt magic if [ ! -f $BOOT_ROOT/config.txt ]; then From b031e4833f48bf25ea302540bee483e7c5b7f935 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 18 Feb 2013 11:31:04 +0200 Subject: [PATCH 2/3] vdr-plugin-dvbapi: force softcsa. this fixes #1905 --- .../vdr-plugin-dvbapi-cd93752-force-softcsa.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-force-softcsa.patch diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-force-softcsa.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-force-softcsa.patch new file mode 100644 index 0000000000..cfa1cc9f54 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-force-softcsa.patch @@ -0,0 +1,13 @@ +diff --git a/device-tmpl.cpp b/device-tmpl.cpp +index 158324b..4d9f862 100644 +--- a/device-tmpl.cpp ++++ b/device-tmpl.cpp +@@ -71,7 +71,7 @@ SCDEVICE::SCDEVICE(cScDevicePlugin *DevPlugin, int Adapter, int Frontend, int ca + fd_dvr = -1; + + int n = Adapter; +- softcsa = (fd_ca < 0); ++ softcsa = true; + if (softcsa) + { + if (HasDecoder()) From 810088e698d520e2290590f52f9996e9f5ecd2db Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 18 Feb 2013 17:48:11 +0100 Subject: [PATCH 3/3] projects/RPi/options: revert part of acdd4c8 Signed-off-by: Stephan Raue --- projects/RPi/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/RPi/options b/projects/RPi/options index f53c67d1a2..6cce14c377 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -309,7 +309,7 @@ SENSOR_SUPPORT="yes" # build with swap support (yes / no) - SWAP_SUPPORT="yes" + SWAP_SUPPORT="no" # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="131072"