Skip to content
Snippets Groups Projects
Commit 93bfac46 authored by Chris Blake's avatar Chris Blake Committed by Mathias Kresin
Browse files

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: default avatarChris Blake <chrisrblake93@gmail.com>
Signed-off-by: default avatarMathias Kresin <dev@kresin.me>
parent 79992d19
No related branches found
No related tags found
No related merge requests found
#!/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
......@@ -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 {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment