aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-09-01 13:21:25 +0000
committerJohn Crispin <blogic@openwrt.org>2014-09-01 13:21:25 +0000
commit5f04f13a8db7545c01f2bbccbcaf0fc6e11af345 (patch)
tree5a268f21aa466e5e2b2323c6eefd86be6fc83913 /target/linux
parent23d136caddba110e10dab896b3fab45001a95376 (diff)
downloadupstream-5f04f13a8db7545c01f2bbccbcaf0fc6e11af345.tar.gz
upstream-5f04f13a8db7545c01f2bbccbcaf0fc6e11af345.tar.bz2
upstream-5f04f13a8db7545c01f2bbccbcaf0fc6e11af345.zip
lantiq: generate unique ARV7519RW22 firmware
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Backport of r42183 git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42362 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/lantiq/dts/ARV7519RW22.dts (renamed from target/linux/lantiq/dts/ARV7519RW.dtsi)9
-rw-r--r--target/linux/lantiq/dts/ARV7519RWV11.dts11
-rw-r--r--target/linux/lantiq/dts/ARV7519RWV12.dts11
-rw-r--r--target/linux/lantiq/image/Makefile7
-rw-r--r--target/linux/lantiq/xrx200/profiles/arv.mk16
5 files changed, 14 insertions, 40 deletions
diff --git a/target/linux/lantiq/dts/ARV7519RW.dtsi b/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))