From b796ff6ef37d4a1498cd416a7f02e392e295dc77 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 18 Aug 2014 13:09:11 +0000 Subject: [PATCH] lantiq: generate unique ARV7519RW22 firmware MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas SVN-Revision: 42183 --- .../dts/{ARV7519RW.dtsi => ARV7519RW22.dts} | 9 +++++++++ target/linux/lantiq/dts/ARV7519RWV11.dts | 11 ----------- target/linux/lantiq/dts/ARV7519RWV12.dts | 11 ----------- target/linux/lantiq/image/Makefile | 7 ++----- target/linux/lantiq/xrx200/profiles/arv.mk | 16 +++------------- 5 files changed, 14 insertions(+), 40 deletions(-) rename target/linux/lantiq/dts/{ARV7519RW.dtsi => ARV7519RW22.dts} (95%) delete mode 100644 target/linux/lantiq/dts/ARV7519RWV11.dts delete mode 100644 target/linux/lantiq/dts/ARV7519RWV12.dts diff --git a/target/linux/lantiq/dts/ARV7519RW.dtsi b/target/linux/lantiq/dts/ARV7519RW22.dts similarity index 95% rename from target/linux/lantiq/dts/ARV7519RW.dtsi rename to target/linux/lantiq/dts/ARV7519RW22.dts index d2d083f870..68237532b4 100644 --- a/target/linux/lantiq/dts/ARV7519RW.dtsi +++ b/target/linux/lantiq/dts/ARV7519RW22.dts @@ -1,3 +1,5 @@ +/dts-v1/; + /include/ "vr9.dtsi" / { @@ -163,6 +165,13 @@ }; }; + 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>; diff --git a/target/linux/lantiq/dts/ARV7519RWV11.dts b/target/linux/lantiq/dts/ARV7519RWV11.dts deleted file mode 100644 index 7dadf144f9..0000000000 --- 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 0dd7972d18..0000000000 --- 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 768b227e62..5c96b632f8 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 776bf49a0a..821884cb40 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)) -- 2.30.2