Update file raspberrypi-firmware-config.txt to upstream commit 18971a9d261bd1a0298cd3a11124b31b1e326c3a for sys-boot/raspberrypi-firmware-0.9999

2 files changed, 44 insertions, 51 deletions

diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 90bf7478..adc789ac 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 18869 SHA256 fc1a0bb44ddbecb9d1eccd25ce1dafdca79a9ce7fbecbf050cfad17a8370d2d0 SHA512 9c8f0d117cf679bcaa0aa816f0d40ac7bf8a8a0c0b8ca1277a8d912cefc81092f3ed1661a5fc634d2375791eaed419bcf019e0aeb1166151e714614e7fe837da WHIRLPOOL 203e16889bfccafda821da1b38b3aaf8d458a47a72fd7331d599ff3e3977bc14b70f74cdc28a11077bc58a81c6bd3f57ca651fa88737cd7df7da2834be9a5da3
+AUX raspberrypi-firmware-config.txt 20117 SHA256 52685c8a6011119d9862745a11c12458aa11eeaddf88886f2f3542660028a7a1 SHA512 87772b7a24b6e8dbf96964535e92cee738359b494f98814078d1a2a7adf35b1b6d604dd087abda366e8d8852f79cbee055b112a6849db1b496812731dc7bff19 WHIRLPOOL c19edc373985054e6a7ad2caaeddaba4d2a062a13c6e23e568c643c9000bfa0f996e41afd35a303878feb3ca5e22953d022a60812d8eb008d2c7b32987ba5d51
 AUX raspberrypi-firmware-envd 52 SHA256 514e767266ba32e81fa8fb58ee8f5b5ad9799963c2dd4761eb2c442122c240d3 SHA512 ce6aab6503cdf6f084cdf7b525ddf4ecdc19d10e439bd0b2f48f1beefcedd4d7eb8d5d203acc7b8b437ee1766653ba743124352c39f67bab6418db80e7b5215b WHIRLPOOL addc92da51a823b4f68dd25dc1bced57e496387ca3d8505523764189180b196c908ff9ff0ebfcc2a469dcfd4fb5cb361b302b12056f52729d5eecfd36498463d
 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 d0808753..5c476195 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 45129f23ddd363b736137469c13b0ca12d5b1120.
+# commit 18971a9d261bd1a0298cd3a11124b31b1e326c3a.
 #
 
 # Log DT diagnostics, to be collected via 'vcdbg log msg':
@@ -87,19 +87,19 @@ disable_audio_dither=1
 # Uncomment some or all of these to enable the optional hardware interfaces
 #dtparam=i2c,i2s,spi,watchdog
 
-#device_tree_param=i2c0=off # i2c_vc
+#device_tree_param=audio=off
 #device_tree_param=i2c1=off # i2c_arm/i2c
-#device_tree_param=i2c_vc_baudrate=100000
+#device_tree_param=i2c0=off # i2c_vc
 #device_tree_param=i2c_arm_baudrate=100000 # i2c_baudrate
+#device_tree_param=i2c_vc_baudrate=100000
 #device_tree_param=i2s=off
-#device_tree_param=uart0=on
-#device_tree_param=uart1=off,txd1_pin=14,rxd1_pin=15
 #device_tree_param=spi=off
-#device_tree_param=spi-bcm2708=off
-#device_tree_param=spi-bcm2835=off
-#device_tree_param=spi-dma=off
-#device_tree_param=audio=off
 #device_tree_param=random=on
+#device_tree_param=sd_overclock=50
+#device_tree_param=sd_force_pio=off
+#device_tree_param=sd_pio_limit=1
+#device_tree_param=sd_debug=off
+#device_tree_param=uart0=on
 #device_tree_param=watchdog=off
 #device_tree_param=act_led_trigger=mmc # value 'heartbeat' gives a load-monitor
 #device_tree_param=act_led_activelow=off
@@ -112,6 +112,11 @@ disable_audio_dither=1
 #device_tree_param=pwr_led_gpio=35
 [all]
 
+#device_tree_param=uart1=off,txd1_pin=14,rxd1_pin=15 # tx pins 14, 32, or 40; rx pins 15,33, or 41.
+#device_tree_param=spi-bcm2708=off
+#device_tree_param=spi-bcm2835=off
+#device_tree_param=spi-dma=off
+
 # SD/MMC driver - choose only one
 #
 # For 'mmc', the overclock_50 speed must be an even integer divisor of
@@ -141,15 +146,12 @@ disable_audio_dither=1
 # 475	60,80,(119)	53,60,68,80,95,(119)
 # 500	63,84		56,63,72,84,100
 #
-#device_tree_overlay=mmc
-#device_tree_overlay=mmc,overclock_50=63,force_pio
+#device_tree_overlay=mmc,overclock_50=63
 #
-#device_tree_overlay=sdhost
 #device_tree_overlay=sdhost,overclock_50=84,sdio_overclock=84,force_pio=off,pio_limit=1,debug=off
 #
 # enables SDIO via GPIOs 22-27
-#device_tree_overlay=sdio
-#device_tree_overlay=sdio,overclock_50=84,force_pio=off,pio_limit=1,debug=off,poll_once=on,bus_width=4
+#device_tree_overlay=sdio,overclock_50=84,sdio_overclock=84,force_pio=off,pio_limit=1,debug=off,poll_once=on,bus_width=4
 
 # Eric Anholt's DRM VC4 HDMI/HVS/V3D driver:
 # Running startx or booting to GUI while this overlay is in use will cause
@@ -157,74 +159,65 @@ disable_audio_dither=1
 #device_tree_overlay=vc4-kms-v3d
 
 # Uncomment one of these lines to enable additional devices
-#device_tree_overlay=gpio-poweroff
-#device_tree_overlay=smi
+#device_tree_overlay=gpio-poweroff,gpiopin=26 # ,active_low
+#device_tree_overlay=smi # Uses GPIOs 2-25!
 #device_tree_overlay=smi-dev
 #device_tree_overlay=smi-nand
 #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
-#device_tree_overlay=enc28j60
+#device_tree_overlay=dht11,gpiopin=4
+#device_tree_overlay=enc28j60,int_pin=25,speed=12000000
 #device_tree_overlay=rpi-sense
-#device_tree_overlay=at86rf233
+#device_tree_overlay=at86rf233,interrupt=23,reset=24,sleep=25,speed=3000000,trim=15
 
 # RTC:
-# i2c-rtc supports ds1307, ds3231, mcp7941c, pcf2127, pcf8523, and pcf8563.
+# i2c-rtc supports ds1307, ds3231, mcp7941x, pcf2127, pcf8523, and pcf8563.
 #device_tree_overlay=i2c-rtc,ds1307
-#device_tree_overlay=ds1307-rtc # Removed
-#device_tree_overlay=pcf2127-rtc
-#device_tree_overlay=pcf8523-rtc
 
 # Pulse-per-second:
 #device_tree_overlay=pps-gpio,gpiopin=18
-#device_tree_overlay=pwm
-#device_tree_overlay=pwm-2chan
+#device_tree_overlay=pwm,pin=18,func=2,clock=? # Plus models & Pi2 support pin={12,13,18}
+#device_tree_overlay=pwm-2chan,pin=18,pin2=19,func=2,func2=2,clock=?
 
 # Dallas 1-wire:
-#device_tree_overlay=w1-gpio,gpiopin=4,pullup=0
-#device_tree_overlay=w1-gpio-pullup,gpiopin=4,pullup=0,extpullup=5
+#device_tree_overlay=w1-gpio,gpiopin=4,pullup=off
+#device_tree_overlay=w1-gpio-pullup,gpiopin=4,pullup=off,extpullup=5
 
 # Audio devices:
 #device_tree_overlay=hifiberry-amp
 #device_tree_overlay=hifiberry-dac
-#device_tree_overlay=hifiberry-dacplus
+#device_tree_overlay=hifiberry-dacplus # ,24db_digital_gain
 #device_tree_overlay=hifiberry-digi
 #device_tree_overlay=iqaudio-dac
-#device_tree_overlay=iqaudio-dacplus
+#device_tree_overlay=iqaudio-dacplus # ,24db_digital_gain
 #device_tree_overlay=raspidac3
 #device_tree_overlay=rpi-dac
 #device_tree_overlay=rpi-proto
 
 # Touch Screens and Displays:
-#device_tree_overlay=ads7846
-#device_tree_overlay=hy28a
-#device_tree_overlay=hy28b
-#device_tree_overlay=mz61581
-#device_tree_overlay=piscreen
-#device_tree_overlay=piscreen2r
-#device_tree_overlay=pitft28-capacitive
-#device_tree_overlay=pitft28-resistive
+#device_tree_overlay=ads7846,cs=1,speed=2,penirq=<gpio>,penirq_pull={0,2},swapxy,xmin=0,ymin=0,xmax=4095,ymax=4095,pmin=0,pmax=65535,xohms=400
+#device_tree_overlay=hy28a,speed=?,rotate=0,fps=?,debug=[0-7],xohms=?,resetgpio=?,ledgpio=?
+#device_tree_overlay=hy28b,speed=?,rotate=0,fps=?,debug=[0-7],xohms=?,resetgpio=?,ledgpio=?
+#device_tree_overlay=mz61581,speed=?,rotate=0,fps=?,txbuflen=32768,debug=[0-7],xohms=?
+#device_tree_overlay=piscreen,speed=?,rotate=0,fps=?,debug=[0-7],xohms=?
+#device_tree_overlay=piscreen2r,speed=?,rotate=0,fps=?,debug=[0-7],xohms=?
+#device_tree_overlay=pitft28-capacitive,speed=?,rotate=0,fps=?,debug=[0-7],touch-sizex=240,touch-sizey=320 # ,touch-invx,touch-invy,touch-swapxy
+#device_tree_overlay=pitft28-resistive,speed=?,rotate=0,fps=?,debug=[0-7]
 #device_tree_overlay=rpi-backlight
-#device_tree_overlay=rpi-display
+#device_tree_overlay=rpi-display,speed=?,rotate=0,fps=?,debug=[0-7],xohms=?
 #device_tree_overlay=rpi-ft5406
-#device_tree_overlay=tinylcd35
-#device_tree_overlay=vga666
+#device_tree_overlay=tinylcd35,speed=?,rotate=0,fps=?,debug=[0-7],touchgpio=?,xohms=? # ,touch,rtc-pcf,rtc-ds,keypad
+#device_tree_overlay=vga666 # Uses GPIOs 2-21!
 
 # CAN controllers:
-#device_tree_overlay=mcp2515-can0
-#device_tree_overlay=mcp2515-can1
+#device_tree_overlay=mcp2515-can0,oscillator=?,spimaxfrequency=?,interrupt=?
+#device_tree_overlay=mcp2515-can1,oscillator=?,spimaxfrequency=?,interrupt=?
 
 # Infrared receiver:
-#device_tree_overlay=gpio-ir
-#device_tree_overlay=lirc-rpi
-
-# Uncomment this to override the defaults for the lirc-rpi module
-#device_tree_param=gpio_out_pin=16
-#device_tree_param=gpio_in_pin=17
-#device_tree_param=gpio_in_pull=down
-
+#device_tree_overlay=gpio-ir,gpio_pin=18,gpio_pull=down,rc-map-name=rc-rc6-mce
+#device_tree_overlay=lirc-rpi,gpio_out_pin=17,gpio_in_pin=18,gpio_in_pull=down,sense=-1,softcarrier=on,invert=off,debug=off
 
 #
 # Memory Options