From: John Crispin <john@openwrt.org>
Date: Wed, 29 Oct 2014 20:50:40 +0000 (+0000)
Subject: lantiq: vgv7519: fix board_config on dts, read mac address and set
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=36e862da175798b7a52b8cee48444bf19bcaf26b;p=openwrt%2Fstaging%2Fyousong.git

lantiq: vgv7519: fix board_config on dts, read mac address and set

Signed-off-by: Eddi De Pieri <eddi@depieri.net>

SVN-Revision: 43109
---

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
index 8d9ae4f57f..777e38dcbd 100644
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -168,6 +168,12 @@ BTHOMEHUBV2B)
 	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
 	wan_mac=$(macaddr_add "$lan_mac" 1)
 	;;
+
+VGV7519)
+	lan_mac=$(mtd_get_mac_binary board_config 22)
+	wan_mac=$(macaddr_add "$lan_mac" 1)
+	;;
+
 esac
 
 [ -z "$(ls /lib/modules/`uname -r`/ltq_atm*)" ] || set_atm_wan "$vpi" "$vci" "$encaps" "$payload"
diff --git a/target/linux/lantiq/dts/VGV7519BRN.dts b/target/linux/lantiq/dts/VGV7519BRN.dts
index b885952b05..c90b680490 100644
--- a/target/linux/lantiq/dts/VGV7519BRN.dts
+++ b/target/linux/lantiq/dts/VGV7519BRN.dts
@@ -13,6 +13,11 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
+				partition@40000 {
+					label = "board_config";
+					reg = <0x40000 0x10000>;
+					read-only;
+				};
 				partition@80000 {
 					label = "firmware";
 					reg = <0x80000 0x780000>;
@@ -22,12 +27,6 @@
 					label = "rootfs_data";
 					reg = <0x880000 0x780000>;
 				};
-
-				partition@1f80000 {
-					label = "board_config";
-					reg = <0x40000 0x10000>;
-					read-only;
-				};
 			};
 		};
 	};
diff --git a/target/linux/lantiq/dts/VGV7519NOR.dts b/target/linux/lantiq/dts/VGV7519NOR.dts
index 744efe6e34..355a90c94c 100644
--- a/target/linux/lantiq/dts/VGV7519NOR.dts
+++ b/target/linux/lantiq/dts/VGV7519NOR.dts
@@ -17,12 +17,15 @@
 					label = "uboot";
 					reg = <0x00000 0x40000>;
 				};
-
+				partition@40000 {
+					label = "board_config";
+					reg = <0x40000 0x10000>;
+					read-only;
+				};
 				partition@60000 {
 					label = "uboot_env";
 					reg = <0x60000 0x10000>;
 				};
-
 				partition@80000 {
 					label = "firmware";
 					reg = <0x80000 0xf80000>;
@@ -30,12 +33,6 @@
 					// 0x1b0000 - 0x1000000 : rootfs (squashfs)
 					// 0x390000 - 0x1000000 : rootfs_data
 				};
-
-				partition@1f80000 {
-					label = "board_config";
-					reg = <0x40000 0x10000>;
-					read-only;
-				};
 			};
 		};
 	};