From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4dd7df2f82266d8d7a4474568020a326e9823f40
Date: Wed, 16 May 2018 13:12:04 +0100 [thread overview]
Message-ID: <20180516121205.59D3B1081DF2@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 7013 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 4dd7df2f82266d8d7a4474568020a326e9823f40 (commit)
via 959b404ee0bccd4222055bf75b91d230dda6f65c (commit)
via 4a2776560115d0dcd2288ee5c246ee6604ffc6a8 (commit)
from 83a618fdcc2b278bd788e56ca7db6fdbb4afa3f1 (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 4dd7df2f82266d8d7a4474568020a326e9823f40
Merge: 959b404ee 83a618fdc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 16 14:09:42 2018 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 959b404ee0bccd4222055bf75b91d230dda6f65c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 16 10:43:58 2018 +0200
u-boot: add Raspberry Pi 3 Model B+
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4a2776560115d0dcd2288ee5c246ee6604ffc6a8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 16 10:40:36 2018 +0200
swconfig: update switch config script for Lamobo R1
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/u-boot/boot.cmd | 8 ++-
config/u-boot/boot.scr | Bin 1813 -> 1927 bytes
lfs/u-boot | 1 +
src/initscripts/system/swconfig | 54 +++++++++++++++------
.../rpi/u-boot-2018.03_add_rpi3-b-plus.patch | 15 ++++++
5 files changed, 60 insertions(+), 18 deletions(-)
create mode 100644 src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
Difference in files:
diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index d740e756e..c6411def1 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -34,10 +34,14 @@ fi;
if test "${SERIAL-CONSOLE}" = "ON"; then
if test ${console} = ""; then
if test "${board}" = "rpi"; then
- if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+ if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then
setenv console ttyS1,115200n8;
else
- setenv console ttyAMA0,115200n8;
+ if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+ setenv console ttyS1,115200n8;
+ else
+ setenv console ttyAMA0,115200n8;
+ fi;
fi;
else
setenv console ttyS0,115200n8;
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index d9a1dbbc9..322668585 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ
diff --git a/lfs/u-boot b/lfs/u-boot
index e20d58035..55ecea9e3 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -123,6 +123,7 @@ ifneq "$(MKIMAGE)" "1"
# Raspberry Pi 3
-mkdir -pv /usr/share/u-boot/rpi3
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
cd $(DIR_APP) && make CROSS_COMPILE="" rpi_3_32b_config
cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi3 - IPFire.org"!' .config
cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
diff --git a/src/initscripts/system/swconfig b/src/initscripts/system/swconfig
index 0ee4260bd..32f5b0a1d 100644
--- a/src/initscripts/system/swconfig
+++ b/src/initscripts/system/swconfig
@@ -26,31 +26,53 @@ fi
case "${1}" in
start)
case `cat /proc/device-tree/model 2>/dev/null` in
- "Lamobo-R1")
+ "Lamobo R1")
#
# Lamobo R1 aka BPi R1 Routerboard
#
- # Speaker | LAN1 | LAN2 | LAN3 | LAN4 || LAN5 | HDMI
+ # Speaker | LAN4 | LAN3 | LAN2 | LAN1 || WAN | HDMI
# SW-Port | P2 | P1 | P0 | P4 || P3 |
- # VLAN | 11 | 12 | 13 | 14 ||ALL(t)|
+ # VLAN | 14 | 13 | 12 | 11 || all |
#
# Switch-Port P8 - ALL(t) boards internal CPU Port
#
- device=`ls /sys/class/net/*/device/stmmac-0* | head -1 | cut -d/ -f5`
+
+ device=`ls /sys/class/net/*/device/driver/1c50000.ethernet/net | head -1`
ip link set $device up
- boot_mesg "Configure vlan-switch on $device ..."
- # Reset switch, counter and enable vlan mode
- swconfig dev $device set reset 1
- swconfig dev $device set reset_mib 1
- swconfig dev $device set enable_vlan 1
+
+ # create bridge
+ ip link add switch0 type bridge
+ ip link set wan master switch0
+ ip link set lan1 master switch0
+ ip link set lan2 master switch0
+ ip link set lan3 master switch0
+ ip link set lan4 master switch0
+
# configure vlans
- swconfig dev $device vlan 11 set ports "2 3t 8t"
- swconfig dev $device vlan 12 set ports "1 3t 8t"
- swconfig dev $device vlan 13 set ports "0 3t 8t"
- swconfig dev $device vlan 14 set ports "4 3t 8t"
- # activate new config
- swconfig dev $device set apply 1
- # create interfaces for the vlan's
+ bridge vlan add vid 11 dev lan1 pvid untagged
+ bridge vlan add vid 12 dev lan2 pvid untagged
+ bridge vlan add vid 13 dev lan3 pvid untagged
+ bridge vlan add vid 14 dev lan4 pvid untagged
+ bridge vlan add vid 11 dev wan
+ bridge vlan add vid 12 dev wan
+ bridge vlan add vid 13 dev wan
+ bridge vlan add vid 14 dev wan
+
+ # Remove wrong vlan1 from all ports
+ bridge vlan del vid 1 dev lan1
+ bridge vlan del vid 1 dev lan2
+ bridge vlan del vid 1 dev lan3
+ bridge vlan del vid 1 dev lan4
+ bridge vlan del vid 1 dev wan
+
+ # enable all ports
+ ip link set lan1 up
+ ip link set lan2 up
+ ip link set lan3 up
+ ip link set lan4 up
+ ip link set wan up
+
+ # create virtual interfaces for the vlan's
modprobe 8021q
vconfig add $device 11
vconfig add $device 12
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
new file mode 100644
index 000000000..fceef7738
--- /dev/null
+++ b/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
@@ -0,0 +1,15 @@
+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:[~2018-05-16 12:12 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=20180516121205.59D3B1081DF2@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