From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 15667b3394ff07a9970f0c7ea76f27f08b5d1323
Date: Sat, 04 Jan 2025 21:51:24 +0000 [thread overview]
Message-ID: <4YQYzw0qdJz2xxd@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4805 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 15667b3394ff07a9970f0c7ea76f27f08b5d1323 (commit)
via 318c037092abe862bdf1cbea0fe5e28fb8278b7d (commit)
from f7a575cebb35155372a32bc26e062dac32be9b3d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 15667b3394ff07a9970f0c7ea76f27f08b5d1323
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 4 22:50:40 2025 +0100
u-boot: remove some arm32bit parts from bootscript
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 318c037092abe862bdf1cbea0fe5e28fb8278b7d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 4 22:46:29 2025 +0100
rpi-firmware: update to 20240424
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/rpi-firmware | 7 +++++--
config/u-boot/boot.cmd | 17 ++++-------------
lfs/rpi-firmware | 6 +++---
3 files changed, 12 insertions(+), 18 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/aarch64/rpi-firmware b/config/rootfiles/common/aarch64/rpi-firmware
index 9c5c2fe28..c3eb09db1 100644
--- a/config/rootfiles/common/aarch64/rpi-firmware
+++ b/config/rootfiles/common/aarch64/rpi-firmware
@@ -1,7 +1,10 @@
#boot/LICENCE.broadcom
-boot/bcm2711-rpi-4-b.dtb
boot/bcm2711-rpi-400.dtb
-boot/bcm2711-rpi-cm4.dtb
+boot/bcm2711-rpi-4-b.dtb
+boot/bcm2711-rpi-cm4-io.dtb
+boot/bcm2837-rpi-3-b.dtb
+boot/bcm2837-rpi-3-b-plus.dtb
+boot/bcm2837-rpi-cm3-io3.dtb
boot/bootcode.bin
boot/config.txt
boot/fixup.dat
diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index 61c50d064..dc634ca98 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -58,16 +58,6 @@ if test "${SERIAL-CONSOLE}" = "ON"; then
setenv console ttyAMA0,115200n8;
fi;
fi;
- else
- if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then
- setenv console ttyS1,115200n8;
- else
- if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
- setenv console ttyS1,115200n8;
- else
- setenv console ttyAMA0,115200n8;
- fi;
- fi;
fi;
else
setenv console ttyS0,115200n8;
@@ -80,7 +70,10 @@ else
setenv bootargs console=tty1 root=${root_dev} rootwait;
fi;
-setenv fdt_high ffffffff;
+if test ${fdt_high} = ""; then
+ setenv fdt_high ffffffff;
+fi;
+
fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER};
fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}/${fdtfile};
@@ -99,10 +92,8 @@ else
setenv ramdisk_addr -;
fi;
-bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
-bootz ${kernel_addr_r} - ${fdt_addr_r};
booti ${kernel_addr_r} - ${fdt_addr_r};
# Recompile with:
diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware
index 51af49b07..edd8e5d06 100644
--- a/lfs/rpi-firmware
+++ b/lfs/rpi-firmware
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2025 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 20211127
+VER = 20240424
THISAPP = rpi-firmware-$(VER)
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1395f0d0a43212e9d40bcc17be4ec0625019cebfc4947815caf7cadd42ebf1d2093850f90ed6eca11c3df162fc3f29e6c427c3baf9dcc5229d16ce433886d0d9
+$(DL_FILE)_BLAKE2 = efad1a7686adf12aa43fbeb7c0f2071f242887ed6a392965133a822c6d89a6c806ba256a2df042b72c0aba241cf0ce728b25b45a6bca2292006f1f5dd1948fc3
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2025-01-04 21:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4YQYzw0qdJz2xxd@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox