Update file raspberrypi-firmware-config.txt for sys-boot/raspberrypi-firmware-0.9999

3 files changed, 63 insertions, 13 deletions

diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index f8e352e1..94fec76f 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -1,4 +1,4 @@
 AUX raspberrypi-firmware-cmdline.txt 127 SHA256 a5ef22a89457706ab4c8cb974d72a9ac6910fa44b9f23b85ebe22c7af6774654 SHA512 238b238bd7d0ce62a65f17a1082165601444e5f105a4bf5539c8ee3aed42fe4c8bce02ca2562409cd00308e1699a6a35d7b9c70729ed22443e181cb12c89392d WHIRLPOOL 79f4f02e06e6835f5c04d11afb3949630d16a89cad609dfa99ef540cf0707e13b3de4958ecdf5d7727a15b98891f2e70b967d50b34b8cf3a6c2547df45103ccb
-AUX raspberrypi-firmware-config.txt 17870 SHA256 906005b75428999aaddfe44e62d383c7c9ccd6aebbef54a79a90012f80d8d01e SHA512 b22ea8d0907f9c4d866b07ef6211a6d90a03917c0c50bba57e0e9ffb09f6f6563556a09ddc9cefb3864a843dcd5c96a16946fc246d89e6af93a3e01d97355e9e WHIRLPOOL a7635e26c469bf5354762f88cdedee562bb9f5ef1fed915f91c8401eeeda0d7a9472c51c537b5fa2421457d02f81272a97c8e9193d6b510c6af4d48e956ba36d
+AUX raspberrypi-firmware-config.txt 18651 SHA256 fdb9e94728d5b0c3e972a053f7cadf942f1c8dc87ae08bad7b9dea8a41456572 SHA512 3f1de5be6345954de4ccd77047a89a7b3b3fa64426415d1e2006ae2c9b13e0bfecb910c7b5bf2ed596d8cc071d1b029c599c64637d4e19c8b9296a1663bd8dac WHIRLPOOL ccc8a388ec4e3e644c060e310855639b769c4507a410f7c4ca383da557d5275405ba8ec1d881aee9d53b8d6c07e035f0f700a5541f2e93bfd0b9b7288898bdec
 AUX raspberrypi-firmware-envd 52 SHA256 514e767266ba32e81fa8fb58ee8f5b5ad9799963c2dd4761eb2c442122c240d3 SHA512 ce6aab6503cdf6f084cdf7b525ddf4ecdc19d10e439bd0b2f48f1beefcedd4d7eb8d5d203acc7b8b437ee1766653ba743124352c39f67bab6418db80e7b5215b WHIRLPOOL addc92da51a823b4f68dd25dc1bced57e496387ca3d8505523764189180b196c908ff9ff0ebfcc2a469dcfd4fb5cb361b302b12056f52729d5eecfd36498463d
-EBUILD raspberrypi-firmware-0.9999.ebuild 4640 SHA256 4cd56e5a0364ec24bc0d9aae9951839cce298de272099d4fdfe257128a9f38e4 SHA512 517f4e29a0dcd0263eea2a2be6283970fa5af0116a95ad4e01ff5c4f0bbd98d54c8f40717394e7991408f3a33ca6e80a460ab8cfef16ab15ff2a0734ca0fc28b WHIRLPOOL 33a06646b99f60e59359f81d32c584f41f6b2f2c28d6afa5fa068a3269c62faa49432abf6b6bd129f7b7b1423f49951f2eb48331aafa39652e657a663e7f9045
+EBUILD raspberrypi-firmware-0.9999.ebuild 5452 SHA256 bb979cb0ef382dc8f83762e930af62bb40ace27ae1e920d1a47f8e50b6722033 SHA512 e3a355a83e8fe5b48ca43218becbb379fdbe716744e4d2af39f44daf520e7be89eaf61d908988df7eedb9e622cfb0cd89a6e5fadc7793281b0769b0de6ea8067 WHIRLPOOL 9f82a0b06a46549a49088ddf93b70276ac00078cb2c5342b8fd2f07108af1b0c4d0d6df6d8378fdfbe5ac49b1017d74d8565add484c9c148832b7b8f26fcebcc
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-config.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-config.txt
index fd8fc606..b9a95978 100644
--- a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-config.txt
+++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-config.txt
@@ -78,7 +78,7 @@ disable_audio_dither=1
 # Device Tree configuration options
 #
 # Complete w.r.t. boot/overlays/README as-of
-# commit 2cdcc5aa8d8d81ca783f58b3232b4305ad36b38b.
+# commit d56bf185f0f9e1cc2d9090970a2db1f6ebe76bb2.
 #
 
 # Log DT diagnostics, to be collected via 'vcdbg log msg':
@@ -133,7 +133,7 @@ disable_audio_dither=1
 # 275	69		55,69,92
 # 300	50,75		60,75,100
 # 325	55,82		55,65,82,(109)
-# 350	59,88		59,70,88.(117)
+# 350	59,88		59,70,88,(117)
 # 375	63,94		54,63,75,94
 # 400	67,100		58,67,80,100
 # 425	54,71,(107)	54,61,71,85,(107)
@@ -153,12 +153,16 @@ disable_audio_dither=1
 
 # Uncomment one of these lines to enable additional devices
 #device_tree_overlay=gpio-poweroff
+#device_tree_overlay=smi
+#device_tree_overlay=smi-dev
+#device_tree_overlay=smi-nand
 #device_tree_overlay=i2s-mmap
 
 #device_tree_overlay=bmp085_i2c-sensor
 #device_tree_overlay=dht11
 #device_tree_overlay=enc28j60
 #device_tree_overlay=rpi-sense
+#device_tree_overlay=at86rf233
 
 # RTC:
 # i2c-rtc supports ds1307, ds3231, mcp7941c, pcf2127, pcf8523, and pcf8563.
@@ -255,7 +259,12 @@ disable_audio_dither=1
 #disable_commandline_tags=0
 
 # Provide kernel arguments directly rather than in cmdline.txt
-cmdline=dwc_otg.lpm_enable=0 console=tty0 console=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline rootwait zcache
+# N.B. The firmware config.txt parser has a 79-character limit, limiting the
+#      usefulness of this option...
+#cmdline=dwc_otg.lpm_enable=0 console=tty0 console=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline rootwait zcache
+#
+# The file from which command-line arguments are read can be customised:
+#cmdline cmdline.txt
 
 # Prevent the shorting of GPIO pins 5 & 6 to load kernel_emergency.img...
 # N.B.: Removed as of 20140318, but NOOBS still uses the same GPIO pins to
@@ -266,7 +275,12 @@ cmdline=dwc_otg.lpm_enable=0 console=tty0 console=ttyAMA0,115200 root=/dev/mmcbl
 # Kernel load-address.
 #kernel_address=
 
-# Load kernel at 0x0, and maintain HYP mode rather than dropping to SVC mode.
+# Load kernel at 0x0, and maintain HYP mode rather than dropping to SVC mode on
+# RPi2 hardware.
+# N.B. Requires a bootloader prepended to the kernel image, see
+#      https://github.com/slp/rpi2-hyp-boot and http://blog.flexvdi.es//?p=139
+# Update: The kernel is now started in HYP mode regardless, see
+#         https://github.com/raspberrypi/firmware/issues/369
 #kernel_old=1
 
 #ramfsfile=
@@ -460,7 +474,8 @@ kernel=kernel/kernel7.img
 # Don't dedicate a PLL to analogue PWM audio, reducing quality slightly.
 # This unlinks core_freq from the rest of the GPU, giving more overclocking
 # control.
-avoid_pwm_pll=1
+#avoid_pwm_pll=1
+# Removed and made default as of ba7a8fb709adab287495f4e836b1cd3e5c9db409.
 
 # Prevent a red square (over-temperature) or rainbow square (under-voltage)
 # from being displayed at the top-right of video ouput when error conditions
@@ -601,4 +616,7 @@ avoid_pwm_pll=1
 #temp_limit=80 # Will throttle to default clock speed if hit
 #initial_turbo=60 # Does not affect warranty, speeds up boot
 
+# It is possible to source system parameters from multiple files:
+#include extra-config.txt
+
 # vi: set syntax=config:
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0.9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0.9999.ebuild
index c501b0e6..6aaf2d79 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0.9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0.9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+#inherit git-r3 mount-boot subversion
 inherit git-r3 mount-boot
 
 DESCRIPTION="Raspberry PI boot loader and firmware"
@@ -11,18 +12,49 @@ SRC_URI=""
 LICENSE="GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
 KEYWORDS="arm -*"
+#IUSE="+rpi1 +rpi2 svn"
 IUSE="+rpi1 +rpi2"
 
-DEPEND=""
-RDEPEND=""
+#DEPEND="svn? ( dev-vcs/subversion )"
+#RDEPEND=""
 
-EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
-EGIT_CLONE_TYPE="shallow" # The current repo is ~4GB in size, but contains only
-						  # ~200MB of data - the rest is (literally) history :(
+REPO_URI="https://github.com/raspberrypi/firmware"
+#if use svn; then
+#	GITHUB_REV="$( svn log --with-revprop git-commit --xml "${REPO_URI}" 2>/dev/null | head -n 9 | grep "revision" | grep -o '[0-9]\+' )"
+#	ESVN_REPO_URI="https://github.com/raspberrypi/firmware/trunk/boot@${GITHUB_REV}"
+#else
+	EGIT_REPO_URI="${REPO_URI}"
+	EGIT_CLONE_TYPE="shallow" # The current repo is ~4GB in size, but contains
+							  # only ~200MB of data - the rest is (literally)
+							  # history :(
+#fi
 
 RESTRICT="binchecks strip"
 #QA_PREBUILT=""
 
+# Gentoo doesn't support conditional inheritance, and GLEP54-style versioning
+# never seems to have got off the ground :(
+#if use svn; then
+#	function git-r3_src_fetch() {
+#		true
+#	}
+#	function git-r3_src_unpack() {
+#		true
+#	}
+#	function git-r3_pkg_needrebuild() {
+#		true
+#	}
+#else
+#	function subversion_src_unpack() {
+#		true
+#	}
+#	function subversion_src_prepare() {
+#		true
+#	}
+#	function subversion_pkg_preinst() {
+#		true
+#	}
+#fi
 
 pkg_setup() {
 	local state boot="${RASPBERRYPI_BOOT:-/boot}"
@@ -123,7 +155,7 @@ src_install() {
 
 	insinto /boot
 	newins "${FILESDIR}"/${PN}-config.txt config.txt
-	#newins "${FILESDIR}"/${PN}-cmdline.txt cmdline.txt
+	newins "${FILESDIR}"/${PN}-cmdline.txt cmdline.txt
 
 	# There's little or no standardisation in regards to where System.map
 	# should live, and the only two common locations seem to be /boot and /