From patchwork Sat Aug 31 19:01:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fiona Klute X-Patchwork-Id: 1979351 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wx4Bf5Wc9z1yZs for ; Sun, 1 Sep 2024 05:02:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C779A40303; Sat, 31 Aug 2024 19:01:58 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ngv5lv6Op1fy; Sat, 31 Aug 2024 19:01:58 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org AB5AF404A3 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id AB5AF404A3; Sat, 31 Aug 2024 19:01:57 +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 4090C1BF316 for ; Sat, 31 Aug 2024 19:01:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2DE6181432 for ; Sat, 31 Aug 2024 19:01:53 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Tws3vgX3BIYd for ; Sat, 31 Aug 2024 19:01:52 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=212.227.17.20; helo=mout.gmx.net; envelope-from=fiona.klute@gmx.de; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 018E981440 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 018E981440 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by smtp1.osuosl.org (Postfix) with ESMTPS id 018E981440 for ; Sat, 31 Aug 2024 19:01:51 +0000 (UTC) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from haruka.lan ([85.22.123.38]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MnJlc-1sLHUO0t7M-00p3bd; Sat, 31 Aug 2024 21:01:48 +0200 To: buildroot@buildroot.org Date: Sat, 31 Aug 2024 21:01:24 +0200 Message-ID: <20240831190126.366600-2-fiona.klute@gmx.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240831190126.366600-1-fiona.klute@gmx.de> References: <20240831190126.366600-1-fiona.klute@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:7d3a1VOBbaaJDajbu437TviKeV7SVXt96xmAKzjIoLeOaFfNTJo xZfiIpaZTiyq0zBE56xfhQFr2Lyxr2u7wd/TE+ihLXV7oFhvzHGKWHHA6pvI0BuU4edps9r l8ymywUHea3UuM8Xhq51IDLXYJXl6vAExZPQD143S5pzCyXs/aauM4IcKX2fs2i5f3x6dnS y42lj+lDkdzMWr6cHQf6g== UI-OutboundReport: notjunk:1;M01:P0:wgTGZ5zrpS0=;237LSRrW/7c5VJ9TKp7RrTQHgjp 5xnwp14u3/Kujcazq9qvUBB6K2MEeiYQ+ELncoDmB3Bk95V/GZqhRHVd2AmyXRa4IUutflh8Q w0N1n6OMm4y+jRhIoOMpZm5UOV9s8OvkjgeFgHLn+FHL8PWf9y1WXsa2udoeRUe79QVNiR0xj 5yosLYevWcgcnoMhbR0zqQK2UpO/76FeZB5mXcnX3xQfdN6/H5roe4iptprb5v7IlY+fIHxvQ B3TMUdO9NcKKmoT7zQkqjai0tQxvYkSW3NUAsa2f5Wnvg0NLgvrK6m24fANqHcfz7wdBSs5As QU45LBgNsM61ryQp5nPwi5ft+q6gFB/M/V/aHsvmB8PQpCiotEQ+lfwb1DC+XuP9m77jGi3jx mjMBGH+Z6N9f25iFoFeYJmgD7L912IpOGcIj4RoJQhnTWqu8kP43f7omlP1v2pes5FeVd3PTa /8D70KvhL9YpvluBCegFMB6APzGJB/SW1q2uAtXpkpg5SC8zXsnSCJaBzdT9OWZ49BMed5bXF NC1YCkp9cynW9xZRCjoUe9J1AtRfgs2ak2TlrwbMrABE5n1Af1DVyCEMujqtgPei23A5SZbht uQ76hUHOcZC/s/+QQ4nA6xupRNssgQHnS/Z5xPpfbnR0ko8wZnSwW/opDt8vI3vxvjjwnYBjc LrMF6Z6BRgRIUUSxl+DuplHPbAowU8rO+Oeav8IwAXMSLx/t9nkifEYp5RoGW2RziSIj5bR+E WQ7Z8jaU0+hexz2Lq0RwppW1utAwutkiPlS8VGxVZ/PgfRg0YPwc58ypkVJYOtSO5FxjurD0k MuP7wJ5dSMd7Dc4YJ8k9vi4Q== X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1725130908; x=1725735708; i=fiona.klute@gmx.de; bh=QXb6b12orPp4U6mauNspAWXupVxfISsMY29WjjS4o4I=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=iC9U7VUdhMmLjviFjUegFs6dR8KAdYeNMZ0cEnJDqHTl3Sx5MzoqlLjDLbbyBggi yh8NEwOsmV+l3cKlDqXlflxaSJf/dO6JB1BQgum78F0lGIujGyDgJTGGALJz/tvnf jxCni9+T/vr9penK6dXHNt3hkz8zXtKHAMJBxbaXRUB1nqVXTZdsUqfAm+gMZrBT9 /eLjWYZekEKjJap7I9mdhO/6ZKA4Di4oZrlh/DwC3+YuYFcf2bojBMRch7nlTso6H /rfVGDol6l7VxQIMoTxCLN9UerTGj1Y8smNWH0nQflQ2tZ8pNp5SNMv5Oh51t3l76 pMWFkJMxu6KzUjSaMQ== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmx.de header.i=fiona.klute@gmx.de header.a=rsa-sha256 header.s=s31663417 header.b=iC9U7VUd Subject: [Buildroot] [PATCH next v2 1/3] board/raspberrypi: Support boot.scr for U-Boot X-BeenThere: buildroot@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: , X-Patchwork-Original-From: Fiona Klute via buildroot From: Fiona Klute Reply-To: Fiona Klute Cc: "Fiona Klute \(WIWA\)" , =?utf-8?q?Jos=C3=A9_Mendes?= , Martin Bark , Julien Grossholtz , "Yann E . MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: "Fiona Klute (WIWA)" If using U-Boot as "kernel" for the raspberrypi bootloader, include boot.scr in the boot partition if it exists. To use this, use BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE to set a config file that uses U-Boot, and enable building a boot script in the U-Boot host tool settings. Signed-off-by: Fiona Klute (WIWA) Reviewed-by: Yann E. MORIN --- board/raspberrypi/post-image.sh | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.45.2 diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index 9b9eac972b..e4611d05dd 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -19,6 +19,12 @@ if [ ! -e "${GENIMAGE_CFG}" ]; then KERNEL=$(sed -n 's/^kernel=//p' "${BINARIES_DIR}/rpi-firmware/config.txt") FILES+=( "${KERNEL}" ) + # If config.txt calls for running U-Boot, include the boot + # script if any. + if [ "${KERNEL}" = "u-boot.bin" ] && [ -e "${BINARIES_DIR}/boot.scr" ]; then + FILES+=( "boot.scr" ) + fi + BOOT_FILES=$(printf '\\t\\t\\t"%s",\\n' "${FILES[@]}") sed "s|#BOOT_FILES#|${BOOT_FILES}|" "${BOARD_DIR}/genimage.cfg.in" \ > "${GENIMAGE_CFG}" From patchwork Sat Aug 31 19:01:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fiona Klute X-Patchwork-Id: 1979352 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wx4Bj5GBqz1yZs for ; Sun, 1 Sep 2024 05:02:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 69318419A6; Sat, 31 Aug 2024 19:02:01 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id x2qpQumf6UuQ; Sat, 31 Aug 2024 19:02:00 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0FE4D405E6 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 0FE4D405E6; Sat, 31 Aug 2024 19:02:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A406C1BF316 for ; Sat, 31 Aug 2024 19:01:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9E9CF4026B for ; Sat, 31 Aug 2024 19:01:54 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 7utcqqP84Lly for ; Sat, 31 Aug 2024 19:01:53 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=212.227.17.20; helo=mout.gmx.net; envelope-from=fiona.klute@gmx.de; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 32B08400E4 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 32B08400E4 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by smtp2.osuosl.org (Postfix) with ESMTPS id 32B08400E4 for ; Sat, 31 Aug 2024 19:01:52 +0000 (UTC) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from haruka.lan ([85.22.123.38]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MwQTF-1ruZgm1ho5-00xcDA; Sat, 31 Aug 2024 21:01:49 +0200 To: buildroot@buildroot.org Date: Sat, 31 Aug 2024 21:01:25 +0200 Message-ID: <20240831190126.366600-3-fiona.klute@gmx.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240831190126.366600-1-fiona.klute@gmx.de> References: <20240831190126.366600-1-fiona.klute@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:4Sx7+UbIilHxRB1W6F7ZKHwl+tVcJBxda1h2kRE4wtWVESlmLtt fggJseMI8M8xNX9dY1IcmwidexwEBfumrVnMFWYISRnFfv8P8PEJV/B9sT15ysWY8PxsdiY OH78fdys1Il4vjiShTxyjvwGBTOu3lizPf8J/KLZBE/6JNczX210mNkOAIz+xl9MOtuR7GI TlcT5pKH7tbV33ZcGRLkg== UI-OutboundReport: notjunk:1;M01:P0:2snym1W3meI=;0Iy7/0qJ3aSZ3kgnyNq1z8X1ZLq Uh/C+PVxTZ+gn2E13Y6UDKq5Y+sJHRHIAAEE5RcJp84Kaejp48xy5sB7JNp5F4cw6D39PyTpH rGCKyh5EbYQCyxsZVsn48VvEJw7rxyRuy05Ak95SQthO8KYbNkljQNqONhkT9dNog9ZIh/EJj LUta3M7esNspBft/PXi4GFWFk1TR3BQUvt05ozIYv8LIMeanZb0SsyaCj6zZY3dLx70iucBWD gLTCvPsxIib02+ePqsAswDqLEidndz58m8OzB1qiWeRTl7S419qvczzgEBK/9Vsz+zLMdaaEv rPqiCKScGKTzmbBxatvToNroL9ClB4RCG2qXfAZ/JItpiSMEDqKTBrssIYGD+mXNejSNFGlF0 tdR9m4IU/EpV3dRklnADxZ/m9pu0hYCoK1s1Fs+ymNPzLU27rbQ63NGj95Ogazm2howp1ZYFu CkzbcVIE66XV03YiBOhtCS4lKYpED4Fi3hdC5dIX98UW55Ys4f/+6sxOtdLpir5WqJWmY9Mbf ELo+W5XCDkdz5hBxv0APH3v2edgv/FSiEDvoXToXgjYszESzhpjTlDggx/DFmLohfCtMYiNNi U7+zmYEMJbWBglI0dQDz5wQ6fOpTxuWGYFOTBuNlcfrPnoxIem8QEbolr927lebyKiuipFPOh dIIF8Ui84tnHMRo46Ioofl+/uLmrnNheEmGxaW+kIlfpttcx52orNY+/8NcfaSvQO+bTUyz93 MJ7GrmSXkEha23vCEWOMCCQLPx9ucEFRmhfcIsk4X49xxfwIGcz6A1xhK1g/Fy8NaaxY3Ick4 P0CoqKyDfB5/XVkXao0qgH1Q== X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1725130909; x=1725735709; i=fiona.klute@gmx.de; bh=bQjLBLiaBIrqpCsl+dORmGPJlCVZ2fProFo6u4MhRMw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=QmDi74sx8yEgQ9/e0TOgBkMHIrhhvdypuNa0NTN/S2WtQrMh6tVVuTz/k6QqGDuQ pt9Expq7wmcnC09xrJFZlO3Uwt1RHHfSLFZYg+KZKf/NuJ2+WGXVmtYK58kQM+nSl b6yUerxD4QGg9sNd0AsG2CiBBYx/S8rtkShqpT6JCvM5fT9hb14EvwqyQ0KPEOzH4 JELoNYjW6TDaB+AVtaBZU8PHlcePYFWU6bNtftxKI6ElWfFYjCV8l/Pfv4Arh3/ZC naHXGnLgK1nu1SWBlO8zPIODB1CsEXFhCX/+0I5GgBdfa2grFzk3B/CnNy1MFfTq1 k6ePalaO7zgBdMLIkg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmx.de header.i=fiona.klute@gmx.de header.a=rsa-sha256 header.s=s31663417 header.b=QmDi74sx Subject: [Buildroot] [PATCH next v2 2/3] board/raspberrypi: allow non-matching globs for DTBs X-BeenThere: buildroot@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: , X-Patchwork-Original-From: Fiona Klute via buildroot From: Fiona Klute Reply-To: Fiona Klute Cc: "Fiona Klute \(WIWA\)" , =?utf-8?q?Jos=C3=A9_Mendes?= , Martin Bark , Julien Grossholtz , "Yann E . MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: "Fiona Klute (WIWA)" When installing DTBs from the rpi-firmware package (BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS=y), there's no DTB directly in the images directory because the kernel build doesn't provide one. Using pre-compiled DTBs is discouraged, but useful for using mainline kernels until suitable DTS can be merged, or to provide U-Boot with a DTB (via the firmware bootloader) independent of whatever kernel DTB is in use. Signed-off-by: Fiona Klute (WIWA) --- Changes v1 -> v2: * Check for existance of paths returned by the DTB glob expressions instead of changing shell glob behavior board/raspberrypi/post-image.sh | 2 ++ 1 file changed, 2 insertions(+) -- 2.45.2 diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index e4611d05dd..a3a2d8d620 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -13,6 +13,8 @@ if [ ! -e "${GENIMAGE_CFG}" ]; then FILES=() for i in "${BINARIES_DIR}"/*.dtb "${BINARIES_DIR}"/rpi-firmware/*; do + # ignore literal globs that didn't match anything + [ -e "${i}" ] || continue FILES+=( "${i#${BINARIES_DIR}/}" ) done From patchwork Sat Aug 31 19:01:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fiona Klute X-Patchwork-Id: 1979353 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wx4Bm4vpQz1yZs for ; Sun, 1 Sep 2024 05:02:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 03579419BD; Sat, 31 Aug 2024 19:02:05 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ECi-00RuaIDk; Sat, 31 Aug 2024 19:02:03 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 239EC419CD Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 239EC419CD; Sat, 31 Aug 2024 19:02:03 +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 BB59B1BF316 for ; Sat, 31 Aug 2024 19:01:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A71A88143A for ; Sat, 31 Aug 2024 19:01:56 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id paLtvKJIHfZs for ; Sat, 31 Aug 2024 19:01:55 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=212.227.17.22; helo=mout.gmx.net; envelope-from=fiona.klute@gmx.de; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 29EB081432 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 29EB081432 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by smtp1.osuosl.org (Postfix) with ESMTPS id 29EB081432 for ; Sat, 31 Aug 2024 19:01:54 +0000 (UTC) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from haruka.lan ([85.22.123.38]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MatRT-1sCmUn486N-00fO2g; Sat, 31 Aug 2024 21:01:51 +0200 To: buildroot@buildroot.org Date: Sat, 31 Aug 2024 21:01:26 +0200 Message-ID: <20240831190126.366600-4-fiona.klute@gmx.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240831190126.366600-1-fiona.klute@gmx.de> References: <20240831190126.366600-1-fiona.klute@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:fb541QHWhTP93pC2FsqeDd3tTakOmGocY8jSIfNHqPzmBpeki16 DvjHr7QoZ3dAyeWw/T9TagHYGXBmkFsJw1vAs/e1rZKCCM9/FA1ErLWyHCiY8c94dMlhJZ7 cjV5Q/l9KSabvMkja4mX7CebcTMnHJFHeB6SMmiGpir/zI6gR8/foVEU1Uz+JGmqEBtHuXV H028nEVCTwaJJoZgpG8SQ== UI-OutboundReport: notjunk:1;M01:P0:igQxcu+lgZI=;JsErsrxWnFcrYcxBZ8OJKL50etr pgHh81LmQchJ7C5gRPwaBBa8cTNDZgdMasTOXdU33oRYyjStz0JoUIqSs7cdNRooc30GfQ+Ki r4ZcRx+h6HOFTAAr2epKd/AFXkD0MLSI9wmY7AW6+k6DhLtetpVmTUnGbT7E/hO7B2IeXmaPY y4Hh8H/Hxj2mx/e8THPtT1JFRZHwLbODXcXON+RBBg9fTQ/vqRsGz0Cu5YZt1XijFsUDfhgyW j4mC+piGDhfZHrrByqSMY0cVv9WNTmn/jU6RWkik6Jw6U8NJD8MQhhp7JSBO7J/Zy/jaXoefx dk2NxnLjMyp6YHsgoAT4XRODxhqoDP9zigLxj7J5KWsCf/dysM01EOqGWiLlqy5ecocuDeQCG 4aSogblP0IoaVMw3pEOmCkw02X/7eRiJJqh005Rbomp7ExEaWl1vvx41iY7xtveqjdYY8wDfC 4XIyrpOhxZ0DWesDwfHHs/sioqrLiUdfb6/ITVNAEOwKDL7q5pjtb4vAzYx2kdRMWelq137T2 7LWaC6OeuXLZ2Xoh9IJsx7wrvFXEmlu5MV939XYNmkc/JES84W+i3wJKL0isoWgOH8mTneojm QhFaNV4fiCdrzBF53KMEBbX0278SuR5eUlcmUgtmJgvdPPrt73pNHHrgocmlOBlKLEu32vnWl oeQJd/sD+XNOMA9cCJKP5bMp9e5EULR7zSvfHBcWVikRlPUpYpSzcGx4e6eoJTw8/81h3rj+v JJwJ6ziWZGZSIGldOixMuSWV7Zkr0oPDXf30DHINPz8UuOHihnEiZfzTQUQ8jhZiL/GujUsCJ S6SpIMKMcbEoh/7k5O6Jm6HQ== X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1725130911; x=1725735711; i=fiona.klute@gmx.de; bh=s7Samo/Y+lKo87RTxVhEU1tOGnnZ88vyPGxcWvdMLUw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=DhBhg0EKgc3RjkUtOChw3Jms2HavTNJjvST0yhwNIDN+k/kmrFplxGLpz1Q4MORn T+z20av2PL1xr+KmAyYMx0NUL1EZN16YoFIq+U+YR/knDGLk3nKGtw2PQQ/rCL5jC cPUa17mxYVGNsV5i9eE86QroOZDX1BJFP+Cog8+Pq80AhqHq/t1Ej6IEhOOkGBX/Q 9OrrFoLYzORRjAX0R3yfcLjWVi3ldCZP06frEKEkJqMIB1/+woSxQvkX61GSfu5SQ NJNcEYOsO9WSAHfvW3+MGDS5CbiSjprzJSFsPO3KpH3CjNhg2a/RB/AHMzhHTTKmT pjc4PBTZYB2yt1ttsA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmx.de header.i=fiona.klute@gmx.de header.a=rsa-sha256 header.s=s31663417 header.b=DhBhg0EK Subject: [Buildroot] [PATCH next v2 3/3] configs/raspberrypicm4io_64_uboot_defconfig: new defconfig X-BeenThere: buildroot@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: , X-Patchwork-Original-From: Fiona Klute via buildroot From: Fiona Klute Reply-To: Fiona Klute Cc: "Fiona Klute \(WIWA\)" , =?utf-8?q?Jos=C3=A9_Mendes?= , Martin Bark , Julien Grossholtz , "Yann E . MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: "Fiona Klute (WIWA)" The new config deviates from the existing configs/raspberrypicm4io_64_defconfig only as far as necessary to demonstrate booting through U-Boot instead of having the firmware load the kernel directly. The sample boot script loads the kernel from the rootfs and uses the device tree provided by the firmware. Signed-off-by: Fiona Klute (WIWA) --- The config I'm usually using is a bit different, including using a mainline kernel (which seems strongly preferable to me), but for defconfig maintenance staying close to the other RPi defconfigs is probably easiest. board/raspberrypi/boot.scr.in | 9 +++ .../raspberrypi/config_cm4io_64bit_uboot.txt | 23 +++++++ board/raspberrypi/readme.txt | 4 ++ configs/raspberrypicm4io_64_uboot_defconfig | 60 +++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 board/raspberrypi/boot.scr.in create mode 100644 board/raspberrypi/config_cm4io_64bit_uboot.txt create mode 100644 configs/raspberrypicm4io_64_uboot_defconfig -- 2.45.2 diff --git a/board/raspberrypi/boot.scr.in b/board/raspberrypi/boot.scr.in new file mode 100644 index 0000000000..a5c986ef99 --- /dev/null +++ b/board/raspberrypi/boot.scr.in @@ -0,0 +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 +# BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE. + +# load kernel from the root partition +load mmc 0:2 ${kernel_addr_r} boot/Image +env set bootargs "root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA0,115200" +# boot using the FDT provided by firmware +booti ${kernel_addr_r} - ${fdt_addr} diff --git a/board/raspberrypi/config_cm4io_64bit_uboot.txt b/board/raspberrypi/config_cm4io_64bit_uboot.txt new file mode 100644 index 0000000000..eef929186c --- /dev/null +++ b/board/raspberrypi/config_cm4io_64bit_uboot.txt @@ -0,0 +1,23 @@ +# 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=u-boot.bin + +# Enable UART0 for serial console on ttyAMA0 +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 diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 81cd81a7f3..dc5216b088 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -65,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): $ make raspberrypicm4io_64_defconfig +or to boot CM4 (on IO Board - 64 bit) using U-Boot: + + $ make raspberrypicm4io_64_uboot_defconfig + For model 5 B: $ make raspberrypi5_defconfig diff --git a/configs/raspberrypicm4io_64_uboot_defconfig b/configs/raspberrypicm4io_64_uboot_defconfig new file mode 100644 index 0000000000..b3b35479d3 --- /dev/null +++ b/configs/raspberrypicm4io_64_uboot_defconfig @@ -0,0 +1,60 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_ARM_FPU_VFPV4=y + +# patches +BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4" + +# Install kernel to rootfs so U-Boot can load it from there, only +# U-Boot gets included in the /boot partition. +BR2_LINUX_KERNEL_INSTALL_TARGET=y +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_uboot.txt" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Required tool to flash CM4 eMMC memory +BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +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" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y + +# U-Boot and tools to build its config script +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_arm64" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/raspberrypi/boot.scr.in"