aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Blake <chrisrblake93@gmail.com>2017-10-20 10:32:37 -0500
committerMathias Kresin <dev@kresin.me>2017-10-25 09:22:08 +0200
commit93bfac468e9917ecc97ee24700cb50104feb441d (patch)
tree660c157a3db176b8033fb747e428ca87a61946f5
parent79992d197f00506a0ff7087420143de1ca0ccdd2 (diff)
downloadupstream-93bfac468e9917ecc97ee24700cb50104feb441d.tar.gz
upstream-93bfac468e9917ecc97ee24700cb50104feb441d.tar.bz2
upstream-93bfac468e9917ecc97ee24700cb50104feb441d.zip
mpc85xx: update HiveAP-330 dts
initramfs is not the proper name for this, as it stores a boot ramdisk and not a filesystem. Update the name to reflect it's usage correctly. If CMDLINE_OVERRIDE is enabled, the chosen bootargs aren't used at all. Drop them from the device tree source file to not cause confusion. Remove the noinitrd bootarg. Due to the empty ramdisk this parameter isn't required any longer: [ 0.000000] Initrd not found or empty - disabling initrd Use the LEDE mtd-mac-address* device tree properties to set the interfaces MAC-Addresses. Signed-off-by: Chris Blake <chrisrblake93@gmail.com> Signed-off-by: Mathias Kresin <dev@kresin.me>
-rw-r--r--target/linux/mpc85xx/base-files/lib/preinit/05_set_iface_mac_mcp85xx17
-rw-r--r--target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts11
2 files changed, 6 insertions, 22 deletions
diff --git a/target/linux/mpc85xx/base-files/lib/preinit/05_set_iface_mac_mcp85xx b/target/linux/mpc85xx/base-files/lib/preinit/05_set_iface_mac_mcp85xx
deleted file mode 100644
index cecaee86b0..0000000000
--- a/target/linux/mpc85xx/base-files/lib/preinit/05_set_iface_mac_mcp85xx
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /lib/functions/system.sh
-
-preinit_set_mac_address() {
- case $(board_name) in
- hiveap-330)
- mac_wan=$(mtd_get_mac_binary hw-info 0)
- [ -n "$mac_wan" ] && ifconfig eth0 hw ether "$mac_wan"
- mac_lan=$(macaddr_add $(mtd_get_mac_binary hw-info 0) +1)
- [ -n "$mac_lan" ] && ifconfig eth1 hw ether "$mac_lan"
- ;;
- esac
-}
-
-boot_hook_add preinit_main preinit_set_mac_address
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
index 7900c40c7e..5e732664aa 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
@@ -15,8 +15,7 @@
compatible = "aerohive,hiveap-330";
chosen {
- bootargs = "console=ttyS0,9600";
- bootargs-override = "console=ttyS0,9600 noinitrd";
+ bootargs-override = "console=ttyS0,9600";
};
memory {
@@ -42,7 +41,7 @@
partition@40000 {
reg = <0x40000 0x40000>;
- label = "initramfs";
+ label = "initrd";
};
partition@80000 {
@@ -61,7 +60,7 @@
read-only;
};
- partition@3f00000 {
+ hwinfo: partition@3f00000 {
reg = <0x3f00000 0x20000>;
label = "hw-info";
read-only;
@@ -158,7 +157,7 @@
status = "okay";
phy-handle = <&phy0>;
phy-connection-type = "rgmii-id";
-
+ mtd-mac-address = <&hwinfo 0>;
};
enet1: ethernet@b1000 {
@@ -169,6 +168,8 @@
status = "okay";
phy-handle = <&phy1>;
phy-connection-type = "rgmii-id";
+ mtd-mac-address = <&hwinfo 0>;
+ mtd-mac-address-increment = <1>;
};
gpio0: gpio-controller@fc00 {