From c17f0722e355ae732df3a301270726f2eb708d71 Mon Sep 17 00:00:00 2001
From: Adam Wujek <adam.wujek@cern.ch>
Date: Wed, 24 Feb 2016 10:35:26 +0100
Subject: [PATCH] binaries: rename network interfaces from wrX to wriX+1
based on the commit 7c9f0d35 "sdb hardware information: the data"
I generated it running the command
sdbfs/userspace/gensdbfs hwinfo-sdb binaries/sdb-for-dataflash
from within a checkout of fpga-config-space (another ohwr project, the
SDB home).
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
---
binaries/sdb-for-dataflash | Bin 2112 -> 2112 bytes
binaries/wrboot-dhcp | 2 +-
binaries/wrboot-nand | 2 +-
binaries/wrboot-static-ip | 2 +-
.../rootfs_override/wr/etc/sdb-for-dataflash | Bin 2112 -> 2112 bytes
5 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/binaries/sdb-for-dataflash b/binaries/sdb-for-dataflash
index 396d45260f0b51f9af5c911f8199c93706e76772..0501a71e3810e32ee5b78c47567afbaac1ef56b4 100644
GIT binary patch
delta 43
xcmX>ga6n*!-()_<%8BmLe3^y}3=E7w%ursGX*junQGDWYhshO8m7ACx*Z>cE3@iWu
delta 47
zcmX>ga6n*!-^6nvVg`B)3=E7w%urrrpqE;bk(iQFq%hfn(SM?Q!{iF4%1ulTYyeBO
B4c!0$
diff --git a/binaries/wrboot-dhcp b/binaries/wrboot-dhcp
index 17f8b0e03..644e5c275 100644
--- a/binaries/wrboot-dhcp
+++ b/binaries/wrboot-dhcp
@@ -28,7 +28,7 @@ bootargs="$bootargs root=nfs rw ip=$ipinfo"
bootargs="$bootargs nfsroot=/opt/root/wrs,tcp"
# And pass the WR base MAC address, that barebox retrieved from SDB
-bootargs="$bootargs wr_nic.macaddr=$wr0_ethaddr"
+bootargs="$bootargs wr_nic.macaddr=$wri1_ethaddr"
# Load the kernel using the personal name chosen above, and boot it
tftp $kernelname /dev/mem.kernel; bootz /dev/mem.kernel
diff --git a/binaries/wrboot-nand b/binaries/wrboot-nand
index db1d66c10..3e4bf74ea 100644
--- a/binaries/wrboot-nand
+++ b/binaries/wrboot-nand
@@ -22,7 +22,7 @@ cp /boot/wrs-initramfs.gz /dev/mem.initramfs
#bootargs="verbose console=ttyS0,115200 panic=10"
bootargs="quiet console=ttyS0,115200 panic=10"
bootargs="$bootargs initrd=0x71800000,0x400000"
-bootargs="$bootargs wr_nic.macaddr=$wr0_ethaddr"
+bootargs="$bootargs wr_nic.macaddr=$wri1_ethaddr"
bootz /dev/mem.kernel
# Sleep 2 seconds so you can see the message and return to menu
diff --git a/binaries/wrboot-static-ip b/binaries/wrboot-static-ip
index cbc619806..785aeec5f 100644
--- a/binaries/wrboot-static-ip
+++ b/binaries/wrboot-static-ip
@@ -31,7 +31,7 @@ bootargs="$bootargs root=nfs rw ip=$ipinfo"
bootargs="$bootargs nfsroot=/opt/root/wrs,tcp"
# And pass the WR base MAC address, that barebox retrieved from SDB
-bootargs="$bootargs wr_nic.macaddr=$wr0_ethaddr"
+bootargs="$bootargs wr_nic.macaddr=$wri1_ethaddr"
# Load the kernel using the personal name chosen above, and boot it
tftp $kernelname /dev/mem.kernel; bootz /dev/mem.kernel
diff --git a/userspace/rootfs_override/wr/etc/sdb-for-dataflash b/userspace/rootfs_override/wr/etc/sdb-for-dataflash
index 396d45260f0b51f9af5c911f8199c93706e76772..0501a71e3810e32ee5b78c47567afbaac1ef56b4 100644
GIT binary patch
delta 43
xcmX>ga6n*!-()_<%8BmLe3^y}3=E7w%ursGX*junQGDWYhshO8m7ACx*Z>cE3@iWu
delta 47
zcmX>ga6n*!-^6nvVg`B)3=E7w%urrrpqE;bk(iQFq%hfn(SM?Q!{iF4%1ulTYyeBO
B4c!0$
--
GitLab