lantiq: rename gphy firmware
authorMathias Kresin <dev@kresin.me>
Sun, 31 Dec 2017 10:48:15 +0000 (11:48 +0100)
committerMathias Kresin <dev@kresin.me>
Tue, 20 Feb 2018 18:25:17 +0000 (19:25 +0100)
Rename the gphy firmware to match the name requested by kernel 4.14 and
update the devicetree source files to use the new name.

Update the u-boot lantiq Makefile to be compatible with the new names as
well.

Signed-off-by: Mathias Kresin <dev@kresin.me>
24 files changed:
package/boot/uboot-lantiq/Makefile
target/linux/lantiq/dts/ARV7519RW22.dts
target/linux/lantiq/dts/ASL56026.dts
target/linux/lantiq/dts/BTHOMEHUBV5A.dts
target/linux/lantiq/dts/DM200.dts
target/linux/lantiq/dts/EASY80920.dtsi
target/linux/lantiq/dts/FRITZ3370.dts
target/linux/lantiq/dts/FRITZ7360SL.dts
target/linux/lantiq/dts/P2812HNUFX.dtsi
target/linux/lantiq/dts/TDW89X0.dtsi
target/linux/lantiq/dts/VG3503J.dts
target/linux/lantiq/dts/VGV7510KW22.dtsi
target/linux/lantiq/dts/VGV7519.dtsi
target/linux/lantiq/dts/VR200v.dts
target/linux/lantiq/dts/WBMR300.dts
target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a1x.bin [deleted file]
target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a2x.bin [deleted file]
target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a1x.bin [deleted file]
target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a2x.bin [deleted file]
target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a14.bin [new file with mode: 0644]
target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a22.bin [new file with mode: 0644]
target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a14.bin [new file with mode: 0644]
target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a22.bin [new file with mode: 0644]
target/linux/lantiq/patches-4.9/0024-NET-lantiq-adds-PHY11G-firmware-blobs.patch

index 5493737..55038fd 100644 (file)
@@ -353,17 +353,17 @@ UBOOT_TARGETS:= \
 
 define CompressVR9Firmware
        $(STAGING_DIR_HOST)/bin/lzma e \
 
 define CompressVR9Firmware
        $(STAGING_DIR_HOST)/bin/lzma e \
-               $(FIRMWARE_LANTIQ_SOURCE)/vr9_phy$(1)_a$(2)x.bin \
+               $(FIRMWARE_LANTIQ_SOURCE)/xrx200_phy$(1)_a$(2)$(3).bin \
                $(PKG_BUILD_DIR)/arch/mips/cpu/mips32/vrx200/fw_phy$(1)_a$(2)x.blob
 endef
 
 define Build/Prepare
        $(call Build/Prepare/Default)
        mkdir -p $(PKG_BUILD_DIR)/arch/mips/cpu/mips32/vrx200/
                $(PKG_BUILD_DIR)/arch/mips/cpu/mips32/vrx200/fw_phy$(1)_a$(2)x.blob
 endef
 
 define Build/Prepare
        $(call Build/Prepare/Default)
        mkdir -p $(PKG_BUILD_DIR)/arch/mips/cpu/mips32/vrx200/
-       $(call CompressVR9Firmware,11g,1)
-       $(call CompressVR9Firmware,11g,2)
-       $(call CompressVR9Firmware,22f,1)
-       $(call CompressVR9Firmware,22f,2)
+       $(call CompressVR9Firmware,11g,1,4)
+       $(call CompressVR9Firmware,11g,2,2)
+       $(call CompressVR9Firmware,22f,1,4)
+       $(call CompressVR9Firmware,22f,2,2)
 endef
 
 UBOOT_MAKE_FLAGS :=
 endef
 
 UBOOT_MAKE_FLAGS :=
index 9e2ae9d..0bdc150 100644 (file)
@@ -99,8 +99,8 @@
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware1 = "lantiq/vr9_phy22f_a1x.bin";        /*VR9 1.1*/
-               firmware2 = "lantiq/vr9_phy22f_a2x.bin";        /*VR9 1.2*/
+               firmware1 = "lantiq/xrx200_phy22f_a14.bin";     /*VR9 1.1*/
+               firmware2 = "lantiq/xrx200_phy22f_a22.bin";     /*VR9 1.2*/
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index 293a3e2..2037f40 100644 (file)
@@ -77,8 +77,8 @@
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware1 = "lantiq/vr9_phy22f_a1x.bin";        /*VR9 1.1*/
-               firmware2 = "lantiq/vr9_phy22f_a2x.bin";        /*VR9 1.2*/
+               firmware1 = "lantiq/xrx200_phy22f_a14.bin";     /*VR9 1.1*/
+               firmware2 = "lantiq/xrx200_phy22f_a22.bin";     /*VR9 1.2*/
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index 4bdeddc..2f75074 100644 (file)
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware1 = "lantiq/vr9_phy11g_a1x.bin";        /*VR9 1.1*/
-               firmware2 = "lantiq/vr9_phy11g_a2x.bin";        /*VR9 1.2*/
+               firmware1 = "lantiq/xrx200_phy11g_a14.bin";     /*VR9 1.1*/
+               firmware2 = "lantiq/xrx200_phy11g_a22.bin";     /*VR9 1.2*/
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index eef4084..3c8a2a1 100644 (file)
@@ -56,7 +56,7 @@
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware = "lantiq/vr9_phy22f_a2x.bin";
+               firmware = "lantiq/xrx200_phy22f_a22.bin";
                phys = [ 01 ];
        };
 
                phys = [ 01 ];
        };
 
index 3565842..b19b971 100644 (file)
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware1 = "lantiq/vr9_phy11g_a1x.bin";
-               firmware2 = "lantiq/vr9_phy11g_a2x.bin";
+               firmware1 = "lantiq/xrx200_phy11g_a14.bin";
+               firmware2 = "lantiq/xrx200_phy11g_a22.bin";
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index 76f7f87..ef3655d 100644 (file)
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware = "lantiq/vr9_phy11g_a1x.bin";
+               firmware = "lantiq/xrx200_phy11g_a14.bin";
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index cf82451..b164871 100644 (file)
@@ -98,7 +98,7 @@
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware = "lantiq/vr9_phy11g_a2x.bin";
+               firmware = "lantiq/xrx200_phy11g_a22.bin";
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index 9429d5c..ec3bd10 100644 (file)
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware1 = "lantiq/vr9_phy11g_a1x.bin";        /*VR9 1.1*/
-               firmware2 = "lantiq/vr9_phy11g_a2x.bin";        /*VR9 1.2*/
+               firmware1 = "lantiq/xrx200_phy11g_a14.bin";     /*VR9 1.1*/
+               firmware2 = "lantiq/xrx200_phy11g_a22.bin";     /*VR9 1.2*/
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index 79bcfc1..a629d92 100644 (file)
@@ -82,7 +82,7 @@
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware = "lantiq/vr9_phy11g_a2x.bin";
+               firmware = "lantiq/xrx200_phy11g_a22.bin";
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index cb0d5dd..8a73de9 100644 (file)
@@ -81,8 +81,8 @@
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware1 = "lantiq/vr9_phy11g_a1x.bin";        /*VR9 1.1*/
-               firmware2 = "lantiq/vr9_phy11g_a2x.bin";        /*VR9 1.2*/
+               firmware1 = "lantiq/xrx200_phy11g_a14.bin";     /*VR9 1.1*/
+               firmware2 = "lantiq/xrx200_phy11g_a22.bin";     /*VR9 1.2*/
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index 2d8e528..fb4486a 100644 (file)
@@ -93,8 +93,8 @@
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware1 = "lantiq/vr9_phy22f_a1x.bin";        /*VR9 1.1*/
-               firmware2 = "lantiq/vr9_phy22f_a2x.bin";        /*VR9 1.2*/
+               firmware1 = "lantiq/xrx200_phy22f_a14.bin";     /*VR9 1.1*/
+               firmware2 = "lantiq/xrx200_phy22f_a22.bin";     /*VR9 1.2*/
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index edff93c..e807b52 100644 (file)
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware1 = "lantiq/vr9_phy11g_a1x.bin";        /*VR9 1.1*/
-               firmware2 = "lantiq/vr9_phy11g_a2x.bin";        /*VR9 1.2*/
+               firmware1 = "lantiq/xrx200_phy11g_a14.bin";     /*VR9 1.1*/
+               firmware2 = "lantiq/xrx200_phy11g_a22.bin";     /*VR9 1.2*/
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index b063d75..6eccc5b 100644 (file)
@@ -88,7 +88,7 @@
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware = "lantiq/vr9_phy11g_a2x.bin";
+               firmware = "lantiq/xrx200_phy11g_a22.bin";
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
index de2be58..2ecfe4b 100644 (file)
@@ -76,7 +76,7 @@
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
 
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware = "lantiq/vr9_phy22f_a2x.bin";
+               firmware = "lantiq/xrx200_phy22f_a22.bin";
                phys = [ 00 01 ];
        };
 
                phys = [ 00 01 ];
        };
 
diff --git a/target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a1x.bin b/target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a1x.bin
deleted file mode 100644 (file)
index cdf3d30..0000000
Binary files a/target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a1x.bin and /dev/null differ
diff --git a/target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a2x.bin b/target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a2x.bin
deleted file mode 100644 (file)
index 44fc39e..0000000
Binary files a/target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a2x.bin and /dev/null differ
diff --git a/target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a1x.bin b/target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a1x.bin
deleted file mode 100644 (file)
index 02b88a0..0000000
Binary files a/target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a1x.bin and /dev/null differ
diff --git a/target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a2x.bin b/target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a2x.bin
deleted file mode 100644 (file)
index 1fed6ad..0000000
Binary files a/target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a2x.bin and /dev/null differ
diff --git a/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a14.bin b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a14.bin
new file mode 100644 (file)
index 0000000..cdf3d30
Binary files /dev/null and b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a14.bin differ
diff --git a/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a22.bin b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a22.bin
new file mode 100644 (file)
index 0000000..44fc39e
Binary files /dev/null and b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a22.bin differ
diff --git a/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a14.bin b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a14.bin
new file mode 100644 (file)
index 0000000..02b88a0
Binary files /dev/null and b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a14.bin differ
diff --git a/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a22.bin b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a22.bin
new file mode 100644 (file)
index 0000000..1fed6ad
Binary files /dev/null and b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a22.bin differ
index b69b2a9..e62ff2f 100644 (file)
@@ -18,10 +18,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw
  fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
  fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin
  fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw
  fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
  fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin
-+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy11g_a1x.bin
-+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy11g_a2x.bin
-+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy22f_a1x.bin
-+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy22f_a2x.bin
++fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy11g_a14.bin
++fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy11g_a22.bin
++fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy22f_a14.bin
++fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy22f_a22.bin
  fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
  
  fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
  fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
  
  fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
@@ -356,9 +356,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +#
 +
 +# GPHY core on Lantiq XWAY VR9 v1.1
 +#
 +
 +# GPHY core on Lantiq XWAY VR9 v1.1
-+lantiq/vr9_phy11g_a1x.bin
-+lantiq/vr9_phy22f_a1x.bin
++lantiq/xrx200_phy11g_a14.bin
++lantiq/xrx200_phy22f_a14.bin
 +
 +# GPHY core on Lantiq XWAY VR9 v1.2
 +
 +# GPHY core on Lantiq XWAY VR9 v1.2
-+lantiq/vr9_phy11g_a2x.bin
-+lantiq/vr9_phy22f_a2x.bin
++lantiq/xrx200_phy11g_a22.bin
++lantiq/xrx200_phy22f_a22.bin