From patchwork Tue Sep 21 20:21:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1530862 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=L+noV124; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HDXt83jQfz9sXV for ; Wed, 22 Sep 2021 06:22:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3437E406CE; Tue, 21 Sep 2021 20:22:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fyvslrn8-smr; Tue, 21 Sep 2021 20:22:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 7EF48406D2; Tue, 21 Sep 2021 20:22:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 099C51BF47E for ; Tue, 21 Sep 2021 20:21:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id DB65D82D49 for ; Tue, 21 Sep 2021 20:21:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=gmx.net Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Zly9cBJoUvYZ for ; Tue, 21 Sep 2021 20:21:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2761B82D45 for ; Tue, 21 Sep 2021 20:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1632255698; bh=HYwJXkFRY+sJkFzVZl2I9PML7NIf/PyMf/5ieim+xZI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=L+noV124ZqcNcXE0Vk4yzpfKv5XkO7oqBWGkb5ENgFGuFczmobnwPGasQ8IMMSldm AV4SSKQhh/uG6eu6m/vDvztkpEPSS2UDEwDo7KFyw9buvh4JJWer5wz+R50WYG1kbX RJ/0YWRkI+iTvlwxVz416AeWdwEGWWHafLl+vg08= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.170]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M26vB-1mQqSp0Vy5-002YlI; Tue, 21 Sep 2021 22:21:38 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Tue, 21 Sep 2021 22:21:32 +0200 Message-Id: <20210921202137.7092-1-ps.report@gmx.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:UJKvOK03SMaO/0PHpiDoE5i/p1wV/1f9SEqKb7KQsVoAeijdmkf JbtPNImXC04RVkLetFBZcjeMzagulKvjiYMDCJ6IQn/99LeMplw/zoiV36MZtn9WJYQj4JI iZmw+eVLTT+7jOs5TfYv5NBS11/s2etSHkuuOlQEvN7l0AkRoGxoy33+Y3CF2YwLmK8YdXR Ohagd4BEBoRTLyE16XD9w== X-UI-Out-Filterresults: notjunk:1;V03:K0:N3BLQQXQ240=:ZAU2eR2WGSJY9/PUkg7zPg HxNWrv1IPMFXucF4l8pEAqJjIhiHFSA0X/VACHQ1sl/zk0P4lhNgCMtBUMkx/O7/0HkmyHHQ1 i05bmPUntL0eWLShg74a/fMhRNrCt8OfiqglEJJeEZFQrno+o2n76hFYZxLfTXqWRhjeUBWF7 Kqmp5mUTv0VxCzbZbzWiLx9bkwgSwezHcKABA5gugY/V0/ZsxnKGouf0md44m/OwZYnvpCyO6 xSkNW5HxoE/r8rLgGxliRdk1N8ik8WiaFpotn4/F49JXuWQxQrqQvB9oUPXMbwcfTZqjkKkVD 1FIKaL/ai8gvxV+hoNrV6ytsS6op8A61lQKrwAfrRa83VMRdYxHnoF4hq5F82SjrzCk7lUmoC RBBDrCr9S2Pn63mwlzSum3jw9gMjWTX0lMFx7FYi1Gx3Aal0DqF2afTTIU1KIqsDvnAKaQVfr mOrbPbl06RzViwaH7KF15GGRsyqO+mdTNFFkYMJT/KjPg9qesWIbqxgd9GJAndkVT8D6ijD9h zCaNm9UGXHWYqJC0d+fTpFwZfyOYleiaDQksKPvSJbNsLunynCAQ76s1fDK09xKWrlBH9hRkV cQG9fKuL5M6jFSsXDRhx2yjKa63dzXtGyQY8ENQQK6GJxGESmTUmUELN4eShmKMdzqfwYD+/a FyIHOWsive8FIfXVx7bLQKNHDNQnyTdcxRfuGP3VcuMLehe2g0VHvEsx3XRqINiEhUR+1e4GZ ll24iquZhJt3vD/wTDJBVpu00YFBv1QiVT/9Cot+7+gBLcnEI2L90+DqDAQV9qDKJ1rSFaHi8 bqtuEo9NIEqMgMq0I5t5zc3umSyIoPWstOC4sIENJpE0pMKVHYL56XcyqX8BnMZea20B++FLG IXB08NenwLGo1kcY0OqE6CgOZbDsAWikFJV5jBEBAsjMyzzLAcavyeQME1NDVhBlaBnr2MHmS yh+Uq8EFoCqapkVdBXU/jnw5gPjXtJ1JfJHsnJesFDIdh2wUtUKfh7rBNkavxilK60FzQEEEJ xqxs1r7CaVO4zVxw6GiP2tzLdi8nSJjYwhxrXv4GVqnN/I4U77HaX0tZqf3iDiV8Qfcuaahgu z26QLepuX1zaOA= Subject: [Buildroot] [PATCH v5 1/6] package/rpi-firmware: rework boot/config file handling X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arthur Courtel , Mahyar Koshkouei , Martin Bark Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" Try to be less smart (focused on the one target/one use-case), instead reduce the rpi-firmware package to a selectable list of (verbatim) installed firmware files. - change rpi-firmware config handling from rpi-variant/rpi-flavour choices to bootcode.bin, pi-default/-extended/-cut-down and pi4-/default/-extended/-cut-down selection - add BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE option to select installable config.txt file - remove config.txt modify code/handling from raspberry post-image.sh script - add different customized config.txt files to the raspberry board section - change dtoverlay krnbt from 'dtoverlay=miniuart-bt,krnbt=on' to extra line with explanation comment - change raspberry defconfigs to select appropiate rpi-firmware and config.txt files - change genimage-raspberrypi4.cfg/genimage-raspberrypi4-64.cfg to use start4.elf and fixup4.dat - update board/raspberrypi/readme.txt (add optional files fixup4.dat, start4.elf and zImage) With this changes a better support for custom use-cases should be possible, specially multi-target SD cards as suggested by Stefan Agner ([1]). [1] http://lists.busybox.net/pipermail/buildroot/2021-February/303318.html Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - update genimage-raspberrypi4.cfg/genimage-raspberrypi4-64.cfg to use start4.elf and fixup4.dat Changes v2 -> v3: - remove duplicated BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 from configs/raspberrypi4_64_defconfig - fix BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE entry from configs/raspberrypi4_64_defconfig - change firmware list to one-assignment style (suggested by Yann E. MORIN) - change firmware install to make-level foreach loop (suggested by Yann E. MORIN) Changes v3 -> v4: - fix config.in typo (Patch vs. Path) - fix 64bit config.txt files (kernel image name zImage vs. Image, previously done by 'post-image.sh --aarch64') Changes v4 -> v5: - rebased - incorporate krnbt option - add rework boot/config file handling for cm4io and cm4io_64 - update board/raspberrypi/readme.txt --- board/raspberrypi/config_0w.txt | 29 +++++++ board/raspberrypi/config_3.txt | 29 +++++++ board/raspberrypi/config_3_64bit.txt | 32 ++++++++ board/raspberrypi/config_3_qt5we.txt | 26 +++++++ board/raspberrypi/config_4.txt | 29 +++++++ board/raspberrypi/config_4_64bit.txt | 36 +++++++++ board/raspberrypi/config_cm4io.txt | 26 +++++++ board/raspberrypi/config_cm4io_64bit.txt | 30 +++++++ .../raspberrypi/config_default.txt | 4 +- .../raspberrypi/genimage-raspberrypi4-64.cfg | 4 +- board/raspberrypi/genimage-raspberrypi4.cfg | 4 +- .../genimage-raspberrypicm4io-64.cfg | 4 +- .../raspberrypi/genimage-raspberrypicm4io.cfg | 4 +- board/raspberrypi/post-image.sh | 33 -------- board/raspberrypi/readme.txt | 9 ++- configs/raspberrypi0_defconfig | 3 + configs/raspberrypi0w_defconfig | 4 +- configs/raspberrypi2_defconfig | 3 + configs/raspberrypi3_64_defconfig | 4 +- configs/raspberrypi3_defconfig | 4 +- configs/raspberrypi3_qt5we_defconfig | 4 +- configs/raspberrypi4_64_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- configs/raspberrypi_defconfig | 3 + configs/raspberrypicm4io_64_defconfig | 2 +- configs/raspberrypicm4io_defconfig | 2 +- package/rpi-firmware/Config.in | 78 ++++++++----------- package/rpi-firmware/rpi-firmware.mk | 34 +++++--- 28 files changed, 334 insertions(+), 110 deletions(-) create mode 100644 board/raspberrypi/config_0w.txt create mode 100644 board/raspberrypi/config_3.txt create mode 100644 board/raspberrypi/config_3_64bit.txt create mode 100644 board/raspberrypi/config_3_qt5we.txt create mode 100644 board/raspberrypi/config_4.txt create mode 100644 board/raspberrypi/config_4_64bit.txt create mode 100644 board/raspberrypi/config_cm4io.txt create mode 100644 board/raspberrypi/config_cm4io_64bit.txt rename package/rpi-firmware/config.txt => board/raspberrypi/config_default.txt (79%) diff --git a/board/raspberrypi/config_0w.txt b/board/raspberrypi/config_0w.txt new file mode 100644 index 0000000000..195bad449e --- /dev/null +++ b/board/raspberrypi/config_0w.txt @@ -0,0 +1,29 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start.elf +fixup_file=fixup.dat + +kernel=zImage + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=100 + +# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +dtoverlay=miniuart-bt + +# enable autoprobing of Bluetooth driver without need of hciattach/btattach +dtoverlay=krnbt=on diff --git a/board/raspberrypi/config_3.txt b/board/raspberrypi/config_3.txt new file mode 100644 index 0000000000..195bad449e --- /dev/null +++ b/board/raspberrypi/config_3.txt @@ -0,0 +1,29 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start.elf +fixup_file=fixup.dat + +kernel=zImage + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=100 + +# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +dtoverlay=miniuart-bt + +# enable autoprobing of Bluetooth driver without need of hciattach/btattach +dtoverlay=krnbt=on diff --git a/board/raspberrypi/config_3_64bit.txt b/board/raspberrypi/config_3_64bit.txt new file mode 100644 index 0000000000..34412fa9e8 --- /dev/null +++ b/board/raspberrypi/config_3_64bit.txt @@ -0,0 +1,32 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start.elf +fixup_file=fixup.dat + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=100 + +# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +dtoverlay=miniuart-bt + +# enable autoprobing of Bluetooth driver without need of hciattach/btattach +dtoverlay=krnbt=on + +# enable 64bits support +arm_64bit=1 diff --git a/board/raspberrypi/config_3_qt5we.txt b/board/raspberrypi/config_3_qt5we.txt new file mode 100644 index 0000000000..752310b179 --- /dev/null +++ b/board/raspberrypi/config_3_qt5we.txt @@ -0,0 +1,26 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start.elf +fixup_file=fixup.dat + +kernel=zImage + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=200 + +# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +dtoverlay=miniuart-bt diff --git a/board/raspberrypi/config_4.txt b/board/raspberrypi/config_4.txt new file mode 100644 index 0000000000..ea02d3f071 --- /dev/null +++ b/board/raspberrypi/config_4.txt @@ -0,0 +1,29 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start4.elf +fixup_file=fixup4.dat + +kernel=zImage + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=100 + +# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +dtoverlay=miniuart-bt + +# enable autoprobing of Bluetooth driver without need of hciattach/btattach +dtoverlay=krnbt=on diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt new file mode 100644 index 0000000000..41c7e97e99 --- /dev/null +++ b/board/raspberrypi/config_4_64bit.txt @@ -0,0 +1,36 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start4.elf +fixup_file=fixup4.dat + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=100 + +# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +dtoverlay=miniuart-bt + +# enable autoprobing of Bluetooth driver without need of hciattach/btattach +dtoverlay=krnbt=on + +dtoverlay=vc4-kms-v3d-pi4 +dtoverlay=imx219 +#dtoverlay=ov5647 + +# enable 64bits support +arm_64bit=1 diff --git a/board/raspberrypi/config_cm4io.txt b/board/raspberrypi/config_cm4io.txt new file mode 100644 index 0000000000..01f60395b3 --- /dev/null +++ b/board/raspberrypi/config_cm4io.txt @@ -0,0 +1,26 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start4.elf +fixup_file=fixup4.dat + +kernel=zImage + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=100 + +# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +dtoverlay=miniuart-bt diff --git a/board/raspberrypi/config_cm4io_64bit.txt b/board/raspberrypi/config_cm4io_64bit.txt new file mode 100644 index 0000000000..6cd8a729cd --- /dev/null +++ b/board/raspberrypi/config_cm4io_64bit.txt @@ -0,0 +1,30 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start4.elf +fixup_file=fixup4.dat + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=100 + +# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +dtoverlay=miniuart-bt + +# enable 64bits support +arm_64bit=1 + diff --git a/package/rpi-firmware/config.txt b/board/raspberrypi/config_default.txt similarity index 79% rename from package/rpi-firmware/config.txt rename to board/raspberrypi/config_default.txt index 4a92a4dd95..c09ecca1a9 100644 --- a/package/rpi-firmware/config.txt +++ b/board/raspberrypi/config_default.txt @@ -1,11 +1,9 @@ # Please note that this is only a sample, we recommend you to change it to fit # your needs. -# You should override this file using a post-build script. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. # See http://buildroot.org/manual.html#rootfs-custom # and http://elinux.org/RPiconfig for a description of config.txt syntax -# We always use the same names, the real used variant is selected by -# BR2_PACKAGE_RPI_FIRMWARE_{DEFAULT,X,CD} choice start_file=start.elf fixup_file=fixup.dat diff --git a/board/raspberrypi/genimage-raspberrypi4-64.cfg b/board/raspberrypi/genimage-raspberrypi4-64.cfg index 854e0c7e31..3c480e98f0 100644 --- a/board/raspberrypi/genimage-raspberrypi4-64.cfg +++ b/board/raspberrypi/genimage-raspberrypi4-64.cfg @@ -4,8 +4,8 @@ image boot.vfat { "bcm2711-rpi-4-b.dtb", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", + "rpi-firmware/fixup4.dat", + "rpi-firmware/start4.elf", "rpi-firmware/overlays", "Image" } diff --git a/board/raspberrypi/genimage-raspberrypi4.cfg b/board/raspberrypi/genimage-raspberrypi4.cfg index 60e1f23bcc..4e4742f3ef 100644 --- a/board/raspberrypi/genimage-raspberrypi4.cfg +++ b/board/raspberrypi/genimage-raspberrypi4.cfg @@ -4,8 +4,8 @@ image boot.vfat { "bcm2711-rpi-4-b.dtb", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", + "rpi-firmware/fixup4.dat", + "rpi-firmware/start4.elf", "rpi-firmware/overlays", "zImage" } diff --git a/board/raspberrypi/genimage-raspberrypicm4io-64.cfg b/board/raspberrypi/genimage-raspberrypicm4io-64.cfg index 32a7ca897d..63806d0c31 100644 --- a/board/raspberrypi/genimage-raspberrypicm4io-64.cfg +++ b/board/raspberrypi/genimage-raspberrypicm4io-64.cfg @@ -4,8 +4,8 @@ image boot.vfat { "bcm2711-rpi-cm4.dtb", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", + "rpi-firmware/fixup4.dat", + "rpi-firmware/start4.elf", "rpi-firmware/overlays", "Image" } diff --git a/board/raspberrypi/genimage-raspberrypicm4io.cfg b/board/raspberrypi/genimage-raspberrypicm4io.cfg index 5a42bcfbb4..3ee9bf551a 100644 --- a/board/raspberrypi/genimage-raspberrypicm4io.cfg +++ b/board/raspberrypi/genimage-raspberrypicm4io.cfg @@ -4,8 +4,8 @@ image boot.vfat { "bcm2711-rpi-cm4.dtb", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", - "rpi-firmware/fixup.dat", - "rpi-firmware/start.elf", + "rpi-firmware/fixup4.dat", + "rpi-firmware/start4.elf", "rpi-firmware/overlays", "zImage" } diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index a6728c686e..6cad20fb9e 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -7,39 +7,6 @@ BOARD_NAME="$(basename ${BOARD_DIR})" GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" -for arg in "$@" -do - case "${arg}" in - --add-miniuart-bt-overlay) - if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then - echo "Adding 'dtoverlay=miniuart-bt' to config.txt (fixes ttyAMA0 serial console)." - cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt" - -# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console -dtoverlay=miniuart-bt,krnbt=on -__EOF__ - fi - ;; - --aarch64) - # Run a 64bits kernel (armv8) - sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/rpi-firmware/config.txt" - if ! grep -qE '^arm_64bit=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then - cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt" - -# enable 64bits support -arm_64bit=1 -__EOF__ - fi - ;; - --gpu_mem_256=*|--gpu_mem_512=*|--gpu_mem_1024=*) - # Set GPU memory - gpu_mem="${arg:2}" - sed -e "/^${gpu_mem%=*}=/s,=.*,=${gpu_mem##*=}," -i "${BINARIES_DIR}/rpi-firmware/config.txt" - ;; - esac - -done - # Pass an empty rootpath. genimage makes a full copy of the given rootpath to # ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk # space. We don't rely on genimage to build the rootfs image, just to insert a diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 62cb248633..98c44d80a1 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -87,11 +87,14 @@ After building, you should obtain this tree: | +-- bootcode.bin | +-- cmdline.txt | +-- config.txt - | +-- fixup.dat - | +-- start.elf + | +-- fixup.dat [1] + | +-- fixup4.dat [1] + | +-- start.elf [1] + | +-- start4.elf [1] | `-- overlays/ [2] +-- sdcard.img - `-- zImage + +-- Image [1] + `-- zImage [1] [1] Not all of them will be present, depending on the RaspberryPi model you are using. diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 5d611aae3f..f6e4f552fc 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -20,6 +20,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi0/config_default.txt" # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set # Required tools to create the SD image diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index 394ef9c574..bbe25e2874 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -16,6 +16,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi0w/config_0w.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -29,4 +32,3 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay" diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 516cc378d4..79f3d98692 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -22,6 +22,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_default.txt" # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set # Required tools to create the SD image diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 210ded73c4..def387cacc 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -21,6 +21,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi- BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3-64/config_3_64bit.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -34,4 +37,3 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--aarch64 --add-miniuart-bt-overlay" diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 58b2abcfb8..1b39ac378c 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -21,6 +21,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-r BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3/config_3.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -34,4 +37,3 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay" diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 24e1f53bae..2506025756 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -31,6 +31,9 @@ BR2_PACKAGE_QT5BASE_PNG=y BR2_PACKAGE_QT5WEBENGINE=y BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3/config_3_qt5we.txt" BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_NTP=y @@ -48,4 +51,3 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="400M" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --gpu_mem_1024=200" diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 05331f7ae7..0ce05f30ef 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -22,6 +22,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -35,4 +36,3 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64" diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index d954c845d8..930522f20b 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -22,6 +22,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -35,4 +36,3 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay" diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index fd869693fa..8c70a2be6a 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -21,6 +21,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-c BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_default.txt" # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set # Required tools to create the SD image diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index 4abff0f2d9..73bb2b98f3 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -22,6 +22,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypicm4io-64/config_cm4io_64bit.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -38,4 +39,3 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io-64/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64" diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 6fa9e5bc9f..80f509b5f9 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -22,6 +22,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypicm4io-64/config_cm4io.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -38,4 +39,3 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay" diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index f5a25c5680..9e401829c6 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -11,63 +11,53 @@ config BR2_PACKAGE_RPI_FIRMWARE if BR2_PACKAGE_RPI_FIRMWARE -choice - bool "rpi variant" +config BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN + bool "rpi 0/1/2/3 bootcode.bin" help - The Raspberry Pi 4 introduced a slightly different naming - convention and set of boot files. This option controls which - format to use. + The bootcode.bin for versions Zero/1/2/3 (not needed on rpi4, + because it has been replaced by boot code in the onboard + EEPROM). config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI - bool "rpi 0/1/2/3" + bool "rpi 0/1/2/3 (default)" help - The default set of files, for versions pre-4 + The default set of files for versions Zero/1/2/3. -config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 - bool "rpi 4" +config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X + bool "rpi 0/1/2/3 (extended)" help - The Raspberry Pi 4 files -endchoice + The extended set of files for versions Zero/1/2/3 (additional + GPU features, eg. more audio/video codecs). -choice - bool "Firmware to boot" - default BR2_PACKAGE_RPI_FIRMWARE_DEFAULT +config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD + bool "rpi 0/1/2/3 (cut-down)" help - There are three different firmware files: - - the default firmware, that enables standard GPU - features; - - the extended firmware, that enables additional GPU - features (eg. more audio/video codecs); - - the cut-down firmware, for emergency situations, with - only features required to boot a Linux kernel. - -config BR2_PACKAGE_RPI_FIRMWARE_DEFAULT - bool "default" + The cut-down set of files for versions Zero/1/2/3 (only + features required to boot a Linux kernel). + +config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 + bool "rpi 4 (default)" + help + The default set of files for versions 4 (standard GPU + features). + +config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X + bool "rpi 4 (extended)" help - The default firmware, that enables standard GPU features. + The extended set of files for versions 4 (additional GPU + features, eg. more audio/video codecs). -config BR2_PACKAGE_RPI_FIRMWARE_X - bool "extended ('x', more codecs)" +config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_CD + bool "rpi 4 (cut-down)" help - The extended firmware, that enables additional GPU features - (eg. more audio/video codecs). + The cut-down set of files for versions 4 (only features + required to boot a Linux kernel). -config BR2_PACKAGE_RPI_FIRMWARE_CD - bool "cut-down ('cd', emergency)" +config BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE + string "Path to a file stored as boot/config.txt" help - The cut-down firmware, for emergency situations, with only - features required to boot a Linux kernel. - -endchoice - -config BR2_PACKAGE_RPI_FIRMWARE_BOOT - string - default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI - default "4" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 - default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI - default "4x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 - default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI - default "4cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 + Path to a file stored as config.txt in the boot partiton + of the generated SD card image. config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS bool "Install Device Tree Blobs (DTBs)" diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 6a2bf05248..38a84100e9 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -10,6 +10,27 @@ RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom RPI_FIRMWARE_INSTALL_IMAGES = YES +RPI_FIRMWARE_FILES = \ + $(if $(BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN), bootcode.bin) \ + $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI), start.elf fixup.dat) \ + $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X), startx.elf fixupx.dat) \ + $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD), start_cd.elf fixup_cd.dat) \ + $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4), start4.elf fixup4.dat) \ + $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X), start4x.elf fixup4x.dat) \ + $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_CD), start4cd.elf fixup4cd.dat) + +define RPI_FIRMWARE_INSTALL_BIN + $(foreach f,$(RPI_FIRMWARE_FILES), \ + $(INSTALL) -D -m 0644 $(@D)/boot/$(f) $(BINARIES_DIR)/rpi-firmware/$(f) + ) +endef + +ifneq ($(BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE),) +define RPI_FIRMWARE_INSTALL_CONFIG + $(INSTALL) -D -m 0644 $(BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE) $(BINARIES_DIR)/rpi-firmware/config.txt +endef +endif + ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y) define RPI_FIRMWARE_INSTALL_DTB $(foreach dtb,$(wildcard $(@D)/boot/*.dtb), \ @@ -41,19 +62,10 @@ define RPI_FIRMWARE_INSTALL_TARGET_CMDS endef endif # INSTALL_VCDBG -ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI),y) -# bootcode.bin is not used on rpi4, because it has been replaced by boot code in the onboard EEPROM -define RPI_FIRMWARE_INSTALL_BOOTCODE_BIN - $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin -endef -endif - define RPI_FIRMWARE_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt - $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf - $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat - $(RPI_FIRMWARE_INSTALL_BOOTCODE_BIN) + $(RPI_FIRMWARE_INSTALL_BIN) + $(RPI_FIRMWARE_INSTALL_CONFIG) $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) endef From patchwork Tue Sep 21 20:21:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1530857 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=INFHMIdb; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HDXrt4RTWz9sXk for ; Wed, 22 Sep 2021 06:21:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EF497400CF; Tue, 21 Sep 2021 20:21:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QJbKOGPioNS6; Tue, 21 Sep 2021 20:21:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 16DF3400E9; Tue, 21 Sep 2021 20:21:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 513B81BF47E for ; Tue, 21 Sep 2021 20:21:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3DE50834B6 for ; Tue, 21 Sep 2021 20:21:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=gmx.net Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WKDhgHOONkFE for ; Tue, 21 Sep 2021 20:21:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2E0C682D49 for ; Tue, 21 Sep 2021 20:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1632255698; bh=4Zu91/x8UTMtsmtLsAk+Gq4GDYSc1XvxRNjQWuPXoIY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=INFHMIdbMQpXysZ168QhEnnrDRSRwdSa8ZayOmk9YzxkzlBUa34lwpiCkEngDsX3T AO1uRvW+TmZ6IPa+//WB9euziCMbnkrU9PvhrOnf41yw4VEBocI33rXodsLRcaklyJ 8k1/7Jy7R93x+tC4H1QEOsDbhoRl8sp1WGjpMkbk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.170]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MxUrx-1mn22l1xvd-00xqDU; Tue, 21 Sep 2021 22:21:38 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Tue, 21 Sep 2021 22:21:33 +0200 Message-Id: <20210921202137.7092-2-ps.report@gmx.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210921202137.7092-1-ps.report@gmx.net> References: <20210921202137.7092-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:+Ma1O6PTC66A+GSIVUACc+As8pPX1TOskGcjefSj1rcgDNGgHY0 NkyvDMoyyhCJeMBABU2IZfXpDohoavC6khuQRJytJs+xa11/7AY+7nxdUFS2HBIYxCDOEgG UqFWZ2nM8Gk11vrgOT8gnIRAeIs5pRbrlxzfWcgKoiltdzD/yszVJtlhRAS6+eIDnjn1fUh qUKZWw/BhitFT1qKJ85cg== X-UI-Out-Filterresults: notjunk:1;V03:K0:I13v1jANi+Q=:LWV1Vdr9qPooV/Z8lEyFhP GGMpoTA1epTKLiJCLehZ1LZ6MUfo3b36IIKtuYWG4crD1pkifj3ZSY8OpXhP6QFU3WnWcaw2u fD7CPgF7ooSl1J1pzFj1WsswI9ES6W0npV2+EiidO5wQLeZ+NZU1Ijj/2/OOpq1G9mAc0WCw9 /Pm/+C5Gohv5hcQp2Wy5fqAJ2UfUolI0UhNxI/WZApuVpN+8c8EZmGHay7lr+eASMwyQULTHh 12mrmeOaP0oYAn2JP2eiWkfwp0PC5tdhLB9O/8MVjNtxRKe8a6cFL7O5n5XANmfNyX3ftRxOv vQlh7XOx/CfEPWQgpNxxQKiEnDUCQZEFt9LEjFzSKM0+X+FenKJudIcwcY+spdjzS5U+W6Y44 KfSBeGlf5Em0SluFddL2nj3OqFCN45Oq70oQTvjHqtEnVRMRbnoZkyoZ6g5/71g90h0mD3um4 CZwRrcRjIM+dvvT7XzL/MMASz/oyUY4/qumKx6IC2bym4Mev009PoZnjQ18smBqP9Hajev5SJ IRidXAZ/QlBPNc0Eh13sD7oTgo+RqRu3+C3PxTigw0rhCIsyAu2twytgKwilFkkORvfQPq5ll Nhh218VxZrINuRid2ctfM4qyr2tM9lSRHKRSFfJ/3NWcyGwZfVqmIsA5H43Z3VBZYCCj7vWMa z5jur9tZ2yOiZxmxmbGYgN30MEojDoCNCWgyFbu4pA9z0Iv022VOArX5HRoEkKpcTWZ0Os8D4 ZkWIrgtEVGEwW1PLR50nPCibR3+IfJCoUWvD/G9k23tZuikEzpYFsCB7QtpSP5DhuFKebT5Oz jtNnwupYlmLaaq1hLRYPWcbppAuKFldwlRYa2THUFVugyq2PRsF9SZ2qO0elJ1LVxfvRpvQAB EU53UFbqiTWO2f/y3IwhfHfITqoYQjrfmY5H7FB43vqp83g5c3NPGGSkx/reaRxAH1U0sTRFi Y6hr2K07cvadGHh9xmU8OoVghFA8xRgp0N8ROK2PZL/ga/AaQdjREbuxHY6ydGGQ4Wvetb3AZ qjCHrmKngvL/blAl74/sENF1yL7tojvoYXr68N+IfHP2qgoAE2H4nvz+5O6Ys+FEx7Vt2+myc 8+n2Z9eLOCHEw0= Subject: [Buildroot] [PATCH v5 2/6] board/raspberrypicm4io: enable RTC and USB overlays X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arthur Courtel , Mahyar Koshkouei , Martin Bark Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" - add RTC and USB dtoverlay entries to config_cm4io.txt Signed-off-by: Peter Seiderer --- Changes v4 -> v5: - new patch --- board/raspberrypi/config_cm4io.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/board/raspberrypi/config_cm4io.txt b/board/raspberrypi/config_cm4io.txt index 01f60395b3..cf7e6df1a1 100644 --- a/board/raspberrypi/config_cm4io.txt +++ b/board/raspberrypi/config_cm4io.txt @@ -24,3 +24,10 @@ gpu_mem_1024=100 # fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console dtoverlay=miniuart-bt + +# enable RTC +dtparam=i2c_vc=on +dtoverlay=i2c-rtc,pcf85063a,i2c_csi_dsi + +# enable dwc2 USB controller (USB 2.0) +dtoverlay=dwc2,dr_mode=host From patchwork Tue Sep 21 20:21:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1530858 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=EWp/A7vh; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HDXs93WP9z9sW5 for ; Wed, 22 Sep 2021 06:22:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 603EC4042B; Tue, 21 Sep 2021 20:22:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1ZWgkOgSHOwD; Tue, 21 Sep 2021 20:22:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 7CF6B40172; Tue, 21 Sep 2021 20:22:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 541C61BF995 for ; Tue, 21 Sep 2021 20:21:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 40BE7406CE for ; Tue, 21 Sep 2021 20:21:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=gmx.net Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E-rWwAdMEon2 for ; Tue, 21 Sep 2021 20:21:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by smtp4.osuosl.org (Postfix) with ESMTPS id 35B8F40661 for ; Tue, 21 Sep 2021 20:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1632255699; bh=/3ZzGz9h2p+s8F9rJR3UrTviKm5EsBYdGI4s1/5N1Ow=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=EWp/A7vhem7NH1mjcOvFJP7Gnl0S1/rCE3OlvCYKlxCOB4thj1zJqauSov5sFJ+vW gGFqpFQk4XECOcKLCLI1Rkm3hL6byqhSn+4M7pPC1alPW5AYjxNXw7UCh9z6gJC6wu 4OQayJvUwEQh2piMNn/q/pOPIUiXbU23PpLpSGZY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.170]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MfpSb-1n4Yvb3Ox7-00gJMi; Tue, 21 Sep 2021 22:21:38 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Tue, 21 Sep 2021 22:21:34 +0200 Message-Id: <20210921202137.7092-3-ps.report@gmx.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210921202137.7092-1-ps.report@gmx.net> References: <20210921202137.7092-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:jzplgDuyIJq/TrS7SJQ1EXqwnZWXxV3wHlFCQM9igYXLZcC4Six hiZbBFu75eTa7K6g4wxJgxzb9YYiVQf/uBCnr/0ojs6rCWN+Uo5ZvU1YSHaOSL4cNhFIQGH BZQ3aplsWlfZOluaXo/qb4MeOXhYFxvyni9XGbpfX70+nZr/5jMUGQU/N02xwDamhLL9x5y 1c3YZGHhOVMoczTvljZMA== X-UI-Out-Filterresults: notjunk:1;V03:K0:tdrFPrLfkR0=:+I0P951SSDimPlyyg40QHa iy6o21bp7IFnmgzBSM8v4gjqyOQsBsH/63w08tTIiWWN9xzQPkfsD/8+3hA8zhws7nbnntyZ2 PHEYgBmraIFJzIx1PEwpO2P5T3LB7ZRKEyUy2JldzJXd5XhWdKnoSm3ic/1mZjClp2mZESVTW oqRVfhjax3QFtGBUJgAFznN9ZzIFoNtMygWTWOutfP48D2kS2ysjIcuN/PWpnQ3XLChLMzZ67 CvK6rRMOJpf/ozZ2pCKL7A6+RT1WHJ5l+PDqYuKMh6K7R8ta6e0Ov/NQoQ6uw+WFpqAxB0f7t yeakke6IVMVNStUJGzlB0XLj3+LYWE2kUWOpnAgm2uN3p6TlfxOEOmsusVPRgcEirSzWHplMW eLYJ+S2rcsvKA1oGiknh+m9BR2O+xuILcZ7Wp/aXHBTTb3M2NphwNFyJoYGVyErL1tUj+lfgm Rl9YObgrHrJEjQ3kxVg1qS165GwhA6Ug6NUnGoLbLWD0cegyYeblhF95QBo3ipbGa+7UUkOyi mE5I69oARcOpearyqSwqgMkaUyAtmq07oMvscJ5w2qmIfiF4Zxf6q/oktS+ZvlX8PBdV+4XJu v0uGPi1U8Pn1w2m01PVoLKanKS4zyPaWLTJwQAXldPRwqI2HheGrsPjnGIMTDn4rFHtQxg0GI 4WP26/mmCFfCC7U0bmbl0ErXwJdYGuANt5RV5e21qIIOnfh7qd2mxF6dfbKNxcHMvKg+Ywe5b zH3mt83w+YhqdF4PpgyvfsYlKgXLpIB4yjVDXVLy7GKrosSe+G16ZPUAZ6YtqOS9uXLg7mw6S /Q9aF2Y9IYpCpBxK0JLu/1FgppfBDoRth+2i4zVbZN5t2ywzNCyHYREDoRl/0jSBvxSOeZxR9 +IMwiTp3gEG5g7Qh8bp6EvRuD0y06OGOT3YhdSqDE9Q6nfM8TS8M4GC9bOU4kEatSqjBm/k++ /wb/yT3+UlPHFVtfShn7+u28jJah3wmAgeaoHANqXT64eP+/Usy/gJYcWGd0nmP8hSnZqhnxW ciWRN6y8adNmdp8P3st91tbHlqwJggfcw/p2xDZe+cKXBnkpUdZ33K5Cep4XjYhGgx3Z/Ph9u NHw/NCcQb97ADU= Subject: [Buildroot] [PATCH v5 3/6] board/raspberrypicm4io-64: enable RTC and USB overlays X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arthur Courtel , Mahyar Koshkouei , Martin Bark Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" - add RTC and USB dtoverlay entries to config_cm4io_64bit.txt Signed-off-by: Peter Seiderer --- Changes v4 -> v5: - new patch --- board/raspberrypi/config_cm4io_64bit.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/board/raspberrypi/config_cm4io_64bit.txt b/board/raspberrypi/config_cm4io_64bit.txt index 6cd8a729cd..813f6eba7b 100644 --- a/board/raspberrypi/config_cm4io_64bit.txt +++ b/board/raspberrypi/config_cm4io_64bit.txt @@ -25,6 +25,13 @@ gpu_mem_1024=100 # fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console dtoverlay=miniuart-bt +# enable RTC +dtparam=i2c_vc=on +dtoverlay=i2c-rtc,pcf85063a,i2c_csi_dsi + +# enable dwc2 USB controller (USB 2.0) +dtoverlay=dwc2,dr_mode=host + # enable 64bits support arm_64bit=1 From patchwork Tue Sep 21 20:21:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1530860 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=kIav53FV; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HDXsd1mKYz9sW5 for ; Wed, 22 Sep 2021 06:22:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D8A4460ECD; Tue, 21 Sep 2021 20:22:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Jqxf2kbeQc29; Tue, 21 Sep 2021 20:22:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 21662608B6; Tue, 21 Sep 2021 20:22:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5B47D1BF47E for ; Tue, 21 Sep 2021 20:21:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 630BD82D49 for ; Tue, 21 Sep 2021 20:21:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=gmx.net Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pMWARsQvnt38 for ; Tue, 21 Sep 2021 20:21:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5098E82DDE for ; Tue, 21 Sep 2021 20:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1632255699; bh=z/hFHGVchtd6z0+4lsGbf42/wuzxMyLHAOOczi1eJK0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=kIav53FVyyIT5HgY//2xaTGpVvdp44DPNTL0XZSqQLkaQhV/FS1XHHHdJ+vlB73mT GtJVM/O79abwRx6zZAZVngMkhjvquR3/piIgkZXXBGIL+bySR3SzZGdrnuK7IAsBQg L7amI3NcWq/LhN/Q917rjc1WoeojjDLfvrQ4qVlc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.170]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MyKDU-1mnqrH0Otg-00yf1t; Tue, 21 Sep 2021 22:21:39 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Tue, 21 Sep 2021 22:21:35 +0200 Message-Id: <20210921202137.7092-4-ps.report@gmx.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210921202137.7092-1-ps.report@gmx.net> References: <20210921202137.7092-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:/Gv/KLOL8Eg9SPH00FjxCZAwLehwypHkMj6PNs7K0VthjjfocKM C0mbwQ4XevB1C0jGR4d7K2jS7aVoFjfVkPRWhNobLjAwpQ3MePP6cAhPWR+P9dXkWna1Xzt yRSaMVs2eHY2j3r+mi75WlkmGB1sIYziZnz4zbcLs9ErToRQhgNJSmGygRLi7w7SlAf02Kf SoBmV44i8uyN3cb/jXiaQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:RbfpmbYxV4c=:PLg9s9PlnEDBAgxZ/OJRX/ 1ecF+m/xt7m0L713OEw64QRiQvuWN+SXAug9jFu6Lyek5+vx0XKUZ5AL2MIgiQvyC+UoIvmfW dFPxLdrKZdcHqWbbef/c15IXsZB7JeR2b0OyeY5OBiviJ775NymHMRvGrflJXf9afD/i0MBK9 y+a1Z7p1JAg/qJL4nZPSgKFyIrapDngrIhSDjpm0eJoihC4c/BCuQNOBSKDBKWWzwqinp4kub vJ5wJBIookA5kxJLkTYBJWCRwg/+ReGiqxKIwNVbfvdYizeFx5tRa1R9ecBjt275bjWYiEX9K Uddxr0YIBRhzcz56bzxe4XGcHWht/iyWmfLeOjyVbJn5mF4B+p2i+uTDEoA4dW+5EogtWfWtM 3lfjaWkU+ssXMwbjo3Nb3pukjD0WTcrtq9NujYG8dWXBN0woTE9DsjYp9K2jwKKcg09GzqZwo i3R57wlBRpNBO1CerAhl4hBBAHU0kYBWbNv1VQM7EncOd+0Jx74IDYI9zoI0sMlVrVp5aRldW TuW1OiRaITy7S5X9d2qONp9ShQaeWXiirel46jggiYsO661ADSozKv9JYajSW2BXruh5drqVz csMGC9kMKGJ6q1klyf9YgDUgSnkGUOl8a/dgLb65fKDW6BdIt2F2lYMtol+WZA5QblsZA6Gnw LhCovrWr4rur3Q10aUDUflojO7RIDC9LAr2WruKJmj7dS8Ij1RsPt0lFOCTQ6l1TnZTHIk4sB deIMYFL6/xRklMeb4L68hJTbJktsVY5vp5q6DCdCnokoTb+SFgmMoMHPhJ4s7Maq++k4LDvte nadns8H+gmbHp5FHj6qOmP13eVrh9EkeLnh8xCYl86ql4q+vJ3RxncbvEHSWPvaFzQ5FnifzW qMcz/PFPkd8mUCqcXQfUSa0FfGkUFa1Zva3xUzVNRP+VRs6czZrEGLqyp3Sh3bK4d6R/DxtMy LPtRp1wfvy73PwecmMQYBBOMMqtf0LpAcxx99249RMQuByk0VkSScZj/YTjeRIsNuux7D0Fmn TRoyZYp4XJ0Avop3GdHrL9PtU9nQBm04tHchSFjMtB/dVjHEWUHNrYrZ+xGFSPQfZISFC2mSg QBiAZ5roA/lUkE= Subject: [Buildroot] [PATCH v5 4/6] package/rpi-firmware: add option for the debug set of start/fixup boot files X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arthur Courtel , Mahyar Koshkouei , Martin Bark Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" Add option for the debug set of start/fixup boot files. Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - new patch Changes v2 -> v3: - adjust to one-assignment style Changes v3 -> v4: - no changes Changes v4 -> v5: - rebased --- package/rpi-firmware/Config.in | 10 ++++++++++ package/rpi-firmware/rpi-firmware.mk | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index 9e401829c6..f9fc0b0e5e 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -35,6 +35,11 @@ config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD The cut-down set of files for versions Zero/1/2/3 (only features required to boot a Linux kernel). +config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_DB + bool "rpi 0/1/2/3 (debug)" + help + The debug set of files for versions Zero/1/2/3. + config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 bool "rpi 4 (default)" help @@ -53,6 +58,11 @@ config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_CD The cut-down set of files for versions 4 (only features required to boot a Linux kernel). +config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_DB + bool "rpi 4 (debug)" + help + The debug set of files for versions 4. + config BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE string "Path to a file stored as boot/config.txt" help diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 38a84100e9..f9568ba50f 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -15,9 +15,11 @@ RPI_FIRMWARE_FILES = \ $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI), start.elf fixup.dat) \ $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X), startx.elf fixupx.dat) \ $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD), start_cd.elf fixup_cd.dat) \ + $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_DB), start_db.elf fixup_db.dat) \ $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4), start4.elf fixup4.dat) \ $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X), start4x.elf fixup4x.dat) \ - $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_CD), start4cd.elf fixup4cd.dat) + $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_CD), start4cd.elf fixup4cd.dat) \ + $(if $(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_DB), start4db.elf fixup4db.dat) define RPI_FIRMWARE_INSTALL_BIN $(foreach f,$(RPI_FIRMWARE_FILES), \ From patchwork Tue Sep 21 20:21:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1530861 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=iZUoqy4D; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HDXss0JvXz9sW5 for ; Wed, 22 Sep 2021 06:22:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 983C440248; Tue, 21 Sep 2021 20:22:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 27tBkYnkjDcT; Tue, 21 Sep 2021 20:22:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id C8942400E9; Tue, 21 Sep 2021 20:22:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id ECDA81BF47E for ; Tue, 21 Sep 2021 20:21:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 4909F82DDE for ; Tue, 21 Sep 2021 20:21:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=gmx.net Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ny4q26VBjza7 for ; Tue, 21 Sep 2021 20:21:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by smtp1.osuosl.org (Postfix) with ESMTPS id 3A32A82D75 for ; Tue, 21 Sep 2021 20:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1632255700; bh=+YTjyGXnYJ3G3Alt8s4ThMX4ZQoCX9VINMg8g+roBws=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=iZUoqy4DblOdmG26PeWXQc7LKy7XGBrT72V8Z/sObeKDmh13cgY9JbbvH6T7rOqud 0EejknMM44MsckmNLGhyT5UPqIvuD1Kw7uhmJtO4HvTrMfzwxO3nxYcWxdQn4hamVz MaKedP+irwJ0PR98FxH5w53g+B+9ekIwdULLTsLM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.170]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MYNJq-1mNqJF33Z4-00VP4p; Tue, 21 Sep 2021 22:21:39 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Tue, 21 Sep 2021 22:21:36 +0200 Message-Id: <20210921202137.7092-5-ps.report@gmx.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210921202137.7092-1-ps.report@gmx.net> References: <20210921202137.7092-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:uDNqqyOXgjuhUPEF3XjsxhP2fFHMRLAS1gGzXYTpcBKAxyiOL61 NhD2nN4d4jMni18D2o3thWWUPE52bOmxYEPWvvAlC8ZPpknZqy33sIMcQjIACFyVT+YMtpl KK8UsnOorXmqw8B24M1kQaZlZ00l+qXghAG22y9FsYZwNR6CyvK3j5TFYaM+ZMo3e8rIzmX lSJjIsHmjunJmNSVn/zlw== X-UI-Out-Filterresults: notjunk:1;V03:K0:xHQTq66yAvw=:vtSRf9ZYHZEEBRj+HqV977 cvYtfjOXy3pfuST22gXBO0hmhYoVg4zacen1BLxTHo7CLFXG+RXN9c5427pEJwb5rX0ZhbcNh mmBIVMVRI8BQn1tatrfTDJtuDA5H33wZPHmkFACzQXwcvTndQ4ggm2afWmSr500eQwKA9rT43 4f3H0WNcYQFEF08a7fvXhl4aBAYAtY7pBeCqDfWszMUD7cennFBVrAURcoGhxL9S9oKPf0Hm5 ui/qDBcfaggnjQgLmhv54MpyCMp85o7TJHhK33lRxRrVpaxXBIECCOhiPCiAOPkG+nrABzTu1 OXGGATfkFL/fSYosdihTmJlq3KO+DGYCkfS7a6Vul9HaZRVYwaLMyxBdixIZ2nnpSQe/ytSks WQERzFfk30mkZNZVwUdkSI5T4ZwmaJloPHB84HI6O1jnaWaSudcU2/QyvmbT9YLwQjxBvz+AT 3styKzDCHYYE3tg6DZXQ8dG7Loj6jpvzG6Jluc6L+bCd9uQ10cWXO5NxBMjfTb1X0hy8rQlzI PyTjuQGL5NhmnGQEtakk/wzHlxBLnAFFr9sqgxITR9ubN/W/DEDTOctBpxVIkjse96LYcvYGc KflE/D9gj/qICkQcbVbmXM509AD80AC7R3MDrBxtEmq66je+8UcFXQYXiEQNJTcxBZf1oek1T NQCmKXfJs6wc7+pNHOTGgp99t3TCK+R+RO8g5h5U05LTkZpJ21N62i0pekyR8I9kEfvtCQ2fv B8+0LpJMf7n6PmRq7gNbc6sScc5ZcoJwvt+bNMuJ1/Z8Y7gDS5smd/khuiXe6UPZkZedRAAo5 Zgi9JnloTkKb8IntF9fFiVjf7HySxnNDjIrIbBaLTsCjKpozRvWf2teeujcJRr5Q82y7wJJqu IAxi2aZZASNadSHlQUaxC4H850LkkSnRcI9ln74WB8sGKbgdbac34p8SLbcMRxFAQIqYFyUYO KzQsJCLYwcsIf3j7npS20T8WXw8i63RA8i2366LZK7AyaPxwnLCOkIyQ0mKtEiqdRfodG1z5r MaO/5ej3lVUGVoV2+2r3FgXv+OaxjtO0c8Nn/IuzjV12UEnXux/kP3GO3O+vII4XS8QfSG5Dh fTFtkJsr3+rAN8= Subject: [Buildroot] [PATCH v5 5/6] package/rpi-firmware: convert dtb overlay install loop to make-level foreach loop X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arthur Courtel , Mahyar Koshkouei , Martin Bark Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" Signed-off-by: Peter Seiderer --- Changes v2 -> v3: - new patch Changes v3 -> v4: - no changes Changes v4 -> v5: - rebased --- package/rpi-firmware/rpi-firmware.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index f9568ba50f..13ca3c23a2 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -43,9 +43,9 @@ endif ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS),y) define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS - for ovldtb in $(@D)/boot/overlays/*.dtbo; do \ - $(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \ - done + $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ + $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) + ) endef else # Still create the directory, so a genimage.cfg can include it independently of From patchwork Tue Sep 21 20:21:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1530859 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=GHcYiGH0; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HDXsP2hPdz9sXV for ; Wed, 22 Sep 2021 06:22:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E45E1406D4; Tue, 21 Sep 2021 20:22:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RvgztBqyihIj; Tue, 21 Sep 2021 20:22:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 52181406CE; Tue, 21 Sep 2021 20:22:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 5E5CB1BF9AD for ; Tue, 21 Sep 2021 20:21:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4C073608B6 for ; Tue, 21 Sep 2021 20:21:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=gmx.net Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5_pmPcm7EWEc for ; Tue, 21 Sep 2021 20:21:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by smtp3.osuosl.org (Postfix) with ESMTPS id 32E7F606D5 for ; Tue, 21 Sep 2021 20:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1632255700; bh=Ph5AJ9QUUnZEJbCKxHG3cDt7ZkoDa3BvfF7+teFp7Mk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=GHcYiGH0duDYkroXRsZidY8FFX8V0qURTog5nNVcdWhRts94K6sFg/60gnJ0yw0+Z uJds0WMXY7C6T3m7dLGoMC/0R03GbfAo3jPNfrdjn483EKFvBUpvFxVAU3R0kdGncf MNnUGo5cnoewFa457C1vZLe86rgYC39j7cZramsU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.170]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MGQnF-1mf5Y106LF-00GuEK; Tue, 21 Sep 2021 22:21:40 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Tue, 21 Sep 2021 22:21:37 +0200 Message-Id: <20210921202137.7092-6-ps.report@gmx.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210921202137.7092-1-ps.report@gmx.net> References: <20210921202137.7092-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:DxGA8PPk2bMr1LvxedlfZYn8kwBav3K9B9JfLy2hl6+vE7Nd+l8 Bsv8zZd52w7jieBXk+cBNR9Xdv1qODa4sY97SGCIAvAO5LnPxb/r1jOI/Z2//O52a5BFUcc eAAWtnSVzSv7oAtEIXFMav627ZKuwgEHviV78FyPuTYde6POhnpByNp4zFluAV2WsUFW2Jn lfPLxWyKfCsshPzcoYUcQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:SbOgagEyBqs=:gxS8UXyZmTN10n+I+UHGzy v8NLMD/c6UC6DThsQ6ZRqxXGjfNJFR4OiGKA6ZJePGW2gq1H50Yy/7iFCZlE2X4lhOd5EChX5 9sVVy9SgdDzaw4Jd2rkEZ2c8lMviS+xSEEdMQVDmNxiXBHRVwWyZdPe4hodvTS+u3g2AiVCSq vPfc5hM26+kFaa7+7pd5gQuyjX3/2Y+bB0Cg+srtC3syDNlOKeumJnZBY9pEiCeH0cT7d03aD pMYlZvIfFb5RrRXwnfrezpd7QZJawHxcamsnTjdhf8uM+sZnKTUZypISX8DfR63H/C2/lD43C iCtbYzf9g+aAa45cd/EIUj5YUJcTttReTsM43MRgN5C0RB03xPhX+VSwKTQ6FQOIGZadmPzf8 5NJryz6Gl0FHE/gfRDST4Se4693zqMs+YQK28XtS/JDkVQ0mw0bbafK8iX60mnez9PTH/VG6l su7l/MYMeA6sRgWKoFHBrzSQMVSXfvaIn2UtboHcECcJalf9U5ExMqkxlMaYMD7XNBRnFSsS9 evmwTyTT4zPMHpA5uyfP1whEUer2AEHFFWtQLv8kUMQd7ACsVIEs6Ne/iPZ0SYHI6/nIx/6U1 yKNOOKe15BGQhD4SDwgJ196W+A84QZFZnQFEB+Ve7anvuT1guMyHzuvq/0l23ikta6Tm8iOY2 wS0cDSsUOCnh9xINO6tvhoM8/xVv2YWw593rTNiY6N+ZyOlS5wiNB7sCtQPvL0ISY0BtRWD5q F4lO87VSpNWwbOZdhDyJ1JmThwex9qX+skeCxcVplGb9k9HKmb6w3758IIa4YlERddU0Cfj3E UvTvf/13Whpq9/w8RIMrlX/UBXvV9HDM9fVWtP432VjijzD2ACa8f8JChaL/a3mTYt7RA+uv6 3pAwVG5B55f46pfXAiPYhWXflK9zKXDcaGIy8zyOt9ugXAfWuUaTSw1GkGM9ZagsgMVZsaVWu UJrkoWIvyvI41eExxlbEMyfccczdsmUcg1cUL4RSCyuEYLdrzenwHbE4jNPJzktL6udGpdf3S KG+XtljzrYq6UZm24XOPUekVX8dXOfNLGCxgZu99L7e89BZ4V4DK1ya9vG0eRM6AQKgnp7I2+ TTzenmPrm+uWNc= Subject: [Buildroot] [PATCH v5 6/6] package/rpi-wifi-firmware: provide convenience links for RPi3A+, RPi3B+ and RPi4B firmware configuration files X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arthur Courtel , Mahyar Koshkouei , Martin Bark Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" Provide convenience links for BCM43455/CYW43455 based RPi3A+, RPi3B+ and RPi4B WIFI firmware configuration files to avoid runtime firmware loading warning in the kernel logs, e.g. (RPi3B+): brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt failed with error -2 or (RP4B brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt failed with error -2 Signed-off-by: Peter Seiderer --- Changes v4 -> v5: - new patch --- package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index 28926ff4f0..582e0aa8f5 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -12,6 +12,9 @@ RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt + ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt + ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt endef $(eval $(generic-package))