EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mpc85xx: update HiveAP-330 dts

Browse Source 
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>
This commit is contained in:
Chris Blake 2017-10-20 10:32:37 -05:00 committed by Mathias Kresin
parent 79992d197f
commit 93bfac468e
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/mpc85xx/base-files/lib/preinit/05_set_iface_mac_mcp85xx
View File

@ -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

11
target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
View File

@ -15,8 +15,7 @@
compatible = "aerohive,hiveap-330"; compatible = "aerohive,hiveap-330";
chosen { chosen {
bootargs = "console=ttyS0,9600"; bootargs-override = "console=ttyS0,9600";
bootargs-override = "console=ttyS0,9600 noinitrd";
}; };
memory { memory {
@ -42,7 +41,7 @@
partition@40000 { partition@40000 {
reg = <0x40000 0x40000>; reg = <0x40000 0x40000>;
label = "initramfs"; label = "initrd";
}; };
partition@80000 { partition@80000 {
@ -61,7 +60,7 @@
read-only; read-only;
}; };
partition@3f00000 { hwinfo: partition@3f00000 {
reg = <0x3f00000 0x20000>; reg = <0x3f00000 0x20000>;
label = "hw-info"; label = "hw-info";
read-only; read-only;
@ -158,7 +157,7 @@
status = "okay"; status = "okay";
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-connection-type = "rgmii-id"; phy-connection-type = "rgmii-id";
mtd-mac-address = <&hwinfo 0>;
}; };
enet1: ethernet@b1000 { enet1: ethernet@b1000 {
@ -169,6 +168,8 @@
status = "okay"; status = "okay";
phy-handle = <&phy1>; phy-handle = <&phy1>;
phy-connection-type = "rgmii-id"; phy-connection-type = "rgmii-id";
mtd-mac-address = <&hwinfo 0>;
mtd-mac-address-increment = <1>;
}; };
gpio0: gpio-controller@fc00 { gpio0: gpio-controller@fc00 {