add 5690 Pro

Freetz-NG · Apr 11, 2024 · fae1893 · fae1893
1 parent 580dd76
commit fae1893
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 3 deletions.
diff --git a/config/avm/availability.in b/config/avm/availability.in
@@ -415,6 +415,7 @@ config FREETZ_AVM_HAS_FIRMWARE_07_5X_INHAUS
 	depends on \
 		( (FREETZ_TYPE_LANG_DE||FREETZ_TYPE_LANG_EN) && ( \
 			FREETZ_TYPE_4050 || \
+			FREETZ_TYPE_5690 || \
 			FREETZ_TYPE_7690 \
 		))
 
@@ -550,6 +551,7 @@ config FREETZ_AVM_HAS_LANG_DE
 		FREETZ_TYPE_5491 || \
 		FREETZ_TYPE_5530 || \
 		FREETZ_TYPE_5590 || \
+		FREETZ_TYPE_5690 || \
 		FREETZ_TYPE_6000 || \
 		FREETZ_TYPE_6430 || \
 		FREETZ_TYPE_6490 || \
@@ -643,6 +645,7 @@ config FREETZ_AVM_HAS_LANG_EN
 		FREETZ_TYPE_5491 || \
 		FREETZ_TYPE_5530 || \
 		FREETZ_TYPE_5590 || \
+		FREETZ_TYPE_5690 || \
 		FREETZ_TYPE_6000 || \
 		FREETZ_TYPE_6810 || \
 		FREETZ_TYPE_6820_V2 || \

diff --git a/config/avm/features.in b/config/avm/features.in
@@ -18,6 +18,7 @@ config FREETZ_TYPE_DSL
 	bool
 	default y
 	depends on \
+		FREETZ_TYPE_5690 || \
 		FREETZ_TYPE_6890 || \
 		( \
 			!FREETZ_TYPE_CABLE && \
@@ -55,7 +56,8 @@ config FREETZ_TYPE_FIBER
 		FREETZ_TYPE_5490 || \
 		FREETZ_TYPE_5491 || \
 		FREETZ_TYPE_5530 || \
-		FREETZ_TYPE_5590
+		FREETZ_TYPE_5590 || \
+		FREETZ_TYPE_5690
 
 config FREETZ_TYPE_LTE
 	bool
@@ -165,6 +167,7 @@ config FREETZ_AVM_HAS_FIT_SIZE
 	default 80 if FREETZ_TYPE_4060
 	default 50 if FREETZ_TYPE_5530
 	default 80 if FREETZ_TYPE_5590
+	default 80 if FREETZ_TYPE_5690
 	default 80 if FREETZ_TYPE_6000
 	default 50 if FREETZ_TYPE_7510
 	default 50 if FREETZ_TYPE_7539

diff --git a/config/avm/hardware.in b/config/avm/hardware.in
@@ -123,6 +123,12 @@ config FREETZ_SYSTEM_TYPE_IPQ53xx
 	depends on \
 		FREETZ_TYPE_7690
 
+config FREETZ_SYSTEM_TYPE_IPQ95xx
+	bool
+	default y
+	depends on \
+		FREETZ_TYPE_5690
+
 config FREETZ_SYSTEM_TYPE_MAPLE
 	bool
 	default y
@@ -232,6 +238,7 @@ config FREETZ_SYSTEM_TYPE
 	default "iks"           if FREETZ_SYSTEM_TYPE_IKS
 	default "ipq40xx"       if FREETZ_SYSTEM_TYPE_IPQ40xx
 	default "ipq53xx"       if FREETZ_SYSTEM_TYPE_IPQ53xx
+	default "ipq95xx"       if FREETZ_SYSTEM_TYPE_IPQ95xx
 	default "maple"         if FREETZ_SYSTEM_TYPE_MAPLE
 	default "puma6"         if FREETZ_SYSTEM_TYPE_PUMA6
 	default "puma7"         if FREETZ_SYSTEM_TYPE_PUMA7
@@ -255,7 +262,8 @@ config FREETZ_CPU_MODEL_ARM_cortex
 	default y
 	depends on \
 		FREETZ_CPU_MODEL_ARM_cortex_a9 || \
-		FREETZ_CPU_MODEL_ARM_cortex_a53
+		FREETZ_CPU_MODEL_ARM_cortex_a53 || \
+		FREETZ_CPU_MODEL_ARM_cortex_a73
 
 config FREETZ_CPU_MODEL_ARM_cortex_a9
 	bool
@@ -273,6 +281,12 @@ config FREETZ_CPU_MODEL_ARM_cortex_a53
 		FREETZ_SYSTEM_TYPE_MAPLE || \
 		FREETZ_SYSTEM_TYPE_QCAARMv8
 
+config FREETZ_CPU_MODEL_ARM_cortex_a73
+	bool
+	default y
+	depends on \
+		FREETZ_SYSTEM_TYPE_IPQ95xx
+
 config FREETZ_CPU_MODEL_MIPS_4KEc
 	bool
 	default y

diff --git a/config/avm/signature.in b/config/avm/signature.in
@@ -38,6 +38,7 @@
 		default "010001x00d5e60af4efec3320fc6fa8e0c4a9682ceede37788034448afe63e71842babcb89f9f5ba1717ee29bc5ff877eb0a4e14c247fb33b7ac9c6d17b474dd1b9b30e151fd3f6b4139ab091046172fe080458cba23960747791decc2fd9834a62d1f8fd9d719060a39e4f0619ac6a09e07bb68a4e251d19e36e1727443402f2b5272a05"  if FREETZ_TYPE_5491
 		default "010001x00c7440a42b38dec7309340f55b573b08e60d0a1b828b77a68988c87f7c30519f72dd0f6fe9f12d30eb2ebbab6ecf3adad000dea9cc9132d8ab890c599f439ba31e5a3900d31b567203c35430c2501474b883b343d91bb54535a464ed065d603006359fffb24e53d5b0ea8a267f774677ebd0f9efb597a8f192bab78944290c0c5"  if FREETZ_TYPE_5530
 		default "010001x00ee735d7962fc9829d76582eabca73bc311c10af252c6fd1548ca6201eb8ea05b163286e19aca8c3c8467080fc4d6f271402854a619ce9a84e2dec71a8613c96696989bb606246f5318fc6e46d45feb44fab1b888d972c9889f2187746d03a6df20bb3b33f071f0fc9e58dff839813dcb3f51a3b886a66e133b87df008be17e69"  if FREETZ_TYPE_5590
+		default "010001x00b1b582a51c53eb928d969a1e3b0c9ef57b2c788d4f4854019a434a37a5981b933b77bacfc24e85ae2b625295d0c36263963cf889e67f9d5cb5778b5537a414fda278f1d9ed5b34cb8dc4b5f73e9d2166d5dce39d33a52e84bc11fc6a807682317d3376f51ccd5e5fe2a5a9cac77e058976aec077120e64fb2d2f36254aa863f3"  if FREETZ_TYPE_5690
 		default "010001x00aabd951c7b5d323a1d0dd10f16481a323d2ff76eb5d723456e4a190c16cf1acafacb76e462acf6fe50c94a699ddc74afed740c874e3e2b2d64545c19639394125d7866b76e4dbe9359137bfdfa30b173ca7a9f885a550d3eaecc92b012848b01f9ea510a3be4261f696374dbda4d476b341cf30fdf265c3d159ae7de284ad6eb"  if FREETZ_TYPE_6000
 		default "010001x00bdf93229425740e94b21a01777e1b9c190076b06439783e59fa62f2b7d0f11f8c7cfd827bf77196817f12f767892777aebaa3dba8d5eeb3d0de354cc660f3f2ad19fc0b7488fbc42c66b6ab701c37c434e45ea62fa66900a754983fe9fadc033c58a81cd41372cff24745b7f1f8adbddb3f19dea107645273197d24f6a93ad7d"  if FREETZ_TYPE_6360
 		default "010001x00a7f7122b6da71ad81bcb6f44e77d74ed8ae1ee01403d22215d9bb4117e8f31afd4ea1420e9bb487275790f4e113e7de11f1c9a02b7cfa7a40bce339526b2c6f845486b061524ad087bdb56453e0e3b5cf7effb31358b6d459fc7586e0c8c727e3d68cb96cd5ca01f7dc0c65e91947bdfae3f19ef2254ab1942bff60f95f170b9"  if FREETZ_TYPE_6430

diff --git a/config/avm/source.in b/config/avm/source.in
@@ -124,6 +124,10 @@ config FREETZ_AVM_SOURCE_7530_07_56
 config FREETZ_AVM_SOURCE_7690_07_59
 	bool
 
+# IPQ95xx
+config FREETZ_AVM_SOURCE_5690_07_59
+	bool
+
 # MAPLE
 config FREETZ_AVM_SOURCE_1209_07_56
 	bool
@@ -312,6 +316,8 @@ config FREETZ_AVM_SOURCE_ID
 	default "7530_07.56"    if FREETZ_AVM_SOURCE_7530_07_56
 # IPQ53xx
 	default "7690_07.59"    if FREETZ_AVM_SOURCE_7690_07_59
+# IPQ95xx
+	default "5690_07.59"    if FREETZ_AVM_SOURCE_5690_07_59
 # MAPLE
 	default "1209_07.56"    if FREETZ_AVM_SOURCE_1209_07_56
 	default "1249_07.57"    if FREETZ_AVM_SOURCE_1249_07_57
@@ -471,6 +477,11 @@ config FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_IPQ53xx
 	select FREETZ_AVM_SOURCE_7690_07_59 if FREETZ_AVM_VERSION_07_5X_MIN
 	bool
 
+config FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_IPQ95xx
+	depends on FREETZ_SYSTEM_TYPE_IPQ95xx
+	select FREETZ_AVM_SOURCE_5690_07_59 if FREETZ_AVM_VERSION_07_5X_MIN
+	bool
+
 config FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_PUMA6
 	depends on FREETZ_SYSTEM_TYPE_PUMA6
 	select FREETZ_AVM_SOURCE_6490_06_87 if FREETZ_AVM_VERSION_06_8X_MAX && FREETZ_TYPE_6490

diff --git a/config/mod/dl-firmware.in b/config/mod/dl-firmware.in
@@ -106,6 +106,8 @@ config FREETZ_DL_SITE
 	#
 	default "@AVM/fritzbox-5590-fiber/{other,deutschland}/fritz.os,@AVM/5590Fiber,@AVM/5590"                           if FREETZ_TYPE_5590
 	#
+	default "@AVM/fritzbox-5690-pro/{other,deutschland}/fritz.os,@AVM/5690Pro"                                         if FREETZ_TYPE_5690
+	#
 	default "@AVM/fritzwlan/fritzrepeater-6000/deutschland/fritz.os"                                                   if FREETZ_TYPE_6000
 	#
 	default "@AVM/firmware/6430/65797387"                                                                              if FREETZ_TYPE_6430 && FREETZ_TYPE_FIRMWARE_07_1X
@@ -420,6 +422,8 @@ config FREETZ_DL_SOURCE
 	default "FRITZ.Box_5590_Fiber-07.80.image"                                             if FREETZ_TYPE_5590 && FREETZ_TYPE_FIRMWARE_07_8X
 	default "FRITZ.Box_5590_Fiber-07.90-111969-Inhaus.image"                               if FREETZ_TYPE_5590 && FREETZ_TYPE_FIRMWARE_08_0X_INHAUS
 	#
+	default "FRITZ.Box_5690_Pro-07.59-112003-Inhaus.image"                                 if FREETZ_TYPE_5690 && FREETZ_TYPE_FIRMWARE_07_5X_INHAUS
+	#
 	default "FRITZ.Repeater_6000-07.31-V2.image/FRITZ.Repeater_6000-07.31.image"           if FREETZ_TYPE_6000 && FREETZ_TYPE_FIRMWARE_07_2X
 	default "FRITZ.Repeater_6000-07.57-V2.image/FRITZ.Repeater_6000-07.57.image"           if FREETZ_TYPE_6000 && FREETZ_TYPE_FIRMWARE_07_5X
 	#

diff --git a/config/mod/prefix.in b/config/mod/prefix.in
@@ -46,6 +46,7 @@ config FREETZ_TYPE_PREFIX
 	default "5491"              if FREETZ_TYPE_5491
 	default "5530"              if FREETZ_TYPE_5530
 	default "5590"              if FREETZ_TYPE_5590
+	default "5690_Pro"          if FREETZ_TYPE_5690
 	default "6000"              if FREETZ_TYPE_6000
 	default "6430"              if FREETZ_TYPE_6430
 	default "6490"              if FREETZ_TYPE_6490

diff --git a/config/mod/source.in b/config/mod/source.in
@@ -13,6 +13,7 @@ config FREETZ_REPLACE_KERNEL_AVAILABLE
 		! (FREETZ_SYSTEM_TYPE_IKS_VX185) && \
 		! (FREETZ_SYSTEM_TYPE_IPQ40xx) && \
 		! (FREETZ_SYSTEM_TYPE_IPQ53xx) && \
+		! (FREETZ_SYSTEM_TYPE_IPQ95xx) && \
 		! (FREETZ_SYSTEM_TYPE_PUMA6 && FREETZ_TYPE_6430) && \
 		! (FREETZ_SYSTEM_TYPE_PUMA7) && \
 		! (FREETZ_SYSTEM_TYPE_QCA955x) && \
@@ -40,7 +41,7 @@ config FREETZ_KERNEL_AVMDIFF_AVAILABLE
 	depends on ! FREETZ_KERNEL_VERSION_4_1_38                                              # 07_1X-final 7581/7582 (corrupt)
 	depends on !(FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_MAPLE && FREETZ_AVM_VERSION_07_2X_MAX)  # 07_2X-final 7510/1209 (corrupt)
 	depends on ! FREETZ_KERNEL_VERSION_4_19_183                                            # 07_5X-final 7539 (corrupt)
-	depends on ! FREETZ_KERNEL_VERSION_5_4_213                                             # 07_5X-inhaus 7690
+	depends on ! FREETZ_KERNEL_VERSION_5_4_213                                             # 07_5X-inhaus 5690 Pro + 7690
 	default y
 	help
 		There are no avm sources at all of this kernel version and thus no avmdiff, so unpatched vanilla is used.

diff --git a/config/ui/firmware.in b/config/ui/firmware.in
@@ -214,6 +214,11 @@ choice
 		select FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_QCAARMv8
 		bool "5590"
 
+	config FREETZ_TYPE_5690
+		depends on FREETZ_SERIES_ALL || FREETZ_SERIES_4N5
+		select FREETZ_AVM_SOURCE_FOR_SYSTEM_TYPE_IPQ95xx
+		bool "5690 Pro - UNTESTED"
+
 
 	comment "Cable"
 		depends on FREETZ_SERIES_ALL || FREETZ_SERIES_4N5
@@ -896,6 +901,7 @@ config FREETZ_TYPE_FIRMWARE_UNTESTED
 		FREETZ_TYPE_1260_V2 || \
 		FREETZ_TYPE_3009 || \
 		FREETZ_TYPE_4050 || \
+		FREETZ_TYPE_5690 || \
 		FREETZ_TYPE_6670 || \
 		FREETZ_TYPE_6810 || \
 		FREETZ_TYPE_6820_V3 || \

diff --git a/docs/FIRMWARES.md b/docs/FIRMWARES.md
@@ -146,6 +146,8 @@ Currently supported devices and firmwares
   - 272.07.58 rev109907 {ALL} [MOVE21NL1]
   - 272.07.80 rev110627 {ALL} [GoFiber23]
   - 272.07.90 rev111969 {ALL} [Smart24 P1] (Inhaus)
+* __FRITZ!Box 5690 Pro (UNTESTED)__
+  - 279.07.59 rev112003 {ALL} [FCS23] (Inhaus)
 
 ### Fritz!Box Cable (64xx/65xx/66xx)
 

diff --git a/make/kernel/configs/avm/config-ipq95xx-5690_07.59--not-available b/make/kernel/configs/avm/config-ipq95xx-5690_07.59--not-available
diff --git a/make/kernel/configs/freetz/config-ipq95xx-5690_07.59 b/make/kernel/configs/freetz/config-ipq95xx-5690_07.59