diff --git a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt new file mode 100644 index 0000000000..72dc1fed4f --- /dev/null +++ b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt @@ -0,0 +1,103 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# Inspired and partly copied from: +# http://youresuchageek.blogspot.fr/2012/09/howto-raspberry-pi-openelec-on.html +# +# 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 +################################################################################ +# Bootloader configuration - config.txt +################################################################################ + +################################################################################ +# Memory (System/GPU configuration ) +################################################################################ + +# default GPU memory split (dont change if you dont know what you do) + gpu_mem=128 + +# SDRAM size based GPU memory split, uncomment and setup to override 'gpu_mem' +# gpu_mem_256=128 +# gpu_mem_512=128 + +################################################################################ +# Overclocking settings +# WARNING: Dont change/enable if you dont know what you are doing! +# The System may become unstable or you can have data corruption or +# you can loose your warranty if you set wrong settings +# +# please read: http://elinux.org/RPi_config.txt#Overclocking_configuration +################################################################################ + +# Overclock mode settings. +# +# default recomment values are: arm_freq | core_freq | sdram_freq | over_voltage +# no overclocking : 700 | 250 | 400 | 0 +# mode 'Modest' : 800 | 300 | 400 | 0 +# mode 'Medium' : 900 | 333 | 450 | 2 +# mode 'High' : 950 | 450 | 450 | 6 +# mode 'Turbo' : 1000 | 500 | 500 | 6 + +# arm_freq=700 +# core_freq=250 +# sdram_freq=400 +# over_voltage=0 + +# set to 'force_turbo=1' to disable dynamic overclocking (you can loose your warranty!) + force_turbo=0 + +# If you have any data corruption using Turbo Mode and overclocking +# to with this setting uncommented +# If this still fails, try to use Medium mode whitout "over_voltage=2" +# If this finally still fails, forget about this until this gets fixed +# Use a more conservative mode that will works fine in any cases: +# initial_turbo=30 + +################################################################################ +# Overscan settings +################################################################################ + +# Make display smaller to stop text spilling off the screen +# see also http://www.raspberrypi.org/phpBB3/viewtopic.php?f=67&t=15700 +# overscan_scale=1 +# disable_overscan=1 + +# Adapt overscan values to your needs +# overscan_left=57 +# overscan_right=59 +# overscan_top=20 +# overscan_bottom=20 + +################################################################################ +# various settings see also: http://elinux.org/RPi_config.txt +################################################################################ + +# Force HDMI even if unplugged or powered off +# hdmi_force_hotplug=1 + +################################################################################ +# License keys to enable GPU hardware decoders +# to get the keys see http://www.raspberrypi.com +################################################################################ + +# decode_MPG2=0x00000000 +# decode_WVC1=0x00000000 +# decode_DTS=0x00000000 +# decode_DDP=0x00000000 + +################################################################################ +# End of default configuration +################################################################################ diff --git a/packages/tools/bcm2835-bootloader/install b/packages/tools/bcm2835-bootloader/install index 1ba0565d44..1f5079f57f 100755 --- a/packages/tools/bcm2835-bootloader/install +++ b/packages/tools/bcm2835-bootloader/install @@ -24,8 +24,9 @@ mkdir -p $INSTALL/usr/share/bootloader cp $PKG_BUILD/LICENCE* $INSTALL/usr/share/bootloader - cp $PKG_BUILD/arm128_start.elf $INSTALL/usr/share/bootloader/start.elf cp $PKG_BUILD/bootcode.bin $INSTALL/usr/share/bootloader - cp $PKG_BUILD/loader.bin $INSTALL/usr/share/bootloader + cp $PKG_BUILD/fixup.dat $INSTALL/usr/share/bootloader + cp $PKG_BUILD/start.elf $INSTALL/usr/share/bootloader 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/meta b/packages/tools/bcm2835-bootloader/meta index e87b5db32a..3feac54018 100644 --- a/packages/tools/bcm2835-bootloader/meta +++ b/packages/tools/bcm2835-bootloader/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="831239e" +PKG_VERSION="c58f722" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" diff --git a/packages/tools/bcm2835-bootloader/release b/packages/tools/bcm2835-bootloader/release index f3e5fb63ac..9cd7d28749 100755 --- a/packages/tools/bcm2835-bootloader/release +++ b/packages/tools/bcm2835-bootloader/release @@ -23,6 +23,8 @@ . config/options $1 mkdir -p $RELEASE_DIR/3rdparty/bootloader - cp -PR $BUILD/bcm2835-bootloader-*/arm128_start.elf $RELEASE_DIR/3rdparty/bootloader/start.elf + cp -PR $BUILD/bcm2835-bootloader-*/LICENCE* $RELEASE_DIR/3rdparty/bootloader/ cp -PR $BUILD/bcm2835-bootloader-*/bootcode.bin $RELEASE_DIR/3rdparty/bootloader/ - cp -PR $BUILD/bcm2835-bootloader-*/loader.bin $RELEASE_DIR/3rdparty/bootloader/ + cp -PR $BUILD/bcm2835-bootloader-*/fixup.dat $RELEASE_DIR/3rdparty/bootloader/ + cp -PR $BUILD/bcm2835-bootloader-*/start.elf $RELEASE_DIR/3rdparty/bootloader/ + diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh index bda1348330..7b13203b2d 100755 --- a/packages/tools/bcm2835-bootloader/scripts/update.sh +++ b/packages/tools/bcm2835-bootloader/scripts/update.sh @@ -28,11 +28,22 @@ # update bootloader files cp $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT - cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT cp $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT - cp $SYSTEM_ROOT/usr/share/bootloader/loader.bin $BOOT_ROOT + cp $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT + cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT + +# cleanup not more needed files + rm -rf $BOOT_ROOT/loader.bin + +# some config.txt magic + if [ ! -f $BOOT_ROOT/config.txt ]; then + cp $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT + elif [ ! `grep "^[ ]*gpu_mem.*" $BOOT_ROOT/config.txt` ]; then + mv $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.bk + cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \ + $BOOT_ROOT/config.txt.bk > $BOOT_ROOT/config.txt + fi # mount $BOOT_ROOT r/o sync mount -o remount,ro $BOOT_ROOT -