6820v1 de/en: add support for Fritz!OS-7.1x

Freetz · Sep 24, 2019 · 9eea679 · 9eea679
1 parent 0ef2a0f
commit 9eea679
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/FIRMWARES b/FIRMWARES
@@ -109,10 +109,10 @@ Currently supported boxes and firmwares
 * Fritz!Box 6810 LTE (EXPERIMENTAL)
 	* 108.06.34 rev36874
 	* 108.06.34 rev36875 (International)
-* Fritz!Box 6820 LTE
+* Fritz!Box 6820v1 LTE
 	* 142.06.83 rev43648 (German & International)
 	* 142.07.01 rev63482 (German & International)
-	* 142.07.08 rev70568 (Labor)
+	* 142.07.12 rev71361 (German & International)
 * Fritz!Box 6840 LTE
 	* 105.06.30 rev31187
 	* 105.06.50 rev33168

diff --git a/config/avm/availability.in b/config/avm/availability.in
@@ -241,6 +241,7 @@ config FREETZ_AVM_HAS_FIRMWARE_07_1X
 			FREETZ_TYPE_4040 || \
 			FREETZ_TYPE_6490 || \
 			FREETZ_TYPE_6590 || \
+			FREETZ_TYPE_6820 || \
 			FREETZ_TYPE_6890 || \
 			FREETZ_TYPE_7362 || \
 			FREETZ_TYPE_7430 || \
@@ -257,6 +258,7 @@ config FREETZ_AVM_HAS_FIRMWARE_07_1X
 			FREETZ_TYPE_3000 || \
 			FREETZ_TYPE_3490 || \
 			FREETZ_TYPE_4040 || \
+			FREETZ_TYPE_6820 || \
 			FREETZ_TYPE_6890 || \
 			FREETZ_TYPE_7430 || \
 			FREETZ_TYPE_7490 || \
@@ -266,13 +268,12 @@ config FREETZ_AVM_HAS_FIRMWARE_07_1X
 			FREETZ_TYPE_7590 \
 		))
 
-config FREETZ_AVM_HAS_FIRMWARE_LABOR_BETA
-	bool
-	default y
-	depends on \
-		FREETZ_TYPE_LANG_DE && ( \
-			FREETZ_TYPE_6820 \
-		)
+#config FREETZ_AVM_HAS_FIRMWARE_LABOR_BETA
+#	bool
+#	default y
+#	depends on \
+#		FREETZ_TYPE_LANG_DE && ( \
+#		)
 
 #config FREETZ_AVM_HAS_FIRMWARE_LABOR_MAINTENANCE
 #	bool

diff --git a/config/mod/download.in b/config/mod/download.in
@@ -255,6 +255,7 @@ menu "Override options"
 		#
 		default "@AVM/fritzbox-6820-lte/{other,deutschland}/fritz.os"                                                      if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_6820 && FREETZ_TYPE_FIRMWARE_06_8X
 		default "@AVM/fritzbox-6820-lte/{other,deutschland}/fritz.os"                                                      if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_6820 && FREETZ_TYPE_FIRMWARE_07_0X
+		default "@AVM/fritzbox-6820-lte/{other,deutschland}/fritz.os"                                                      if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_6820 && FREETZ_TYPE_FIRMWARE_07_1X
 		#
 		default "@AVM/{fritzbox-6840-lte/deutschland/fritz.os,fritzbox_6840_lte/firmware/deutsch},@1&1/6840"               if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_6840 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_2X
 		default "@AVM/{fritzbox-6840-lte/deutschland/fritz.os,fritzbox_6840_lte/firmware/deutsch},@1&1/6840"               if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_6840 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_5X
@@ -520,7 +521,7 @@ menu "Override options"
 		#
 		default "FRITZ.Box_6820_LTE.en-de-es-it-fr-pl.142.06.83.image"                                                     if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_6820 && FREETZ_TYPE_FIRMWARE_06_8X
 		default "FRITZ.Box_6820_LTE.de-en-es-it-fr-pl.142.07.01.image"                                                     if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_6820 && FREETZ_TYPE_FIRMWARE_07_0X
-		default "FRITZ.Box_6820v1_LTE-07.08-70568-LabBETA.image"                                                           if FREETZ_TYPE_FIRMWARE_LABOR_BETA && FREETZ_TYPE_6820
+		default "FRITZ.Box_6820v1_LTE-de-en-es-it-fr-pl-07.12.image"                                                       if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_6820 && FREETZ_TYPE_FIRMWARE_07_1X
 		#
 		default "FRITZ.Box_6840_LTE.105.06.30.image"                                                                       if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_6840 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_2X
 		default "FRITZ.Box_6840_LTE.105.06.50.image"                                                                       if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_6840 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_5X
@@ -784,6 +785,7 @@ menu "Override options"
 		#
 		default "adcd71ac96571fd6c3da13d51b6cce04"  if FREETZ_TYPE_6820 && FREETZ_TYPE_FIRMWARE_06_8X
 		default "362614240caad6f1b7743d3e38a5e8ac"  if FREETZ_TYPE_6820 && FREETZ_TYPE_FIRMWARE_07_0X
+		default "28c4e53659d8952e1a3e9d8f35b4d0ea"  if FREETZ_TYPE_6820 && FREETZ_TYPE_FIRMWARE_07_1X
 		#
 		default "b31e5b26e301eecfe304734f2957e0bc"  if FREETZ_TYPE_6840 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_2X
 		default "eb62c3f5a9e3a35636889444172b03fe"  if FREETZ_TYPE_6840 && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_06_5X
@@ -957,15 +959,11 @@ menu "Override options"
 	config FREETZ_DL_SOURCE_CONTAINER
 		string "Downloaded container file"          if FREETZ_DL_OVERRIDE
 		#
-		default "fritzbox-labor_6820v1-70568.zip"   if FREETZ_TYPE_FIRMWARE_LABOR_BETA && FREETZ_TYPE_6820
-		#
 		default ""
 
 	config FREETZ_DL_SOURCE_CONTAINER_MD5
 		string "MD5 checksum for container"         if FREETZ_DL_OVERRIDE
 		#
-		default "ccdde08353812d418953b0c4c2a155aa"  if FREETZ_TYPE_FIRMWARE_LABOR_BETA && FREETZ_TYPE_6820
-		#
 		default ""
 
 	config FREETZ_DL_ALIEN