Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump version to 20221215-105525
@ 2024-04-26 21:35 Fiona Klute via buildroot
  2024-05-06 16:20 ` Fiona Klute via buildroot
  2024-07-09 20:51 ` Thomas Petazzoni via buildroot
  0 siblings, 2 replies; 4+ messages in thread
From: Fiona Klute via buildroot @ 2024-04-26 21:35 UTC (permalink / raw)
  To: buildroot; +Cc: Fiona Klute

From: Fiona Klute <fiona.klute+wiwa@gmx.de>

The "msd" (mass storage device) firmware files in 2021.07.01 don't
work with some newer CM4 based devices, the one I had issues with is a
RevPi Connect 4. Updating fixes the issue. Mass storage device mode is
required to flash the eMMC of CM4 devices.

Signed-off-by: Fiona Klute <fiona.klute+wiwa@gmx.de>
---
 ...001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch | 14 +++++++++-----
 .../raspberrypi-usbboot/raspberrypi-usbboot.hash   |  2 +-
 package/raspberrypi-usbboot/raspberrypi-usbboot.mk |  4 ++--
 3 files changed, 12 insertions(+), 8 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..776f6d3476 100644
--- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch
+++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch
@@ -10,21 +10,25 @@ Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 [Rebased on 9324fd7]
 Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+[Rebased on 20221215-105525-0-g1afa26c5]
+Signed-off-by: Fiona Klute <fiona.klute+wiwa@gmx.de>
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/Makefile b/Makefile
-index 822e714..875e717 100755
+index dc78cfe..5ada5be 100755
 --- a/Makefile
 +++ b/Makefile
-@@ -1,5 +1,5 @@
+@@ -1,7 +1,7 @@
+ PKG_VER=$(shell grep rpiboot debian/changelog | head -n1 | sed 's/.*(\(.*\)).*/\1/g')
+ GIT_VER=$(shell git rev-parse HEAD 2>/dev/null | cut -c1-8 || echo "")
  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)
+-	$(CC) -Wall -Wextra -g -o $@ $< `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\""
++	$(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< `pkg-config --cflags --libs libusb-1.0`  -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" $(LDFLAGS)

  %.h: %.bin ./bin2c
  	./bin2c $< $@
 --
-2.31.1
+2.43.0

diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash
index cedc5fb7e1..830ead8243 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  2f02dbe9a88e9dfad5f05e513e1f30afd47b1575820f7c3b09665dfefc45bbaa  raspberrypi-usbboot-20221215-105525.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..24a1f6d906 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 = 20221215-105525
 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

--
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump version to 20221215-105525
  2024-04-26 21:35 [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump version to 20221215-105525 Fiona Klute via buildroot
@ 2024-05-06 16:20 ` Fiona Klute via buildroot
  2024-07-09 20:51 ` Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 4+ messages in thread
From: Fiona Klute via buildroot @ 2024-05-06 16:20 UTC (permalink / raw)
  To: buildroot

Hi,

I still didn't get any response (merge/comment/rejection) on this and
the "package/kmod: fix build with musl" patch I sent the same day. Is
there anything else I can do to get them to the right person? They're
necessary to get the board I'm working on working, and for musl-based
builds with compressed kernel modules in general.

Best regards,
Fiona

Am 26.04.24 um 23:35 schrieb Fiona Klute via buildroot:
> From: Fiona Klute <fiona.klute+wiwa@gmx.de>
>
> The "msd" (mass storage device) firmware files in 2021.07.01 don't
> work with some newer CM4 based devices, the one I had issues with is a
> RevPi Connect 4. Updating fixes the issue. Mass storage device mode is
> required to flash the eMMC of CM4 devices.
>
> Signed-off-by: Fiona Klute <fiona.klute+wiwa@gmx.de>
> ---
>   ...001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch | 14 +++++++++-----
>   .../raspberrypi-usbboot/raspberrypi-usbboot.hash   |  2 +-
>   package/raspberrypi-usbboot/raspberrypi-usbboot.mk |  4 ++--
>   3 files changed, 12 insertions(+), 8 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..776f6d3476 100644
> --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch
> +++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch
> @@ -10,21 +10,25 @@ Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2
>   Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>   [Rebased on 9324fd7]
>   Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> +[Rebased on 20221215-105525-0-g1afa26c5]
> +Signed-off-by: Fiona Klute <fiona.klute+wiwa@gmx.de>
>   ---
>    Makefile | 2 +-
>    1 file changed, 1 insertion(+), 1 deletion(-)
>
>   diff --git a/Makefile b/Makefile
> -index 822e714..875e717 100755
> +index dc78cfe..5ada5be 100755
>   --- a/Makefile
>   +++ b/Makefile
> -@@ -1,5 +1,5 @@
> +@@ -1,7 +1,7 @@
> + PKG_VER=$(shell grep rpiboot debian/changelog | head -n1 | sed 's/.*(\(.*\)).*/\1/g')
> + GIT_VER=$(shell git rev-parse HEAD 2>/dev/null | cut -c1-8 || echo "")
>    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)
> +-	$(CC) -Wall -Wextra -g -o $@ $< `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\""
> ++	$(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< `pkg-config --cflags --libs libusb-1.0`  -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" $(LDFLAGS)
>
>    %.h: %.bin ./bin2c
>    	./bin2c $< $@
>   --
> -2.31.1
> +2.43.0
>
> diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash
> index cedc5fb7e1..830ead8243 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  2f02dbe9a88e9dfad5f05e513e1f30afd47b1575820f7c3b09665dfefc45bbaa  raspberrypi-usbboot-20221215-105525.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..24a1f6d906 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 = 20221215-105525
>   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
>
> --
> 2.43.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump version to 20221215-105525
  2024-04-26 21:35 [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump version to 20221215-105525 Fiona Klute via buildroot
  2024-05-06 16:20 ` Fiona Klute via buildroot
@ 2024-07-09 20:51 ` Thomas Petazzoni via buildroot
  2024-07-13 11:00   ` Peter Korsgaard
  1 sibling, 1 reply; 4+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-09 20:51 UTC (permalink / raw)
  To: Fiona Klute via buildroot; +Cc: Fiona Klute, fiona.klute

On Fri, 26 Apr 2024 23:35:51 +0200
Fiona Klute via buildroot <buildroot@buildroot.org> wrote:

> From: Fiona Klute <fiona.klute+wiwa@gmx.de>
> 
> The "msd" (mass storage device) firmware files in 2021.07.01 don't
> work with some newer CM4 based devices, the one I had issues with is a
> RevPi Connect 4. Updating fixes the issue. Mass storage device mode is
> required to flash the eMMC of CM4 devices.
> 
> Signed-off-by: Fiona Klute <fiona.klute+wiwa@gmx.de>
> ---
>  ...001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch | 14 +++++++++-----
>  .../raspberrypi-usbboot/raspberrypi-usbboot.hash   |  2 +-
>  package/raspberrypi-usbboot/raspberrypi-usbboot.mk |  4 ++--
>  3 files changed, 12 insertions(+), 8 deletions(-)

For some reason, your changes on the patch 0001 did not apply, so I
fixed that up manually when applying. Patch is now applied. Thanks and
sorry for the delay!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump version to 20221215-105525
  2024-07-09 20:51 ` Thomas Petazzoni via buildroot
@ 2024-07-13 11:00   ` Peter Korsgaard
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2024-07-13 11:00 UTC (permalink / raw)
  To: Thomas Petazzoni via buildroot; +Cc: Fiona Klute, fiona.klute, Thomas Petazzoni

>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes:

 > On Fri, 26 Apr 2024 23:35:51 +0200
 > Fiona Klute via buildroot <buildroot@buildroot.org> wrote:

 >> From: Fiona Klute <fiona.klute+wiwa@gmx.de>
 >> 
 >> The "msd" (mass storage device) firmware files in 2021.07.01 don't
 >> work with some newer CM4 based devices, the one I had issues with is a
 >> RevPi Connect 4. Updating fixes the issue. Mass storage device mode is
 >> required to flash the eMMC of CM4 devices.
 >> 
 >> Signed-off-by: Fiona Klute <fiona.klute+wiwa@gmx.de>
 >> ---
 >> ...001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch | 14 +++++++++-----
 >> .../raspberrypi-usbboot/raspberrypi-usbboot.hash   |  2 +-
 >> package/raspberrypi-usbboot/raspberrypi-usbboot.mk |  4 ++--
 >> 3 files changed, 12 insertions(+), 8 deletions(-)

 > For some reason, your changes on the patch 0001 did not apply, so I
 > fixed that up manually when applying. Patch is now applied. Thanks and
 > sorry for the delay!

Committed to 2024.02.x and 2024.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-13 11:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-26 21:35 [Buildroot] [PATCH 1/1] package/raspberrypi-usbboot: bump version to 20221215-105525 Fiona Klute via buildroot
2024-05-06 16:20 ` Fiona Klute via buildroot
2024-07-09 20:51 ` Thomas Petazzoni via buildroot
2024-07-13 11:00   ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox