add 3272, update 7272 (refs #2185)

git-svn-id: file:///var/svn/freetz/trunk@11086 149334a1-2f27-0410-a3b9-fc62619ac1e6
olistudent · Oct 10, 2013 · a4ad9c5 · a4ad9c5
1 parent da6c635
commit a4ad9c5
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/Config.in b/Config.in
@@ -107,6 +107,9 @@ choice
 		bool "3270 v3"
 		select FREETZ_TYPE_3270
 
+	config FREETZ_TYPE_3272
+		bool "3272 - EXPERIMENTAL"
+
 	config FREETZ_TYPE_3370
 		select FREETZ_AVM_VERSION_3370_05_21 if FREETZ_AVM_VERSION_05_2X
 		select FREETZ_AVM_VERSION_7360_05_51 if FREETZ_AVM_VERSION_05_5X
@@ -1559,6 +1562,8 @@ menu "Override options"
 		default "@AVM/fritzbox.wlan_3370/firmware/deutsch"                   if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3370 && FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_DE
 		default "@AVM/Downgrade/FRITZ!Box WLAN 3370/english"                 if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3370 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_EN
 		default "@AVM/fritzbox.wlan_3370/firmware/english"                   if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3370 && FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_EN
+		default "@AVM/beta"                                                  if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3272
+		default "@AVM/beta"                                                  if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_3272
 		default "@AVM/fritzbox.wlan_3390/firmware/deutsch"                   if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3390
 		default "@TELEKOM/Speedport/Speedport_W501V"                         if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_W501V
 		default "@AVM/..."                                                   if FREETZ_TYPE_CUSTOM
@@ -1616,7 +1621,7 @@ menu "Override options"
 		default "FRITZ.Box_Fon_WLAN_7270_v3.en-de-es-it-fr.74.05.51.image"      if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270 || FREETZ_TYPE_7570_7270 ) && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_05_5X
 		default "FRITZ.Box_Fon_WLAN_7270_v3.74.05.22.image"                     if FREETZ_TYPE_FIRMWARE_FINAL && ((FREETZ_TYPE_7270_V3 && ! FREETZ_TYPE_ALIEN_HARDWARE) || FREETZ_TYPE_7240_7270                          ) && FREETZ_TYPE_LANG_DE && FREETZ_TYPE_FIRMWARE_05_2X
 		default "FRITZ.Box_7272.120.05.55.image"                                if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7272
-		default "FRITZ.Box_7272_LabBETA.120.05.59-26508.image"                  if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_7272
+		default "FRITZ.Box_7272_LabBETA.120.05.59-26627.image"                  if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_7272
 		default "FRITZ.Box_7312.117.05.23.image"                                if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7312 && FREETZ_TYPE_FIRMWARE_05_2X
 		default "FRITZ.Box_7312.117.05.51.image"                                if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7312 && FREETZ_TYPE_FIRMWARE_05_5X
 		default "FRITZ.Box_Fon_WLAN_7320.100.05.22.image"                       if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7320 && FREETZ_TYPE_FIRMWARE_05_2X
@@ -1663,20 +1668,24 @@ menu "Override options"
 		default "fritz.box_wlan_3370.103.05.50.image"                           if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3370 && FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_DE
 		default "FRITZ.Box_WLAN_3370.en-de-es-it-fr.103.05.23.image"            if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3370 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_EN
 		default "FRITZ.Box_WLAN_3370.en-de-es-it-fr.103.05.51.image"            if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3370 && FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_EN
+		default "FRITZ.Box_3272.126.05.50.image"                                if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3272
+		default "FRITZ.Box_3272_LabBETA.126.05.59-26627.image"                  if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_3272
 		default "FRITZ.Box_3390.121.05.51.image"                                if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3390
 		default "fw_Speedport_W501V_v_28.04.38.image"                           if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_W501V
 		default "fritz.box..."                                                  if FREETZ_TYPE_CUSTOM
 
 	config FREETZ_DL_SOURCE_CONTAINER 
 		string "Downloaded container file"              if FREETZ_DL_OVERRIDE
-		default "fritzbox-labor-7272-26508.zip"         if FREETZ_TYPE_7272
+		default "fritzbox-labor-3272-26627.zip"         if FREETZ_TYPE_3272
+		default "fritzbox-labor-7272-26627.zip"         if FREETZ_TYPE_7272
 		default "fritzbox-labor-7330-26626.zip"         if FREETZ_TYPE_7320_7330_XL && FREETZ_TYPE_FIRMWARE_LABOR
 #		default "fritzbox-labor-7490-26609.zip"         if FREETZ_TYPE_7490         && FREETZ_TYPE_FIRMWARE_LABOR
 		default ""
 
 	config FREETZ_DL_SOURCE_CONTAINER_MD5
 		string "MD5 checksum for container"             if FREETZ_DL_OVERRIDE
-		default "bebbab45678f0a0c004328a262612d03"      if FREETZ_TYPE_7272
+		default "faf8e03176970dfa80c1b34f388c6c6a"      if FREETZ_TYPE_3272
+		default "b71427d11941a27db3f906090ec47003"      if FREETZ_TYPE_7272
 		default "59a5e98b28e12d05e2a246a31898841c"      if FREETZ_TYPE_7320_7330_XL && FREETZ_TYPE_FIRMWARE_LABOR
 #		default "db5a723624d58b42c907c8c2d0ffcc23"      if FREETZ_TYPE_7490         && FREETZ_TYPE_FIRMWARE_LABOR
 		default ""
@@ -1771,6 +1780,7 @@ menu "Override options"
 		default "a99fe91cc1478dffa7446c06489de964"  if FREETZ_TYPE_3270_V3 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_EN
 		default "e26de4c6637924a81119710da8320cea"  if FREETZ_TYPE_3270_V3 && FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_EN
 		default "4a4eb32e19b0e831ee69444711768161"  if FREETZ_TYPE_3270_V3 && FREETZ_TYPE_LANG_IT
+		default "cf6e3bf8ed35b6a1cbb0996a64775f06"  if FREETZ_TYPE_3272
 		default "7d2d3941cbb6029d84afbb845272d30a"  if FREETZ_TYPE_3370 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_DE
 		default "61029d1b1ebe33fbe6189ab651a6f436"  if FREETZ_TYPE_3370 && FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_DE
 		default "81a51249c66e80a5ccab4265d1785eaa"  if FREETZ_TYPE_3370 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_EN
@@ -1953,6 +1963,7 @@ config FREETZ_TARGET_ARCH_BE
 	bool
 	default y
 	depends on \
+		FREETZ_TYPE_3272 || \
 		FREETZ_TYPE_3370 || \
 		FREETZ_TYPE_3390 || \
 		FREETZ_TYPE_6810 || \
@@ -2141,6 +2152,7 @@ config FREETZ_TYPE_PREFIX
 	default "3170"              if FREETZ_TYPE_3170
 	default "3270_v2"           if FREETZ_TYPE_3270_V2
 	default "3270_v3"           if FREETZ_TYPE_3270_V3
+	default "3272"              if FREETZ_TYPE_3272
 	default "3370"              if FREETZ_TYPE_3370
 	default "3390"              if FREETZ_TYPE_3390
 	default "fon"               if FREETZ_TYPE_FON

diff --git a/Config.in.avm b/Config.in.avm
@@ -8,6 +8,7 @@ config FREETZ_REPLACE_KERNEL_AVAILABLE
 	depends on \
 		! (FREETZ_TYPE_FON && FREETZ_TYPE_LANG_EN) && \
 		! FREETZ_TYPE_FIRMWARE_LABOR && \
+		! FREETZ_TYPE_3272 && \
 		! FREETZ_TYPE_6810 && \
 		! FREETZ_TYPE_6840 && \
 		! FREETZ_TYPE_6842 && \
@@ -23,6 +24,7 @@ config FREETZ_REPLACE_MODULE_AVAILABLE
 	depends on \
 		FREETZ_REPLACE_KERNEL_AVAILABLE || \
 		( FREETZ_TYPE_FIRMWARE_LABOR && \
+			!FREETZ_TYPE_3272 && \
 			!FREETZ_TYPE_7272 && \
 			!FREETZ_TYPE_7362 && \
 			!FREETZ_TYPE_7490 \
@@ -36,6 +38,7 @@ config FREETZ_AVM_HAS_LABOR
 	bool "Has AVM Labor Firmware"		if FREETZ_TYPE_CUSTOM
 	default y		if \
 		( FREETZ_TYPE_LANG_DE && ( \
+			FREETZ_TYPE_3272 || \
 			FREETZ_TYPE_7272 || \
 			FREETZ_TYPE_7330_XL || \
 			FREETZ_TYPE_7390 \
@@ -49,6 +52,7 @@ config FREETZ_AVM_HAS_FW55X
 	default y		if \
 		( FREETZ_TYPE_LANG_DE && ( \
 			FREETZ_TYPE_3270 || \
+			FREETZ_TYPE_3272 || \
 			FREETZ_TYPE_3370 || \
 			FREETZ_TYPE_3390 || \
 			FREETZ_TYPE_6810 || \
@@ -209,6 +213,7 @@ config FREETZ_AVM_UCLIBC_0_9_32
 	bool
 	default y if \
 		FREETZ_TYPE_3270 || \
+		FREETZ_TYPE_3272 || \
 		FREETZ_TYPE_3370 || \
 		FREETZ_TYPE_3390 || \
 		FREETZ_TYPE_6810 || \
@@ -579,9 +584,11 @@ config FREETZ_AVM_HAS_UDEV
 config FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE
 	bool "Has update filesystem image"  if FREETZ_TYPE_CUSTOM
 	default y		if \
+		FREETZ_TYPE_3272 || \
 		FREETZ_TYPE_3370 || \
 		FREETZ_TYPE_3390 || \
 		FREETZ_TYPE_6840 || \
+		FREETZ_TYPE_7272 || \
 		FREETZ_TYPE_7362 || \
 		FREETZ_TYPE_7490
 	default n

diff --git a/FIRMWARES b/FIRMWARES
@@ -32,6 +32,9 @@ Currently supported boxes and firmwares
 	* 96.05.23 rev22968 (International)
 	* 96.05.51 rev25395 (International)
 	* 125.05.51 rev25680 (Italia)
+* Fritz!Box Fon WLAN 3272 (EXPERIMENTAL)
+	* 126.05.50 rev24826
+	* Labor 126.05.59 rev26627
 
 * Fritz!Box WLAN 3370
 	* 103.05.21 rev22533
@@ -101,8 +104,8 @@ Currently supported boxes and firmwares
 	* 54/74.05.51 rev25395 (International)
 	* Alien 7570 (International)
 * Fritz!Box Fon WLAN 7272 (EXPERIMENTAL)
-	* 120.05.55 rev
-	* Labor 120.05.59 rev26508
+	* 120.05.55 rev25881
+	* Labor 120.05.59 rev26627
 
 * Fritz!Box Fon WLAN 7312
 	* 117.05.23 rev22847

diff --git a/kernel/Config.in.kernel b/kernel/Config.in.kernel
@@ -45,6 +45,7 @@ config FREETZ_KERNEL_VERSION_2_6_32_41
 config FREETZ_KERNEL_VERSION_2_6_32_60
 	bool
 	default y if \
+		FREETZ_TYPE_3272 || \
 		(FREETZ_TYPE_6810 && !FREETZ_AVM_VERSION_05_2X) || \
 		(FREETZ_TYPE_6840 && !FREETZ_AVM_VERSION_05_2X) || \
 		(FREETZ_TYPE_7320_7330 && FREETZ_TYPE_FIRMWARE_LABOR) || \
@@ -141,6 +142,7 @@ config FREETZ_KERNEL_LAYOUT_AR9
 config FREETZ_KERNEL_LAYOUT_AR10
 	bool
 	default y if \
+		FREETZ_TYPE_3272 || \
 		FREETZ_TYPE_7272
 
 config FREETZ_KERNEL_LAYOUT_IKS