lantiq: rename gphy firmware

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>
This commit is contained in:
Mathias Kresin 2017-12-31 11:48:15 +01:00
parent 6112abf186
commit 627a28eb09
20 changed files with 35 additions and 35 deletions

View file

@ -353,17 +353,17 @@ UBOOT_TARGETS:= \
define CompressVR9Firmware define CompressVR9Firmware
$(STAGING_DIR_HOST)/bin/lzma e \ $(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 $(PKG_BUILD_DIR)/arch/mips/cpu/mips32/vrx200/fw_phy$(1)_a$(2)x.blob
endef endef
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
mkdir -p $(PKG_BUILD_DIR)/arch/mips/cpu/mips32/vrx200/ mkdir -p $(PKG_BUILD_DIR)/arch/mips/cpu/mips32/vrx200/
$(call CompressVR9Firmware,11g,1) $(call CompressVR9Firmware,11g,1,4)
$(call CompressVR9Firmware,11g,2) $(call CompressVR9Firmware,11g,2,2)
$(call CompressVR9Firmware,22f,1) $(call CompressVR9Firmware,22f,1,4)
$(call CompressVR9Firmware,22f,2) $(call CompressVR9Firmware,22f,2,2)
endef endef
UBOOT_MAKE_FLAGS := UBOOT_MAKE_FLAGS :=

View file

@ -99,8 +99,8 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/vr9_phy22f_a1x.bin"; /*VR9 1.1*/ firmware1 = "lantiq/xrx200_phy22f_a14.bin"; /*VR9 1.1*/
firmware2 = "lantiq/vr9_phy22f_a2x.bin"; /*VR9 1.2*/ firmware2 = "lantiq/xrx200_phy22f_a22.bin"; /*VR9 1.2*/
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -77,8 +77,8 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/vr9_phy22f_a1x.bin"; /*VR9 1.1*/ firmware1 = "lantiq/xrx200_phy22f_a14.bin"; /*VR9 1.1*/
firmware2 = "lantiq/vr9_phy22f_a2x.bin"; /*VR9 1.2*/ firmware2 = "lantiq/xrx200_phy22f_a22.bin"; /*VR9 1.2*/
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -118,8 +118,8 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/vr9_phy11g_a1x.bin"; /*VR9 1.1*/ firmware1 = "lantiq/xrx200_phy11g_a14.bin"; /*VR9 1.1*/
firmware2 = "lantiq/vr9_phy11g_a2x.bin"; /*VR9 1.2*/ firmware2 = "lantiq/xrx200_phy11g_a22.bin"; /*VR9 1.2*/
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -56,7 +56,7 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware = "lantiq/vr9_phy22f_a2x.bin"; firmware = "lantiq/xrx200_phy22f_a22.bin";
phys = [ 01 ]; phys = [ 01 ];
}; };

View file

@ -106,8 +106,8 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/vr9_phy11g_a1x.bin"; firmware1 = "lantiq/xrx200_phy11g_a14.bin";
firmware2 = "lantiq/vr9_phy11g_a2x.bin"; firmware2 = "lantiq/xrx200_phy11g_a22.bin";
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -121,7 +121,7 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware = "lantiq/vr9_phy11g_a1x.bin"; firmware = "lantiq/xrx200_phy11g_a14.bin";
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -98,7 +98,7 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware = "lantiq/vr9_phy11g_a2x.bin"; firmware = "lantiq/xrx200_phy11g_a22.bin";
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -131,8 +131,8 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/vr9_phy11g_a1x.bin"; /*VR9 1.1*/ firmware1 = "lantiq/xrx200_phy11g_a14.bin"; /*VR9 1.1*/
firmware2 = "lantiq/vr9_phy11g_a2x.bin"; /*VR9 1.2*/ firmware2 = "lantiq/xrx200_phy11g_a22.bin"; /*VR9 1.2*/
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -82,7 +82,7 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware = "lantiq/vr9_phy11g_a2x.bin"; firmware = "lantiq/xrx200_phy11g_a22.bin";
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -81,8 +81,8 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/vr9_phy11g_a1x.bin"; /*VR9 1.1*/ firmware1 = "lantiq/xrx200_phy11g_a14.bin"; /*VR9 1.1*/
firmware2 = "lantiq/vr9_phy11g_a2x.bin"; /*VR9 1.2*/ firmware2 = "lantiq/xrx200_phy11g_a22.bin"; /*VR9 1.2*/
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -93,8 +93,8 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/vr9_phy22f_a1x.bin"; /*VR9 1.1*/ firmware1 = "lantiq/xrx200_phy22f_a14.bin"; /*VR9 1.1*/
firmware2 = "lantiq/vr9_phy22f_a2x.bin"; /*VR9 1.2*/ firmware2 = "lantiq/xrx200_phy22f_a22.bin"; /*VR9 1.2*/
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -119,8 +119,8 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/vr9_phy11g_a1x.bin"; /*VR9 1.1*/ firmware1 = "lantiq/xrx200_phy11g_a14.bin"; /*VR9 1.1*/
firmware2 = "lantiq/vr9_phy11g_a2x.bin"; /*VR9 1.2*/ firmware2 = "lantiq/xrx200_phy11g_a22.bin"; /*VR9 1.2*/
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -88,7 +88,7 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware = "lantiq/vr9_phy11g_a2x.bin"; firmware = "lantiq/xrx200_phy11g_a22.bin";
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View file

@ -76,7 +76,7 @@
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware = "lantiq/vr9_phy22f_a2x.bin"; firmware = "lantiq/xrx200_phy22f_a22.bin";
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };

View 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_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw
fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin 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/xrx200_phy11g_a14.bin
+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy11g_a2x.bin +fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy11g_a22.bin
+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy22f_a1x.bin +fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy22f_a14.bin
+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy22f_a2x.bin +fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy22f_a22.bin
fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) 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/xrx200_phy11g_a14.bin
+lantiq/vr9_phy22f_a1x.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/xrx200_phy11g_a22.bin
+lantiq/vr9_phy22f_a2x.bin +lantiq/xrx200_phy22f_a22.bin