From d4ba7bab25c84478ce3aa5ebd80d24b5a5624e7b Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 22 Jan 2019 22:36:17 +0100 Subject: [PATCH] lantiq: make AVM FRITZ!Box naming consistent This commit changes the model string and device title of all AVM boards to fit the naming of the manufacturer. Drop all provider-specific titles as they are re-used for every device generation by 1&1. The original AVM model name is printed on the bottom of every devices. Exception applies for boards which are only supported by a specific sub-revision. Signed-off-by: David Bauer --- .../arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts | 2 +- .../arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts | 2 +- .../arch/mips/boot/dts/FRITZ3370-REV2.dtsi | 2 +- .../files-4.14/arch/mips/boot/dts/FRITZ7312.dts | 2 +- .../files-4.14/arch/mips/boot/dts/FRITZ7320.dts | 2 +- .../files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts | 2 +- target/linux/lantiq/image/Makefile | 12 ++++++------ 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts index 3cb7d7d723c..ebd6f6e4c8e 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts @@ -4,7 +4,7 @@ / { compatible = "avm,fritz3370-rev2-hynix", "avm,fritz3370-rev2", "lantiq,xway", "lantiq,vr9"; - model = "AVM Fritz!Box WLAN 3370 Rev. 2 (Hynix NAND)"; + model = "AVM FRITZ!Box 3370 Rev. 2 (Hynix NAND)"; }; &localbus { diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts index 1a1be6fd379..dcc97d28082 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts @@ -4,7 +4,7 @@ / { compatible = "avm,fritz3370-rev2-micron", "avm,fritz3370-rev2", "lantiq,xway", "lantiq,vr9"; - model = "AVM Fritz!Box WLAN 3370 Rev. 2 (Micron NAND)"; + model = "AVM FRITZ!Box 3370 Rev. 2 (Micron NAND)"; }; &localbus { diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2.dtsi index a7e0c719158..9a0359d1ccd 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2.dtsi +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2.dtsi @@ -5,7 +5,7 @@ / { compatible = "avm,fritz3370-rev2", "lantiq,xway", "lantiq,vr9"; - model = "AVM Fritz!Box WLAN 3370 Rev. 2"; + model = "AVM FRITZ!Box 3370 Rev. 2"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7312.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7312.dts index c14695413e8..796b941ede6 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7312.dts +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7312.dts @@ -6,7 +6,7 @@ / { compatible = "avm,fritz7312", "lantiq,xway", "lantiq,ar9"; - model = "FritzBox 7312 (1&1 WLAN-MODEM)"; + model = "AVM FRITZ!Box 7312"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7320.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7320.dts index 45a59c012de..cd274277d1a 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7320.dts +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7320.dts @@ -6,7 +6,7 @@ / { compatible = "avm,fritz7320", "lantiq,xway", "lantiq,ar9"; - model = "1&1 HomeServer"; + model = "AVM FRITZ!Box 7320"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts index 91520c8137f..53623ab56c3 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts @@ -7,7 +7,7 @@ / { compatible = "avm,fritz7360sl", "lantiq,xway", "lantiq,vr9"; - model = "1&1 HomeServer"; + model = "AVM FRITZ!Box 7360 SL"; chosen { bootargs = "console=ttyLTQ0,115200"; diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index e9d9e420278..b59acf4ddcb 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -489,7 +489,7 @@ define Device/avm_fritz7312 $(Device/AVM) DEVICE_DTS := FRITZ7312 IMAGE_SIZE := 15744k - DEVICE_TITLE := 1&1 WLAN-MODEM - FRITZ7312 + DEVICE_TITLE := AVM FRITZ!Box 7312 DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-mini \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ @@ -502,7 +502,7 @@ define Device/avm_fritz7320 $(Device/AVM) DEVICE_DTS := FRITZ7320 IMAGE_SIZE := 15744k - DEVICE_TITLE := 1&1 HomeServer - FRITZ7320 + DEVICE_TITLE := AVM FRITZ!Box 7320 DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ @@ -631,7 +631,7 @@ define Device/avm_fritz3370 $(Device/AVM) $(Device/NAND) DEVICE_DTS := FRITZ3370 - DEVICE_TITLE := AVM Fritz!Box WLan 3370 Rev. 2 + DEVICE_TITLE := AVM FRITZ!Box 3370 Rev. 2 KERNEL_SIZE := 4096k UBINIZE_OPTS := -E 5 IMAGES += eva-kernel.bin eva-filesystem.bin @@ -643,14 +643,14 @@ endef define Device/avm_fritz3370-rev2-hynix $(Device/avm_fritz3370) DEVICE_DTS := FRITZ3370-REV2-HYNIX - DEVICE_TITLE := AVM Fritz!Box WLan 3370 Rev. 2 (Hynix NAND) + DEVICE_TITLE := AVM FRITZ!Box 3370 Rev. 2 (Hynix NAND) endef TARGET_DEVICES += avm_fritz3370-rev2-hynix define Device/avm_fritz3370-rev2-micron $(Device/avm_fritz3370) DEVICE_DTS := FRITZ3370-REV2-MICRON - DEVICE_TITLE := AVM Fritz!Box WLan 3370 Rev. 2 (Micron NAND) + DEVICE_TITLE := AVM FRITZ!Box 3370 Rev. 2 (Micron NAND) endef TARGET_DEVICES += avm_fritz3370-rev2-micron @@ -658,7 +658,7 @@ define Device/avm_fritz7360sl $(Device/AVM) IMAGE_SIZE := 15744k DEVICE_DTS := FRITZ7360SL - DEVICE_TITLE := 1&1 HomeServer - FRITZ7360SL + DEVICE_TITLE := AVM FRITZ!Box 7360 SL DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 SUPPORTED_DEVICES += FRITZ7360SL endef -- 2.30.2