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

2 files changed, 42 insertions, 4 deletions

diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index f4f4a2a0..962a269a 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 28231 SHA256 093cb213662b77cca90b629bcbb2e4cd5a312cc08f5527858f787a5fc6ca0d0a SHA512 8848bee7ea5437509a31f845b248f3488626138c538b70399f44081e96f130dace0af3e7fce13800cdc363ba5d4196b23890ed93d5a82b2ab64a7497e31c612b WHIRLPOOL d90d1e33a1062b568f8cb6625183854eac2b940cd07a1618fbe7f847cc82dc248131bf3d67f122d918aaef9a10e5ca6e5e60ca6219614e84caf7b6b5f7f33a06
+AUX raspberrypi-firmware-config.txt 29919 SHA256 cce9446e414304878a6659f09c842bb82227c8b4d4cf50ad31f5a4ca6c67bf0a SHA512 1488214a078ed08658797f005710f1a5612c87bc5e1a284b5af7232bc940543b24fa0fef1a3a1008ff3864023632f8d10efd9308d5c176b161cc9c60528baac0 WHIRLPOOL 6444ad75216d75be80da758f7081dd3857c2a248b89859c2f0796dedc65432bbcdbd9dbb753dfdc6d35050e3c3999b4917bb5d767a80631a5b8b1bafe158e703
 AUX raspberrypi-firmware-envd 52 SHA256 514e767266ba32e81fa8fb58ee8f5b5ad9799963c2dd4761eb2c442122c240d3 SHA512 ce6aab6503cdf6f084cdf7b525ddf4ecdc19d10e439bd0b2f48f1beefcedd4d7eb8d5d203acc7b8b437ee1766653ba743124352c39f67bab6418db80e7b5215b WHIRLPOOL addc92da51a823b4f68dd25dc1bced57e496387ca3d8505523764189180b196c908ff9ff0ebfcc2a469dcfd4fb5cb361b302b12056f52729d5eecfd36498463d
 EBUILD raspberrypi-firmware-0.9999.ebuild 5763 SHA256 508861769e397e9a6ef646f86596ed87a276d3b5d34dae75bbdfef26818eff63 SHA512 efe30ac6d32c58168f3bd9c31a88099395ce6039de02a751d22a95e2f8677f0cc9d164f7723648027444015ed8e97df587ccb218426af35559192636273dd864 WHIRLPOOL e26219a4f647b690ae58525fb9e75c937751ffffd87101d5c679264a41c9fb3c2a1a0b2f98eb11c63f9ffed2557050b2886369ba9ccff7d8e7ddf9377c89f94d
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-config.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-config.txt
index c0cf6dfe..5f017c52 100644
--- a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-config.txt
+++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-config.txt
@@ -56,6 +56,36 @@
 #start_file=start_x.elf
 #fixup_file=fixup_x.dat
 
+[pi3]
+# When using experimental start.elf and bootcode.bin files from the 'next'
+# branch:
+#  https://github.com/raspberrypi/firmware/raw/next/boot/start.elf
+#  https://github.com/raspberrypi/firmware/raw/next/boot/bootcode.bin
+# ... and having enabled the option below to allow the VideoCore OTP memory to
+# be updated with the ability to act as a USB host and locate the VideoCore
+# configuration and binaries and so boot from a connected USB mass-storage
+# device... although by default there will be a 5-second delay unless
+# a blank SD card is inserted, and any valid SD card will still be used in
+# preference.
+# This update can be confirmed by checking that the output of:
+#  vcgencmd otp_dump | grep '^17:'
+# ... is "17:3020000a".
+# Please note that this option is irreversible, and once a given SoC has been
+# booted with this option set then it will have no further effect.
+#program_usb_boot_mode=1
+
+# Wait for 5 seconds for USB devices, rather than 2 - useful to ensure that
+# hard discs have spun-up... please note that this also cannot be un-set once
+# applied.
+# This can also be tested in a reversible way by attempting to boot with an SD
+# card inserted containing a file named 'TIMEOUT' on the first FAT32 partition.
+#program_usb_boot_timeout=1
+
+# Some versions of the bootrom code are unable to process FAT32 partitions of
+# greater than 100GB in size, so separating the VideoCore initialisation code
+# from the working partition(s) is a good idea!
+[all]
+
 # Explicitly cause the extended firmware to be loaded, requires at least 128MB
 # GPU memory.
 #start_x=1
@@ -89,6 +119,7 @@
 # 'kernel8.img', which will then be automatically booted in 64-bit mode.
 [all]
 
+[pi2]
 # Allow 1.2mA current-draw in total between over all four of the Raspberry Pi
 # Model B+ and Raspberry Pi Model 2 USB ports, up from 600mA.
 # When set, GPIO38 is permantently held high.
@@ -96,6 +127,10 @@
 # N.B.: This requires a reliable high-quality power-supply rated for a current
 #       of 2A or more...
 #max_usb_current=1
+[pi1]
+# Model B+ only!
+#max_usb_current=1
+[all]
 
 # Override SMSC9512/9514 MAC address:
 #smsc95xx.macaddr=B8:27:EB:aa:bb:cc
@@ -114,7 +149,7 @@ disable_audio_dither=1
 # Device Tree configuration options
 #
 # Complete w.r.t. boot/overlays/README as-of
-# commit 18b5b6977d021937d82fb94010c99d84b403a08a.
+# commit f09dba0423cc78932b81ef54f003505b3155f239.
 #
 
 # Log DT diagnostics, to be collected via 'vcdbg log msg':
@@ -148,6 +183,7 @@ disable_audio_dither=1
 #device_tree_param=pwr_led_activelow=off
 #device_tree_param=pwr_led_gpio=35
 [pi3]
+#device_tree_overlay=pi3-disable-wifi
 #device_tree_overlay=pi3-disable-bt
 #device_tree_overlay=pi3-miniuart-bt
 #device_tree_overlay=pi3-act-led,activelow=off,gpio=47
@@ -248,9 +284,9 @@ disable_audio_dither=1
 #device_tree_overlay=i2s-mmap
 #device_tree_overlay=i2c-gpio,i2c_gpio_sda=23,i2c_gpio_scl=24,i2c_gpio_delay_us=2
 
-#device_tree_overlay=bmp085_i2c-sensor
 #device_tree_overlay=dht11,gpiopin=4
 #device_tree_overlay=enc28j60,int_pin=25,speed=12000000
+#device_tree_overlay=enc28j60-spi2,int_pin=39,speed=12000000
 #device_tree_overlay=rpi-sense
 #device_tree_overlay=at86rf233,interrupt=23,reset=24,sleep=25,speed=3000000,trim=15
 #device_tree_overlay=qca7000,int_pin=23,speed=12
@@ -259,10 +295,12 @@ disable_audio_dither=1
 
 # The following overlays have been removed:
 ##device_tree_overlay=i2c-mux-pca9548a,addr=0x70
+##device_tree_overlay=bmp085_i2c-sensor
 
 # I2C:
 #device_tree_overlay=mcp23017,gpiopin=4,addr=0x20
 #device_tree_overlay=sc16is750-i2c,int_pin=24,addr=0x48
+#device_tree_overlay=i2c-sensor,bmp085,bmp280,si7020
 
 # RTC:
 # i2c-rtc supports abx80x, ds1307, ds1339, ds3231, mcp7940x, mcp7941x, pcf2127, pcf8523, and pcf8563 devices.
@@ -818,4 +856,4 @@ kernel=kernel/kernel7.img
 # It is possible to source system parameters from multiple files:
 #include extra-config.txt
 
-# vi: set syntax=config colorcolumn=80:
+# vi: set syntax=config colorcolumn=80 nowrap: