diff options
author | Peter Alfredsen <crabbedhaloablution@icloud.com> | 2020-11-22 15:28:14 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2020-11-23 04:39:17 +0000 |
commit | 7b070b6db76f641cfd37abedf201b9fd120bb5e5 (patch) | |
tree | 04c643931047b05420279dc3787319a47acc76bc /sys-boot/raspberrypi-firmware | |
parent | sys-kernel/raspberrypi-image: Simple bump to 5.4.72_p20201022 (diff) | |
download | gentoo-7b070b6db76f641cfd37abedf201b9fd120bb5e5.tar.gz gentoo-7b070b6db76f641cfd37abedf201b9fd120bb5e5.tar.bz2 gentoo-7b070b6db76f641cfd37abedf201b9fd120bb5e5.zip |
sys-boot/raspberrypi-firmware: Bump to 20201022, keeping -9999 on par
Add new cmdline.txt and config.txt from upstream
Closes: https://bugs.gentoo.org/715984
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Peter Alfredsen <crabbedhaloablution@icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/18362
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-boot/raspberrypi-firmware')
5 files changed, 152 insertions, 3 deletions
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest index 2570229caf31..2d1c89bcef4e 100644 --- a/sys-boot/raspberrypi-firmware/Manifest +++ b/sys-boot/raspberrypi-firmware/Manifest @@ -1,3 +1,4 @@ DIST raspberrypi-firmware-1.20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193 DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522 DIST raspberrypi-firmware-1.20190925.tar.gz 185571086 BLAKE2B c3a9b2760fa853fbd1dd09bc4048c9e78594f88da5af608c3a761554d4046a4c869db8981c64140a24e82e0a61b8dc776bb8d895df60c6424e44780f78b18cb0 SHA512 4b7b29cc6c2a33d7a37987c492034d9afbb2220364c50cf265e0adf8e5f393c2275dcffaa77c89b3f43b2e98d199741b67590cb60ff8beae8ef677852f63b4a0 +DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8 diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt new file mode 100644 index 000000000000..b815bd89db1f --- /dev/null +++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt @@ -0,0 +1 @@ +console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt new file mode 100644 index 000000000000..548f4accc250 --- /dev/null +++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt @@ -0,0 +1,65 @@ +# For more options and information see +# http://rpf.io/configtxt +# Some settings may impact device functionality. See link above for details + +# uncomment if you get no picture on HDMI for a default "safe" mode +#hdmi_safe=1 + +# uncomment this if your display has a black border of unused pixels visible +# and your display can output without overscan +#disable_overscan=1 + +# uncomment the following to adjust overscan. Use positive numbers if console +# goes off screen, and negative if there is too much border +#overscan_left=16 +#overscan_right=16 +#overscan_top=16 +#overscan_bottom=16 + +# uncomment to force a console size. By default it will be display's size minus +# overscan. +#framebuffer_width=1280 +#framebuffer_height=720 + +# uncomment if hdmi display is not detected and composite is being output +#hdmi_force_hotplug=1 + +# uncomment to force a specific HDMI mode (this will force VGA) +#hdmi_group=1 +#hdmi_mode=1 + +# uncomment to force a HDMI mode rather than DVI. This can make audio work in +# DMT (computer monitor) modes +#hdmi_drive=2 + +# uncomment to increase signal to HDMI, if you have interference, blanking, or +# no display +#config_hdmi_boost=4 + +# uncomment for composite PAL +#sdtv_mode=2 + +#uncomment to overclock the arm. 700 MHz is the default. +#arm_freq=800 + +# Uncomment some or all of these to enable the optional hardware interfaces +#dtparam=i2c_arm=on +#dtparam=i2s=on +#dtparam=spi=on + +# Uncomment this to enable infrared communication. +#dtoverlay=gpio-ir,gpio_pin=17 +#dtoverlay=gpio-ir-tx,gpio_pin=18 + +# Additional overlays and parameters are documented /boot/overlays/README + +# Enable audio (loads snd_bcm2835) +dtparam=audio=on + +[pi4] +# Enable DRM VC4 V3D driver on top of the dispmanx display stack +dtoverlay=vc4-fkms-v3d +max_framebuffers=2 + +[all] +#dtoverlay=vc4-fkms-v3d diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild new file mode 100644 index 000000000000..b2767ce80518 --- /dev/null +++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit mount-boot readme.gentoo-r1 + +DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware" +HOMEPAGE="https://github.com/raspberrypi/firmware" +LICENSE="GPL-2 raspberrypi-videocore-bin" +SLOT="0" + +# Temporary safety measure to prevent ending up with a pair of +# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware +# none of which installed device tree files. +# Remove when the mentioned version and all older ones are deleted. +RDEPEND="!<=sys-kernel/raspberrypi-image-4.19.57_p20190709" + +if [[ "${PV}" == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/raspberrypi/firmware" + EGIT_CLONE_TYPE="shallow" +else + SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="-* ~arm ~arm64" + S="${WORKDIR}/firmware-${PV}" +fi + +RESTRICT="binchecks strip" + +pkg_preinst() { + if [ -z "${REPLACING_VERSIONS}" ] ; then + local msg="" + if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then + msg+="/boot/cmdline.txt " + fi + if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then + msg+="/boot/config.txt " + fi + if [ -n "${msg}" ] ; then + msg="This package installs following files: ${msg}." + msg="${msg} Please remove(backup) your copies durning install" + msg="${msg} and merge settings afterwards." + msg="${msg} Further updates will be CONFIG_PROTECTed." + die "${msg}" + fi + fi +} + +src_prepare() { + default + cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die + if use arm64; then + # Force selection of the 64-bit kernel8.img to match our userland + echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die + fi +} + +src_install() { + insinto /boot + cd boot || die + doins bootcode.bin fixup*.dat start*elf + newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt + newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt + newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} + +DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt" diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild index 3b499cf2ad55..b2767ce80518 100644 --- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild +++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -47,12 +47,21 @@ pkg_preinst() { fi } +src_prepare() { + default + cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die + if use arm64; then + # Force selection of the 64-bit kernel8.img to match our userland + echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die + fi +} + src_install() { insinto /boot cd boot || die doins bootcode.bin fixup*.dat start*elf - newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt - newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt + newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt + newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} readme.gentoo_create_doc } |