From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 06104d4e6f8293b0d695f94df06a9e94eb21d72d
Date: Fri, 30 Jul 2021 20:02:22 +0000 [thread overview]
Message-ID: <4Gbywt2g4Fz2xq4@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5501 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 06104d4e6f8293b0d695f94df06a9e94eb21d72d (commit)
via 18eb75aac9d7e268844655c4ec1f3bc42f8b7284 (commit)
via 853d70e97117ae9146b89fbbe94823a0a33f17ef (commit)
from 4e6052e9376f401027b81372ff9597d69d452b0f (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 06104d4e6f8293b0d695f94df06a9e94eb21d72d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jul 30 19:58:56 2021 +0000
u-boot-friendlyarm: add armv6l rootfile
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 18eb75aac9d7e268844655c4ec1f3bc42f8b7284
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jul 30 11:29:18 2021 +0000
u-boot: remove uneeded cflags and a unused rpi patch
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 853d70e97117ae9146b89fbbe94823a0a33f17ef
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jul 30 11:28:03 2021 +0000
u-boot-friendlyarm: update to 5e8607b
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/armv6l/u-boot-friendlyarm | 2 ++
.../core/159/filelists/armv6l/u-boot-friendlyarm | 1 +
lfs/u-boot | 2 --
lfs/u-boot-friendlyarm | 11 ++++-------
.../u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch | 15 ---------------
5 files changed, 7 insertions(+), 24 deletions(-)
create mode 100644 config/rootfiles/common/armv6l/u-boot-friendlyarm
create mode 120000 config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm
delete mode 100644 src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
Difference in files:
diff --git a/config/rootfiles/common/armv6l/u-boot-friendlyarm b/config/rootfiles/common/armv6l/u-boot-friendlyarm
new file mode 100644
index 000000000..41f6956bc
--- /dev/null
+++ b/config/rootfiles/common/armv6l/u-boot-friendlyarm
@@ -0,0 +1,2 @@
+#usr/share/u-boot/nanopi-r1
+usr/share/u-boot/nanopi-r1/u-boot-sunxi-with-spl.bin
diff --git a/config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm b/config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm
new file mode 120000
index 000000000..d382d1fce
--- /dev/null
+++ b/config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm
@@ -0,0 +1 @@
+../../../../common/armv6l/u-boot-friendlyarm
\ No newline at end of file
diff --git a/lfs/u-boot b/lfs/u-boot
index 8b1f18a0e..9f3addd29 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -33,8 +33,6 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-$(MKIMAGE)
SUP_ARCH = armv6l aarch64
-CFLAGS += -fcommon
-
###############################################################################
# Top-level Rules
###############################################################################
diff --git a/lfs/u-boot-friendlyarm b/lfs/u-boot-friendlyarm
index 89145487a..c69f97018 100644
--- a/lfs/u-boot-friendlyarm
+++ b/lfs/u-boot-friendlyarm
@@ -24,17 +24,14 @@
include Config
-VER = 1ee53f5
+VER = 5e8607b
THISAPP = u-boot-friendlyarm-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/u-boot-$(VER)*
TARGET = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH = none
-#armv5tel
-
-CFLAGS += -fcommon
+SUP_ARCH = armv6l
###############################################################################
# Top-level Rules
@@ -44,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a329359aa0e9211f02526548eb6a6208
+$(DL_FILE)_MD5 = fa7bb610b17df6b884f6c88f19ce258e
install : $(TARGET)
@@ -78,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-ifeq "${BUILD_ARCH}" "armv5tel"
+ifeq "${BUILD_ARCH}" "armv6l"
# Nanopi-R1 eMMC
-mkdir -pv /usr/share/u-boot/nanopi-r1
cd $(DIR_APP) && cp arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts arch/arm/dts/sun8i-h3-nanopi-r1.dts
diff --git a/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch b/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
deleted file mode 100644
index fceef7738..000000000
--- a/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur u-boot-2018.03.org/board/raspberrypi/rpi/rpi.c u-boot-2018.03/board/raspberrypi/rpi/rpi.c
---- u-boot-2018.03.org/board/raspberrypi/rpi/rpi.c 2018-03-13 13:02:19.000000000 +0100
-+++ u-boot-2018.03/board/raspberrypi/rpi/rpi.c 2018-05-14 13:40:38.418660145 +0200
-@@ -111,6 +111,11 @@
- DTB_DIR "bcm2835-rpi-zero-w.dtb",
- false,
- },
-+ [0xD] = {
-+ "3 Model B+",
-+ DTB_DIR "bcm2837-rpi-3-b-plus.dtb",
-+ true,
-+ },
- };
-
- static const struct rpi_model rpi_models_old_scheme[] = {
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2021-07-30 20:02 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=4Gbywt2g4Fz2xq4@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