rpi-firmware: update to a recent commit

The purpose of this update being primarily for RPi4 support to ease the
burden of anyone wanting to try -CURRENT and assist with driver -- note that
we currently don't support ethernet/usb/pci on the RPi4.

Some cleanup has also been done to not duplicate variables that the ports
framework already provides (${WRKSRC_${tag}}) and simplify.

This update does include a rename of some dtb that will require a
corresponding change in base to ^/release, which will follow this commit.

Approved by:	manu (maintainer (uboot), ports)
This commit is contained in:
Kyle Evans 2019-12-05 16:15:16 +00:00
parent 920cc3d333
commit b23f371b26
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=519089
6 changed files with 80 additions and 19 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= rpi-firmware
PORTVERSION= 1.20181112
PORTVERSION= 1.20190925.g20191122
CATEGORIES= sysutils
MAINTAINER= uboot@FreeBSD.org
@ -18,15 +18,15 @@ USE_GITHUB= yes
GH_ACCOUNT= raspberrypi gonzoua:pscimon
GH_PROJECT= firmware rpi3-psci-monitor:pscimon
PSCI_TAG= 2b8890a
GH_TAGNAME= ${PSCI_TAG}:pscimon
PSCI_MONITOR= rpi3-psci-monitor-${PSCI_TAG}
PSCI_DIR= ${WRKDIR}/${PSCI_MONITOR}
FW_TAG= 2042453
PSCI_TAG= 6bfbaff
GH_TAGNAME= ${FW_TAG} ${PSCI_TAG}:pscimon
BUILD_WRKSRC= ${PSCI_DIR}
BUILD_WRKSRC= ${WRKSRC_pscimon}
INSTALL_DIR= ${PREFIX}/share/${PORTNAME}
CONFIG_TXT_FILES= config.txt config_rpi_0_w.txt config_rpi3.txt
CONFIG_TXT_FILES= config.txt config_rpi_0_w.txt config_rpi3.txt \
config_rpi4.txt
do-patch:
.for i in ${CONFIG_TXT_FILES}
@ -40,6 +40,7 @@ post-patch:
do-install:
${MKDIR} ${STAGEDIR}/${INSTALL_DIR}
cd ${WRKSRC}/boot && ${COPYTREE_SHARE} . ${STAGEDIR}/${INSTALL_DIR}/
${INSTALL_DATA} ${PSCI_DIR}/armstub8.bin ${STAGEDIR}/${INSTALL_DIR}/
${INSTALL_DATA} ${WRKSRC_pscimon}/armstub8.bin \
${WRKSRC_pscimon}/armstub8-gic.bin ${STAGEDIR}/${INSTALL_DIR}/
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
TIMESTAMP = 1549301871
SHA256 (raspberrypi-firmware-1.20181112_GH0.tar.gz) = eccb3221fe5fbf9e44e7d1a79b2f401eb7527a41fb8ea7fe7231bc188a8ff50b
SIZE (raspberrypi-firmware-1.20181112_GH0.tar.gz) = 122927533
SHA256 (gonzoua-rpi3-psci-monitor-2b8890a_GH0.tar.gz) = a7b89678adea178359646a1e95a078d5c60d23821ba355f27f14ed7b28f32f4d
SIZE (gonzoua-rpi3-psci-monitor-2b8890a_GH0.tar.gz) = 5115
TIMESTAMP = 1574475562
SHA256 (raspberrypi-firmware-1.20190925.g20191122-2042453_GH0.tar.gz) = a90ce74236fa04cbb11232c077a1271afdeefb5b0af417a88076c4948e569cd4
SIZE (raspberrypi-firmware-1.20190925.g20191122-2042453_GH0.tar.gz) = 186178244
SHA256 (gonzoua-rpi3-psci-monitor-6bfbaff_GH0.tar.gz) = c58a5f90af46c5c16daf5a67eb646c65870ea400fe9831b2951251a4e1159f86
SIZE (gonzoua-rpi3-psci-monitor-6bfbaff_GH0.tar.gz) = 5581

View File

@ -2,6 +2,6 @@ arm_control=0x200
dtparam=audio=on,i2c_arm=on,spi=on
dtoverlay=mmc
dtoverlay=pwm
dtoverlay=pi3-disable-bt
dtoverlay=disable-bt
device_tree_address=0x4000
kernel=u-boot.bin

View File

@ -0,0 +1,7 @@
arm_control=0x200
arm_64bit=1
dtoverlay=disable-bt
dtoverlay=mmc
device_tree_address=0x4000
kernel=u-boot.bin
armstub=armstub8-gic.bin

View File

@ -3,4 +3,4 @@ enable_uart=1
kernel=u-boot.bin
kernel7=u-boot.bin
dtoverlay=mmc
dtoverlay=pi3-disable-bt
dtoverlay=disable-bt

View File

@ -1,23 +1,35 @@
%%DATADIR%%/COPYING.linux
%%DATADIR%%/LICENCE.broadcom
%%DATADIR%%/armstub8-gic.bin
%%DATADIR%%/armstub8.bin
%%DATADIR%%/bcm2708-rpi-0-w.dtb
%%DATADIR%%/bcm2708-rpi-b-plus.dtb
%%DATADIR%%/bcm2708-rpi-b.dtb
%%DATADIR%%/bcm2708-rpi-cm.dtb
%%DATADIR%%/bcm2708-rpi-zero-w.dtb
%%DATADIR%%/bcm2708-rpi-zero.dtb
%%DATADIR%%/bcm2709-rpi-2-b.dtb
%%DATADIR%%/bcm2710-rpi-2-b.dtb
%%DATADIR%%/bcm2710-rpi-3-b-plus.dtb
%%DATADIR%%/bcm2710-rpi-3-b.dtb
%%DATADIR%%/bcm2710-rpi-cm3.dtb
%%DATADIR%%/bcm2711-rpi-4-b.dtb
%%DATADIR%%/bootcode.bin
%%DATADIR%%/config.txt
%%DATADIR%%/config_rpi3.txt
%%DATADIR%%/config_rpi4.txt
%%DATADIR%%/config_rpi_0_w.txt
%%DATADIR%%/fixup.dat
%%DATADIR%%/fixup4.dat
%%DATADIR%%/fixup4cd.dat
%%DATADIR%%/fixup4db.dat
%%DATADIR%%/fixup4x.dat
%%DATADIR%%/fixup_cd.dat
%%DATADIR%%/fixup_db.dat
%%DATADIR%%/fixup_x.dat
%%DATADIR%%/kernel7l.img
%%DATADIR%%/kernel8.img
%%DATADIR%%/overlays/README
%%DATADIR%%/overlays/act-led.dtbo
%%DATADIR%%/overlays/adau1977-adc.dtbo
%%DATADIR%%/overlays/adau7002-simple.dtbo
%%DATADIR%%/overlays/ads1015.dtbo
@ -31,19 +43,24 @@
%%DATADIR%%/overlays/allo-katana-dac-audio.dtbo
%%DATADIR%%/overlays/allo-piano-dac-pcm512x-audio.dtbo
%%DATADIR%%/overlays/allo-piano-dac-plus-pcm512x-audio.dtbo
%%DATADIR%%/overlays/apds9960.dtbo
%%DATADIR%%/overlays/applepi-dac.dtbo
%%DATADIR%%/overlays/at86rf233.dtbo
%%DATADIR%%/overlays/audioinjector-addons.dtbo
%%DATADIR%%/overlays/audioinjector-ultra.dtbo
%%DATADIR%%/overlays/audioinjector-wm8731-audio.dtbo
%%DATADIR%%/overlays/audiosense-pi.dtbo
%%DATADIR%%/overlays/audremap.dtbo
%%DATADIR%%/overlays/balena-fin.dtbo
%%DATADIR%%/overlays/bmp085_i2c-sensor.dtbo
%%DATADIR%%/overlays/dht11.dtbo
%%DATADIR%%/overlays/dionaudio-loco-v2.dtbo
%%DATADIR%%/overlays/dionaudio-loco.dtbo
%%DATADIR%%/overlays/disable-bt.dtbo
%%DATADIR%%/overlays/disable-wifi.dtbo
%%DATADIR%%/overlays/dpi18.dtbo
%%DATADIR%%/overlays/dpi24.dtbo
%%DATADIR%%/overlays/draws.dtbo
%%DATADIR%%/overlays/dwc-otg.dtbo
%%DATADIR%%/overlays/dwc2.dtbo
%%DATADIR%%/overlays/enc28j60-spi2.dtbo
@ -64,11 +81,15 @@
%%DATADIR%%/overlays/hifiberry-amp.dtbo
%%DATADIR%%/overlays/hifiberry-dac.dtbo
%%DATADIR%%/overlays/hifiberry-dacplus.dtbo
%%DATADIR%%/overlays/hifiberry-dacplusadc.dtbo
%%DATADIR%%/overlays/hifiberry-dacplusadcpro.dtbo
%%DATADIR%%/overlays/hifiberry-dacplusdsp.dtbo
%%DATADIR%%/overlays/hifiberry-digi-pro.dtbo
%%DATADIR%%/overlays/hifiberry-digi.dtbo
%%DATADIR%%/overlays/hy28a.dtbo
%%DATADIR%%/overlays/hy28b-2017.dtbo
%%DATADIR%%/overlays/hy28b.dtbo
%%DATADIR%%/overlays/i-sabre-q2m.dtbo
%%DATADIR%%/overlays/i2c-bcm2708.dtbo
%%DATADIR%%/overlays/i2c-gpio.dtbo
%%DATADIR%%/overlays/i2c-mux.dtbo
@ -77,16 +98,26 @@
%%DATADIR%%/overlays/i2c-rtc.dtbo
%%DATADIR%%/overlays/i2c-sensor.dtbo
%%DATADIR%%/overlays/i2c0-bcm2708.dtbo
%%DATADIR%%/overlays/i2c0.dtbo
%%DATADIR%%/overlays/i2c1-bcm2708.dtbo
%%DATADIR%%/overlays/i2c1.dtbo
%%DATADIR%%/overlays/i2c3.dtbo
%%DATADIR%%/overlays/i2c4.dtbo
%%DATADIR%%/overlays/i2c5.dtbo
%%DATADIR%%/overlays/i2c6.dtbo
%%DATADIR%%/overlays/i2s-gpio28-31.dtbo
%%DATADIR%%/overlays/ilitek251x.dtbo
%%DATADIR%%/overlays/imx219.dtbo
%%DATADIR%%/overlays/irs1125.dtbo
%%DATADIR%%/overlays/iqaudio-codec.dtbo
%%DATADIR%%/overlays/iqaudio-dac.dtbo
%%DATADIR%%/overlays/iqaudio-dacplus.dtbo
%%DATADIR%%/overlays/iqaudio-digi-wm8804-audio.dtbo
%%DATADIR%%/overlays/jedec-spi-nor.dtbo
%%DATADIR%%/overlays/justboom-dac.dtbo
%%DATADIR%%/overlays/justboom-digi.dtbo
%%DATADIR%%/overlays/lirc-rpi.dtbo
%%DATADIR%%/overlays/ltc294x.dtbo
%%DATADIR%%/overlays/max98357a.dtbo
%%DATADIR%%/overlays/mbed-dac.dtbo
%%DATADIR%%/overlays/mcp23017.dtbo
%%DATADIR%%/overlays/mcp23s17.dtbo
@ -94,9 +125,11 @@
%%DATADIR%%/overlays/mcp2515-can1.dtbo
%%DATADIR%%/overlays/mcp3008.dtbo
%%DATADIR%%/overlays/mcp3202.dtbo
%%DATADIR%%/overlays/mcp342x.dtbo
%%DATADIR%%/overlays/media-center.dtbo
%%DATADIR%%/overlays/midi-uart0.dtbo
%%DATADIR%%/overlays/midi-uart1.dtbo
%%DATADIR%%/overlays/miniuart-bt.dtbo
%%DATADIR%%/overlays/mmc.dtbo
%%DATADIR%%/overlays/mpu6050.dtbo
%%DATADIR%%/overlays/mz61581.dtbo
@ -107,6 +140,7 @@
%%DATADIR%%/overlays/pi3-disable-wifi.dtbo
%%DATADIR%%/overlays/pi3-miniuart-bt.dtbo
%%DATADIR%%/overlays/pibell.dtbo
%%DATADIR%%/overlays/piglow.dtbo
%%DATADIR%%/overlays/piscreen.dtbo
%%DATADIR%%/overlays/piscreen2r.dtbo
%%DATADIR%%/overlays/pisound.dtbo
@ -134,13 +168,13 @@
%%DATADIR%%/overlays/sc16is752-i2c.dtbo
%%DATADIR%%/overlays/sc16is752-spi1.dtbo
%%DATADIR%%/overlays/sdhost.dtbo
%%DATADIR%%/overlays/sdio-1bit.dtbo
%%DATADIR%%/overlays/sdio.dtbo
%%DATADIR%%/overlays/sdtweak.dtbo
%%DATADIR%%/overlays/smi-dev.dtbo
%%DATADIR%%/overlays/smi-nand.dtbo
%%DATADIR%%/overlays/smi.dtbo
%%DATADIR%%/overlays/spi-gpio35-39.dtbo
%%DATADIR%%/overlays/spi-gpio40-45.dtbo
%%DATADIR%%/overlays/spi-rtc.dtbo
%%DATADIR%%/overlays/spi0-cs.dtbo
%%DATADIR%%/overlays/spi0-hw-cs.dtbo
@ -150,14 +184,28 @@
%%DATADIR%%/overlays/spi2-1cs.dtbo
%%DATADIR%%/overlays/spi2-2cs.dtbo
%%DATADIR%%/overlays/spi2-3cs.dtbo
%%DATADIR%%/overlays/spi3-1cs.dtbo
%%DATADIR%%/overlays/spi3-2cs.dtbo
%%DATADIR%%/overlays/spi4-1cs.dtbo
%%DATADIR%%/overlays/spi4-2cs.dtbo
%%DATADIR%%/overlays/spi5-1cs.dtbo
%%DATADIR%%/overlays/spi5-2cs.dtbo
%%DATADIR%%/overlays/spi6-1cs.dtbo
%%DATADIR%%/overlays/spi6-2cs.dtbo
%%DATADIR%%/overlays/ssd1306.dtbo
%%DATADIR%%/overlays/superaudioboard.dtbo
%%DATADIR%%/overlays/sx150x.dtbo
%%DATADIR%%/overlays/tc358743-audio.dtbo
%%DATADIR%%/overlays/tc358743.dtbo
%%DATADIR%%/overlays/tinylcd35.dtbo
%%DATADIR%%/overlays/tpm-slb9670.dtbo
%%DATADIR%%/overlays/uart0.dtbo
%%DATADIR%%/overlays/uart1.dtbo
%%DATADIR%%/overlays/upstream-aux-interrupt.dtbo
%%DATADIR%%/overlays/uart2.dtbo
%%DATADIR%%/overlays/uart3.dtbo
%%DATADIR%%/overlays/uart4.dtbo
%%DATADIR%%/overlays/uart5.dtbo
%%DATADIR%%/overlays/udrc.dtbo
%%DATADIR%%/overlays/upstream.dtbo
%%DATADIR%%/overlays/vc4-fkms-v3d.dtbo
%%DATADIR%%/overlays/vc4-kms-kippah-7inch.dtbo
@ -165,8 +213,13 @@
%%DATADIR%%/overlays/vga666.dtbo
%%DATADIR%%/overlays/w1-gpio-pullup.dtbo
%%DATADIR%%/overlays/w1-gpio.dtbo
%%DATADIR%%/overlays/w5500.dtbo
%%DATADIR%%/overlays/wittypi.dtbo
%%DATADIR%%/start.elf
%%DATADIR%%/start4.elf
%%DATADIR%%/start4cd.elf
%%DATADIR%%/start4db.elf
%%DATADIR%%/start4x.elf
%%DATADIR%%/start_cd.elf
%%DATADIR%%/start_db.elf
%%DATADIR%%/start_x.elf