# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1398474748 -7200
# Node ID a1a1a8939c479e36df063a1eecb921b207a49ed6
# Parent  2bff42af885024cfa5ae568ee5b41b674779039c
rpi: use raspberrypi package, clean up code

diff -r 2bff42af8850 -r a1a1a8939c47 flavors/rpi-base/packages.list
--- a/flavors/rpi-base/packages.list	Fri Apr 25 04:52:01 2014 +0200
+++ b/flavors/rpi-base/packages.list	Sat Apr 26 03:12:28 2014 +0200
@@ -6,6 +6,7 @@
 slitaz-base-files
 slitaz-boot-scripts
 slitaz-configs-base
+slitaz-arm-rpi
 slitaz-tools
 spk
 tazirc
diff -r 2bff42af8850 -r a1a1a8939c47 flavors/rpi-desktop/packages.list
--- a/flavors/rpi-desktop/packages.list	Fri Apr 25 04:52:01 2014 +0200
+++ b/flavors/rpi-desktop/packages.list	Sat Apr 26 03:12:28 2014 +0200
@@ -6,6 +6,7 @@
 slitaz-base-files
 slitaz-boot-scripts
 slitaz-configs-base
+slitaz-arm-rpi
 slitaz-arm-configs
 slitaz-tools
 slitaz-icon
@@ -111,4 +112,4 @@
 alsa-utils
 mpg123
 lua
-svkbd
+raspberrypi-boot
diff -r 2bff42af8850 -r a1a1a8939c47 rpi/README
--- a/rpi/README	Fri Apr 25 04:52:01 2014 +0200
+++ b/rpi/README	Sat Apr 26 03:12:28 2014 +0200
@@ -46,17 +46,10 @@
 
 $ sat-rpi help
 
-  --turbo: The forced turbo option turns off the dynamic clocks and runs the 
-           Raspberry Pi constantly at the highest arm_freq.
-
 
 Overclocking
 ------------
-To enable overclocking select one of the suggested modes from the list. Choosing 
-medium is generally a good starting point without risks:
-
-# sat-rpi oclock
-# sat-rpi gen --oclock=medium
+To enable overclocking you must use tazberry directly on your Raspberry Pi.
 
 
 SliTaz RPi Kernel
diff -r 2bff42af8850 -r a1a1a8939c47 sat-rpi
--- a/sat-rpi	Fri Apr 25 04:52:01 2014 +0200
+++ b/sat-rpi	Sat Apr 26 03:12:28 2014 +0200
@@ -25,12 +25,8 @@
 
 # URLs
 rpi_mirror="http://mirror.slitaz.org/arm/rpi/"
-fw_url="https://github.com/raspberrypi/firmware/raw/master/boot/"
 rpi_git_url="git://github.com/raspberrypi/"
 
-# Lists
-fwlist="bootcode.bin fixup.dat start.elf"
-
 #
 # Functions
 #
@@ -48,15 +44,12 @@
   gen           Generate a new SliTaz RPi distro
   cook-linux    Build the Raspberry Pi Linux kernel
   get-linux     Get the SliTaz RPi linux package
-  get-fw        Download or update minimal RPi firmware
   clone-fw      Clone the RPi firmware repository
   get-prebuilt  Get a prebuilt SliTaz ARM toolchain
   clean         Clean the current work directory
   release       Release an installable tarball
 
 $(boldify "Options:")
-  --up          Update for commands: firmware and kernel
-  --vc          Install the RPi VC libraries in /opt/vc
   --nosat       Don't regenerate the distro with sat
 
 EOT
@@ -70,20 +63,6 @@
 	newline && colorize 35 "$@" && separator
 }
 
-# Get minimal RPi firmware
-get_fw() {
-	mkdir -p $firmware/boot
-	for fw in $fwlist
-	do
-		[ "$up" ] && rm -f $firmware/boot/$fw
-		if [ ! -f "$firmware/boot/$fw" ]; then
-			echo -n "Fetching: $fw"
-			wget -q --no-check-certificate ${fw_url}${fw} \
-				-O $firmware/boot/${fw}; status
-		fi
-	done
-}
-
 # Get all RPi firmware
 clone_fw() {
 	[ -d "${rpi_git}/firmware" ] && return 0
@@ -103,7 +82,6 @@
 case "$1" in
 	info)
 		header "SliTaz Raspberry Pi info"
-		echo "Firmware : $fwlist" 
 		echo "RPi path : $rpi"
 		colorize 36 "/boot/cmdline.txt:"
 		cat ${boot}/cmdline.txt
@@ -162,7 +140,6 @@
 		# Separate boot files since the Raspberry Pi boots off a FAT32 /boot 
 		# partition on the sdcard.
 		: ${flavor=rpi-base}
-		: ${oclock=none}
 		
 		# Use the rootfs generated by sat
 		if [ ! -x "/usr/bin/sat" ]; then
@@ -194,15 +171,6 @@
 			status
 		fi
 		
-		# Boot firmware
-		echo -n "Copying: firmware files..."
-		get_fw
-		for fw in $fwlist
-		do
-			cp ${firmware}/boot/${fw} ${boot}
-		done
-		status
-		
 		# TazBerry
 		echo -n "Copying utility: TazBerry..."
 		cp -f ${rpi}/tazberry ${rootfs}/usr/bin
@@ -214,31 +182,6 @@
 		cp -f ${rpi}/piboot ${rootfs}/sbin
 		status
 		
-		# RPi VC libraries
-		if [ "$vc" ]; then
-			vc="${rootfs}/opt/vc"
-			if [ ! -d "$firmware/opt/vc" ]; then
-				error "Missing firmware git repository" && exit 1
-			fi
-			echo -n "Copying: standard VC libraries"
-			cp -a ${firmware}/opt ${rootfs}
-			# --> armv6hf
-			#cp -a ${firmware}/hardfp/opt ${rootfs}
-			chown -R root.root ${rootfs}/opt
-			status
-			echo -n "Cleaning: VC libraries devel files"
-			cross_tools="/cross/${arch}/tools/bin"
-			rm -rf ${vc}/include ${vc}/src ${vc}/lib/*.a
-			${cross_tools}/${arch}-slitaz-linux-gnueabi-strip -s ${vc}/lib/*.so
-			status
-			# PATH + LD_LIBRARY_PATH
-			echo -n "Enabling: /opt/vc/bin /opt/vc/lib"
-			echo -e '\n# Raspberry Pi VC tools and libs' >> ${rootfs}/etc/profile
-			echo 'export PATH=$PATH:/opt/vc/bin' >> ${rootfs}/etc/profile
-			echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/vc/lib' \
-				>> ${rootfs}/etc/profile; status
-		fi
-		
 		# Kernel at last
 		. $cache/linux-*/receipt
 		kvers="$VERSION"
@@ -333,9 +276,6 @@
 EOT
 		tazpkg pack linux-$kvers ;;
 	
-	get-fw)
-		get_fw ;;
-	
 	clone-fw)
 		clone_fw ;;