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 cecaee86b00a94598a861c6dd66c5e0eb218f53f..0000000000000000000000000000000000000000
--- 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 7900c40c7e8fab8515d1da18d52f7a06ea329b41..5e732664aa736628e59dbabe6e7c7c4dd52a4394 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 {