From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0f2186725ef5cd62d1482b4482e20a6295ebf2ad
Date: Fri, 21 Sep 2018 14:28:02 +0100 [thread overview]
Message-ID: <20180921132803.29A311081BD3@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4654 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 0f2186725ef5cd62d1482b4482e20a6295ebf2ad (commit)
via e2a3147fe5b43f89084cbea25ae174ffe6c6232c (commit)
from 4eedf6793b5dc5c6f3d91fb1db0b32a3fc40c24d (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 0f2186725ef5cd62d1482b4482e20a6295ebf2ad
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Sep 21 15:26:52 2018 +0200
core124: finish updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e2a3147fe5b43f89084cbea25ae174ffe6c6232c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Sep 21 15:18:24 2018 +0200
arm: boot.scr: add setting to edit fdt via uEnv.txt
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/124/filelists/aarch64/files | 2 ++
config/rootfiles/core/124/filelists/armv5tel/files | 2 ++
config/rootfiles/core/124/update.sh | 2 +-
config/u-boot/boot.cmd | 8 ++++++++
config/u-boot/boot.scr | Bin 2373 -> 2463 bytes
make.sh | 2 +-
6 files changed, 14 insertions(+), 2 deletions(-)
create mode 100644 config/rootfiles/core/124/filelists/aarch64/files
create mode 100644 config/rootfiles/core/124/filelists/armv5tel/files
Difference in files:
diff --git a/config/rootfiles/core/124/filelists/aarch64/files b/config/rootfiles/core/124/filelists/aarch64/files
new file mode 100644
index 000000000..6a00446f4
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/aarch64/files
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr
diff --git a/config/rootfiles/core/124/filelists/armv5tel/files b/config/rootfiles/core/124/filelists/armv5tel/files
new file mode 100644
index 000000000..6a00446f4
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/armv5tel/files
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr
diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh
index 3b5a601d6..b65bc52b8 100644
--- a/config/rootfiles/core/124/update.sh
+++ b/config/rootfiles/core/124/update.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2017 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2018 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index 1d3017ba9..5184e6f87 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -73,6 +73,14 @@ fi;
setenv fdt_high ffffffff;
fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type};
fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile};
+
+if test "${FDTCMDS}" = ""; then
+ echo ;
+else
+ fdt addr ${fdt_addr_r};
+ run FDTCMDS;
+fi;
+
setenv ramdisk_addr ${ramdisk_addr_r}
if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then
echo Ramdisk loaded...;
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index 0d9e67b96..d9395c0ae 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ
diff --git a/make.sh b/make.sh
index 0b79e9c88..d8b7856cb 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.21" # Version number
CORE="124" # Core Level (Filename)
-PAKFIRE_CORE="123" # Core Level (PAKFIRE)
+PAKFIRE_CORE="124" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2018-09-21 13:28 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=20180921132803.29A311081BD3@git01.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