Revert "mpc85xx: replace user space MAC with nvmem"

This reverts commit 931fcf61891f14dffccd0ad5dfdf7d84460ff9f2.

The definition is wrong and require mac-base compatible. Also it's not
clear if it's correct to use 0xc for mac size.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/mpc85xx/base-files/lib/preinit/10_fix_eth_mac.sh b/target/linux/mpc85xx/base-files/lib/preinit/10_fix_eth_mac.sh
index 9b032394d8ef61b7b5168f736fd0654f71389d61..ddb9bef1416ae4eef8b50f1a8bce46231ff562fb 100644 (file)
--- a/target/linux/mpc85xx/base-files/lib/preinit/10_fix_eth_mac.sh
+++ b/target/linux/mpc85xx/base-files/lib/preinit/10_fix_eth_mac.sh
@@ -8,6 +8,11 @@ preinit_set_mac_address() {
                ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr)
                ip link set dev eth1 address $(mtd_get_mac_ascii cfg1 eth1addr)
                ;;
+       watchguard,firebox-t10)
+               ip link set dev eth0 address "$(mtd_get_mac_text "device_id" 0x1830)"
+               ip link set dev eth1 address "$(mtd_get_mac_text "device_id" 0x1844)"
+               ip link set dev eth2 address "$(mtd_get_mac_text "device_id" 0x1858)"
+               ;;
        esac
 }
 

diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
index 1228a9bdfa763fa02331ab4022c33a63035cf321..607706a2d434c2cd802b458c58f7a27488c20ebc 100644 (file)
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
@@ -103,24 +103,6 @@
                                                reg = <0xc0000 0x40000>;
                                                label = "device_id";
                                                read-only;
-
-                                               nvmem-layout {
-                                                       compatible = "fixed-layout";
-                                                       #address-cells = <1>;
-                                                       #size-cells = <1>;
-
-                                                       macaddr_device_id_1830: mac-address-hex@1830 {
-                                                               reg = <0x1830 0xc>;
-                                                       };
-
-                                                       macaddr_device_id_1844: mac-address-hex@1844 {
-                                                               reg = <0x1844 0xc>;
-                                                       };
-
-                                                       macaddr_device_id_1858: mac-address-hex@1858 {
-                                                               reg = <0x1858 0xc>;
-                                                       };
-                                               };
                                        };
                                };
                        };
@@ -165,27 +147,18 @@
                enet0: ethernet@b0000 {
                        phy-handle = <&phy1>;
                        phy-connection-type = "rgmii-id";
-
-                       nvmem-cells = <&macaddr_device_id_1830>;
-                       nvmem-cell-names = "mac-address";
                };
 
                enet1: ethernet@b1000 {
                        tbi-handle = <&tbi_phy1>;
                        phy-handle = <&phy2>;
                        phy-connection-type = "sgmii";
-
-                       nvmem-cells = <&macaddr_device_id_1844>;
-                       nvmem-cell-names = "mac-address";
                };
 
                enet2: ethernet@b2000 {
                        tbi-handle = <&tbi_phy2>;
                        phy-handle = <&phy3>;
                        phy-connection-type = "sgmii";
-
-                       nvmem-cells = <&macaddr_device_id_1858>;
-                       nvmem-cell-names = "mac-address";
                };
 
                sdhc@2e000 {