From patchwork Mon Jun 3 23:09:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Athaariq Ardhiansyah X-Patchwork-Id: 1943053 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 4VtTwV61jXz1ydW for ; Tue, 4 Jun 2024 09:10:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8A4FC404DB; Mon, 3 Jun 2024 23:10:32 +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 x0NAYysnlu5R; Mon, 3 Jun 2024 23:10:31 +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 332DD4065D Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 332DD4065D; Mon, 3 Jun 2024 23:10:31 +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 443581BF352 for ; Mon, 3 Jun 2024 23:10:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3E6FC60B9C for ; Mon, 3 Jun 2024 23:10:26 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id fjtLhI_J5XiZ for ; Mon, 3 Jun 2024 23:10:25 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=117.53.144.211; helo=mail.athaariq.my.id; envelope-from=foss@athaariq.my.id; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 3254C6063C DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3254C6063C Received: from mail.athaariq.my.id (unknown [117.53.144.211]) by smtp3.osuosl.org (Postfix) with ESMTP id 3254C6063C for ; Mon, 3 Jun 2024 23:10:25 +0000 (UTC) Received: from localhost.localdomain (unknown [192.168.100.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mail.athaariq.my.id (Postfix) with ESMTPSA id 59C79344EB; Mon, 03 Jun 2024 23:10:23 +0000 (UTC) From: Athaariq Ardhiansyah To: buildroot@buildroot.org Date: Tue, 4 Jun 2024 06:09:35 +0700 Message-ID: <20240603230940.51746-2-foss@athaariq.my.id> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240603230940.51746-1-foss@athaariq.my.id> References: <20240603230940.51746-1-foss@athaariq.my.id> MIME-Version: 1.0 X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=athaariq.my.id Subject: [Buildroot] [PATCH v3 2/3] package/raspberrypi-usbboot: bump version to master (commit 4a3d311) 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: , Cc: Athaariq Ardhiansyah , Fiona Klute Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Latest raspberrypi-usbboot package has Raspberry Pi 5 support. It is considerably matured at commit 4a3d31171769f87d919340778e5aaeaba01e10b5. Signed-off-by: Athaariq Ardhiansyah --- Changes v1 -> v2: - Fix missing description due to terminal issue - Use the latest commit instead of the latest tag Changes v2 -> v3: - Update the commit title - Add more explanation on commit description --- ...akefile-allow-passing-CFLAGS-LDFLAGS.patch | 25 ++++++++++--------- .../raspberrypi-usbboot.hash | 2 +- .../raspberrypi-usbboot.mk | 4 +-- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch index d482b0b9d4..ea53f8360a 100644 --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch +++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch @@ -1,30 +1,31 @@ -From 38b730c00f45abf324caf687b5b00662ff4252c2 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 2 Dec 2016 23:09:44 +0100 +From e09c92d68efa4efbd48a3366f9053a4f8c275091 Mon Sep 17 00:00:00 2001 +From: Athaariq Ardhiansyah +Date: Mon, 3 Jun 2024 15:35:49 +0700 Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS -This might be needed to pass some custom CFLAGS/LDFLAGS when building -rpiboot. +This might be needed to pass some custom CFLAGS/LDFLAGS when building rpiboot. Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 Signed-off-by: Thomas Petazzoni -[Rebased on 9324fd7] Signed-off-by: Peter Seiderer +Signed-off-by: Athaariq Ardhiansyah --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 822e714..875e717 100755 +index 4479b1b..076ae43 100755 --- a/Makefile +++ b/Makefile -@@ -1,5 +1,5 @@ - rpiboot: main.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h -- $(CC) -Wall -Wextra -g -o $@ $< -lusb-1.0 -+ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) +@@ -3,7 +3,7 @@ GIT_VER=$(shell git rev-parse HEAD 2>/dev/null | cut -c1-8 || echo "") + INSTALL_PREFIX?=/usr + + rpiboot: main.c bootfiles.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h +- $(CC) -Wall -Wextra -g -o $@ main.c bootfiles.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" ++ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ main.c bootfiles.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(LDFLAGS) %.h: %.bin ./bin2c ./bin2c $< $@ -- -2.31.1 +2.45.2 diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index cedc5fb7e1..1a183bf47f 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4565314b38e7c7505b7d32a3b51b49f79c7dd5767d45b86d38e5255ae7489a43 raspberrypi-usbboot-2021.07.01.tar.gz +sha256 2182a6bf5ca9cd54ee3bca2d7667758ceac685fa78a3a6ae663762bde03e781a raspberrypi-usbboot-4a3d31171769f87d919340778e5aaeaba01e10b5.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 2e4194da0b..7eef7df600 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,9 +4,9 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 2021.07.01 +RASPBERRYPI_USBBOOT_VERSION = 4a3d31171769f87d919340778e5aaeaba01e10b5 RASPBERRYPI_USBBOOT_SITE = \ - $(call github,raspberrypi,usbboot,v$(RASPBERRYPI_USBBOOT_VERSION)) + $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE