slitaz-arm rev 113

rpi: overclocking will be fully handled by TazBerry
author Christophe Lincoln <pankso@slitaz.org>
date Sat Apr 19 23:16:16 2014 +0200 (2014-04-19)
parents c34a9ff05fd1
children c4d8a7a5f97c
files rpi/rootfs/boot/config.txt sat-rpi
line diff
     1.1 --- a/rpi/rootfs/boot/config.txt	Sat Apr 19 23:05:58 2014 +0200
     1.2 +++ b/rpi/rootfs/boot/config.txt	Sat Apr 19 23:16:16 2014 +0200
     1.3 @@ -4,12 +4,6 @@
     1.4  # Linux kernel image
     1.5  kernel=kernel.img
     1.6  
     1.7 -# Overclocking Settings
     1.8 -arm_freq=700
     1.9 -core_freq=250
    1.10 -sdram_freq=400
    1.11 -over_voltage=0
    1.12 -
    1.13  #GPU memory allocation in MB. Default: 64
    1.14  #gpu_mem=128
    1.15  
     2.1 --- a/sat-rpi	Sat Apr 19 23:05:58 2014 +0200
     2.2 +++ b/sat-rpi	Sat Apr 19 23:16:16 2014 +0200
     2.3 @@ -56,8 +56,6 @@
     2.4  
     2.5  $(boldify "Options:")
     2.6    --up          Update for commands: firmware and kernel
     2.7 -  --turbo       Force the RPi to run at the highest arm_freq
     2.8 -  --oclock=     Set the RPi overclocking mode in config.txt
     2.9    --vc          Install the RPi VC libraries in /opt/vc
    2.10    --nosat       Don't regenerate the distro with sat
    2.11  
    2.12 @@ -123,10 +121,12 @@
    2.13  			over_voltage=6 ;;
    2.14  	esac
    2.15  	cat >> ${boot}/config.txt << EOT
    2.16 +# Overclocking Settings
    2.17  arm_freq=$arm_freq
    2.18  core_freq=$core_freq
    2.19  sdram_freq=$sdram_freq
    2.20  over_voltage=$over_voltage
    2.21 +
    2.22  EOT
    2.23  }
    2.24  
    2.25 @@ -253,18 +253,6 @@
    2.26  		cp -a ${rpi}/cgi-adm/* ${rootfs}/var/www/adm
    2.27  		status
    2.28  		
    2.29 -		# Overclocking
    2.30 -		echo -n "Setting: Overclocking..."
    2.31 -		set_oclock; status
    2.32 -		
    2.33 -		# Force turbo
    2.34 -		if [ "$turbo" ]; then
    2.35 -			if ! fgrep 'force_turbo=1' ${boot}/config.txt; then
    2.36 -				echo -n "Config: force_turbo=1"
    2.37 -				echo "force_turbo=1" >> ${boot}/config.txt; status
    2.38 -			fi
    2.39 -		fi
    2.40 -		
    2.41  		# RPi VC libraries
    2.42  		if [ "$vc" ]; then
    2.43  			vc="${rootfs}/opt/vc"