[OpenWrt-Devel] [PATCH 4/4] lantiq: generate unique ARV7519RW22 firmware
Álvaro Fernández Rojas
noltari at gmail.com
Mon Aug 11 07:59:59 EDT 2014
Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
---
diff --git a/target/linux/lantiq/dts/ARV7519RW.dtsi b/target/linux/lantiq/dts/ARV7519RW.dtsi
deleted file mode 100644
index d2d083f..0000000
--- a/target/linux/lantiq/dts/ARV7519RW.dtsi
+++ /dev/null
@@ -1,222 +0,0 @@
-/include/ "vr9.dtsi"
-
-/ {
- model = "ARV7519RW22 - Astoria Networks ARV7519RW22-A-LT";
-
- chosen {
- bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
- };
-
- memory at 0 {
- reg = <0x0 0x8000000>;
- };
-
- fpi at 10000000 {
- localbus at 0 {
- nor-boot at 0 {
- compatible = "lantiq,nor";
- bank-width = <2>;
- reg = <0 0x0 0x2000000>, <1 0x2000000 0x2000000>;
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "uboot";
- reg = <0x0 0x60000>;
- read-only;
- };
-
- partition at 60000 {
- label = "uboot-env";
- reg = <0x60000 0x20000>;
- read-only;
- };
-
- partition at 80000 {
- label = "firmware";
- reg = <0x80000 0x1e00000>;
- };
-
- partition at 1e80000 {
- label = "dsl_fw";
- reg = <0x1e80000 0x100000>;
- };
-
- boardconfig: partition at 1f80000 {
- label = "boardconfig";
- reg = <0x1f80000 0x80000>;
- read-only;
- };
- };
- };
-
- gpio: pinmux at E100B10 {
- pinctrl-names = "default";
- pinctrl-0 = <&state_default>;
-
- state_default: pinmux {
- mdio {
- lantiq,groups = "mdio";
- lantiq,function = "mdio";
- };
- pcie-rst {
- lantiq,pins = "io21";
- lantiq,pull = <0>;
- lantiq,output = <1>;
- };
- };
- };
-
- eth at E108000 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "lantiq,xrx200-net";
- reg = < 0xE108000 0x3000 /* switch */
- 0xE10B100 0x70 /* mdio */
- 0xE10B1D8 0x30 /* mii */
- 0xE10B308 0x30 /* pmac */
- >;
- interrupt-parent = <&icu0>;
- interrupts = <73 72>;
-
- lan: interface at 0 {
- compatible = "lantiq,xrx200-pdi";
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0>;
- mtd-mac-address = <&boardconfig 0x16>;
- lantiq,switch;
-
- ethernet at 0 {
- compatible = "lantiq,xrx200-pdi-port";
- reg = <0>;
- phy-mode = "rgmii";
- phy-handle = <&phy0>;
- };
- ethernet at 1 {
- compatible = "lantiq,xrx200-pdi-port";
- reg = <4>;
- phy-mode = "mii";
- phy-handle = <&phy13>;
- };
- ethernet at 2 {
- compatible = "lantiq,xrx200-pdi-port";
- reg = <5>;
- phy-mode = "mii";
- phy-handle = <&phy14>;
- };
- ethernet at 3 {
- compatible = "lantiq,xrx200-pdi-port";
- reg = <2>;
- phy-mode = "mii";
- phy-handle = <&phy11>;
- };
- ethernet at 4 {
- compatible = "lantiq,xrx200-pdi-port";
- reg = <3>;
- phy-mode = "mii";
- phy-handle = <&phy12>;
- };
- };
-
- mdio at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "lantiq,xrx200-mdio";
- phy0: ethernet-phy at 0 {
- reg = <0x0>;
- compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
- };
- phy11: ethernet-phy at 11 {
- reg = <0x11>;
- compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
- };
- phy12: ethernet-phy at 12 {
- reg = <0x12>;
- compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
- };
- phy13: ethernet-phy at 13 {
- reg = <0x13>;
- compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
- };
- phy14: ethernet-phy at 14 {
- reg = <0x14>;
- compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
- };
- };
- };
-
- ifxhcd at E101000 {
- status = "okay";
- gpios = <&gpio 32 0>;
- lantiq,portmask = <0x3>;
- };
-
- pcie at d900000 {
- status = "disabled";
- compatible = "lantiq,pcie-xway";
- };
-
- pci at E105400 {
- status = "disabled";
- compatible = "lantiq,pci-xway";
- };
- };
-
- gpio-keys-polled {
- compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
- poll-interval = <100>;
-
- wps {
- label = "wps";
- gpios = <&gpio 20 1>;
- linux,code = <0x211>;
- };
- reset {
- label = "reset";
- gpios = <&gpio 22 1>;
- linux,code = <0x198>;
- };
- rfkill {
- label = "rfkill";
- gpios = <&gpio 45 1>;
- linux,code = <0xf7>;
- };
- };
-
- gpio-leds {
- compatible = "gpio-leds";
-
- lan_green {
- label = "lan";
- gpios = <&gpio 2 1>;
- };
- message_red {
- label = "message_red";
- gpios = <&gpio 10 1>;
- };
- power_red {
- label = "power";
- gpios = <&gpio 14 1>;
- default-state = "on";
- };
- alarm_blue {
- label = "alarm";
- gpios = <&gpio 15 1>;
- };
- message_orange {
- label = "message_orange";
- gpios = <&gpio 19 1>;
- };
- message_green {
- label = "message_green";
- gpios = <&gpio 28 1>;
- };
- voice_green {
- label = "voice";
- gpios = <&gpio 29 1>;
- };
- };
-};
diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts
new file mode 100644
index 0000000..6823753
--- /dev/null
+++ b/target/linux/lantiq/dts/ARV7519RW22.dts
@@ -0,0 +1,231 @@
+/dts-v1/;
+
+/include/ "vr9.dtsi"
+
+/ {
+ model = "ARV7519RW22 - Astoria Networks ARV7519RW22-A-LT";
+
+ chosen {
+ bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
+ };
+
+ memory at 0 {
+ reg = <0x0 0x8000000>;
+ };
+
+ fpi at 10000000 {
+ localbus at 0 {
+ nor-boot at 0 {
+ compatible = "lantiq,nor";
+ bank-width = <2>;
+ reg = <0 0x0 0x2000000>, <1 0x2000000 0x2000000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "uboot";
+ reg = <0x0 0x60000>;
+ read-only;
+ };
+
+ partition at 60000 {
+ label = "uboot-env";
+ reg = <0x60000 0x20000>;
+ read-only;
+ };
+
+ partition at 80000 {
+ label = "firmware";
+ reg = <0x80000 0x1e00000>;
+ };
+
+ partition at 1e80000 {
+ label = "dsl_fw";
+ reg = <0x1e80000 0x100000>;
+ };
+
+ boardconfig: partition at 1f80000 {
+ label = "boardconfig";
+ reg = <0x1f80000 0x80000>;
+ read-only;
+ };
+ };
+ };
+
+ gpio: pinmux at E100B10 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&state_default>;
+
+ state_default: pinmux {
+ mdio {
+ lantiq,groups = "mdio";
+ lantiq,function = "mdio";
+ };
+ pcie-rst {
+ lantiq,pins = "io21";
+ lantiq,pull = <0>;
+ lantiq,output = <1>;
+ };
+ };
+ };
+
+ eth at E108000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "lantiq,xrx200-net";
+ reg = < 0xE108000 0x3000 /* switch */
+ 0xE10B100 0x70 /* mdio */
+ 0xE10B1D8 0x30 /* mii */
+ 0xE10B308 0x30 /* pmac */
+ >;
+ interrupt-parent = <&icu0>;
+ interrupts = <73 72>;
+
+ lan: interface at 0 {
+ compatible = "lantiq,xrx200-pdi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+ mtd-mac-address = <&boardconfig 0x16>;
+ lantiq,switch;
+
+ ethernet at 0 {
+ compatible = "lantiq,xrx200-pdi-port";
+ reg = <0>;
+ phy-mode = "rgmii";
+ phy-handle = <&phy0>;
+ };
+ ethernet at 1 {
+ compatible = "lantiq,xrx200-pdi-port";
+ reg = <4>;
+ phy-mode = "mii";
+ phy-handle = <&phy13>;
+ };
+ ethernet at 2 {
+ compatible = "lantiq,xrx200-pdi-port";
+ reg = <5>;
+ phy-mode = "mii";
+ phy-handle = <&phy14>;
+ };
+ ethernet at 3 {
+ compatible = "lantiq,xrx200-pdi-port";
+ reg = <2>;
+ phy-mode = "mii";
+ phy-handle = <&phy11>;
+ };
+ ethernet at 4 {
+ compatible = "lantiq,xrx200-pdi-port";
+ reg = <3>;
+ phy-mode = "mii";
+ phy-handle = <&phy12>;
+ };
+ };
+
+ mdio at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "lantiq,xrx200-mdio";
+ phy0: ethernet-phy at 0 {
+ reg = <0x0>;
+ compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+ };
+ phy11: ethernet-phy at 11 {
+ reg = <0x11>;
+ compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
+ };
+ phy12: ethernet-phy at 12 {
+ reg = <0x12>;
+ compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
+ };
+ phy13: ethernet-phy at 13 {
+ reg = <0x13>;
+ compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
+ };
+ phy14: ethernet-phy at 14 {
+ reg = <0x14>;
+ compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
+ };
+ };
+ };
+
+ ifxhcd at E101000 {
+ status = "okay";
+ gpios = <&gpio 32 0>;
+ lantiq,portmask = <0x3>;
+ };
+
+ pcie at d900000 {
+ status = "disabled";
+ compatible = "lantiq,pcie-xway";
+ };
+
+ pci at E105400 {
+ status = "disabled";
+ compatible = "lantiq,pci-xway";
+ };
+ };
+
+ gphy-xrx200 {
+ compatible = "lantiq,phy-xrx200";
+ firmware1 = "lantiq/vr9_phy22f_a1x.bin"; /*VR9 1.1*/
+ firmware2 = "lantiq/vr9_phy22f_a2x.bin"; /*VR9 1.2*/
+ phys = [ 00 01 ];
+ };
+
+ gpio-keys-polled {
+ compatible = "gpio-keys-polled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <100>;
+
+ wps {
+ label = "wps";
+ gpios = <&gpio 20 1>;
+ linux,code = <0x211>;
+ };
+ reset {
+ label = "reset";
+ gpios = <&gpio 22 1>;
+ linux,code = <0x198>;
+ };
+ rfkill {
+ label = "rfkill";
+ gpios = <&gpio 45 1>;
+ linux,code = <0xf7>;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ lan_green {
+ label = "lan";
+ gpios = <&gpio 2 1>;
+ };
+ message_red {
+ label = "message_red";
+ gpios = <&gpio 10 1>;
+ };
+ power_red {
+ label = "power";
+ gpios = <&gpio 14 1>;
+ default-state = "on";
+ };
+ alarm_blue {
+ label = "alarm";
+ gpios = <&gpio 15 1>;
+ };
+ message_orange {
+ label = "message_orange";
+ gpios = <&gpio 19 1>;
+ };
+ message_green {
+ label = "message_green";
+ gpios = <&gpio 28 1>;
+ };
+ voice_green {
+ label = "voice";
+ gpios = <&gpio 29 1>;
+ };
+ };
+};
diff --git a/target/linux/lantiq/dts/ARV7519RWV11.dts b/target/linux/lantiq/dts/ARV7519RWV11.dts
deleted file mode 100644
index 7dadf14..0000000
--- a/target/linux/lantiq/dts/ARV7519RWV11.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/dts-v1/;
-
-/include/ "ARV7519RW.dtsi"
-
-/ {
- gphy-xrx200 {
- compatible = "lantiq,phy-xrx200";
- firmware = "lantiq/vr9_phy22f_a1x.bin"; /*VR9 1.1*/
- phys = [ 00 01 ];
- };
-};
diff --git a/target/linux/lantiq/dts/ARV7519RWV12.dts b/target/linux/lantiq/dts/ARV7519RWV12.dts
deleted file mode 100644
index 0dd7972..0000000
--- a/target/linux/lantiq/dts/ARV7519RWV12.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/dts-v1/;
-
-/include/ "ARV7519RW.dtsi"
-
-/ {
- gphy-xrx200 {
- compatible = "lantiq,phy-xrx200";
- firmware = "lantiq/vr9_phy22f_a2x.bin"; /*VR9 1.2*/
- phys = [ 00 01 ];
- };
-};
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 768b227..5c96b63 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -401,11 +401,8 @@ Image/BuildKernel/Profile/P2812HNUFX=$(call Image/BuildKernel/Template,P2812HNUF
Image/InstallKernel/Template/P2812HNUFX=$(call Image/InstallKernel/Template,P2812HNUFX)
Image/Build/Profile/P2812HNUFX=$(call Image/Build/$(1),$(1),P2812HNUFX)
-Image/BuildKernel/Profile/ARV7519RWV11=$(call Image/BuildKernel/Template,ARV7519RWV11,$(1))
-Image/Build/Profile/ARV7519RWV11=$(call Image/Build/$(1),$(1),ARV7519RWV11)
-
-Image/BuildKernel/Profile/ARV7519RWV12=$(call Image/BuildKernel/Template,ARV7519RWV12,$(1))
-Image/Build/Profile/ARV7519RWV12=$(call Image/Build/$(1),$(1),ARV7519RWV12)
+Image/BuildKernel/Profile/ARV7519RW22=$(call Image/BuildKernel/Template,ARV7519RW22,$(1))
+Image/Build/Profile/ARV7519RW22=$(call Image/Build/$(1),$(1),ARV7519RW22)
Image/BuildKernel/Profile/EASY80920NAND=$(call Image/BuildKernel/Template,EASY80920NAND)
Image/Build/Profile/EASY80920NAND=$(call Image/Build/$(1),$(1),EASY80920NAND)
diff --git a/target/linux/lantiq/xrx200/profiles/arv.mk b/target/linux/lantiq/xrx200/profiles/arv.mk
index 776bf49..821884c 100644
--- a/target/linux/lantiq/xrx200/profiles/arv.mk
+++ b/target/linux/lantiq/xrx200/profiles/arv.mk
@@ -36,22 +36,12 @@ endef
$(eval $(call Profile,VGV7519BRN))
-define Profile/ARV7519RWV11
- NAME:=Livebox Astoria ARV7519 v1.1
+define Profile/ARV7519RW22
+ NAME:=Livebox Astoria ARV7519RW22
PACKAGES:=kmod-ltq-deu-vr9 kmod-ltq-hcd-vr9 \
kmod-ltq-vdsl-vr9-mei kmod-ltq-vdsl-vr9 \
kmod-ltq-atm-vr9 ltq-vdsl-vr9-fw-installer \
ltq-vdsl-app ppp-mod-pppoa
endef
-$(eval $(call Profile,ARV7519RWV11))
-
-define Profile/ARV7519RWV12
- NAME:=Livebox Astoria ARV7519 v1.2
- PACKAGES:=kmod-ltq-deu-vr9 kmod-ltq-hcd-vr9 \
- kmod-ltq-vdsl-vr9-mei kmod-ltq-vdsl-vr9 \
- kmod-ltq-atm-vr9 ltq-vdsl-vr9-fw-installer \
- ltq-vdsl-app ppp-mod-pppoa
-endef
-
-$(eval $(call Profile,ARV7519RWV12))
+$(eval $(call Profile,ARV7519RW22))
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list