Permalink
Browse files

add 7390int -> 7340 alien, thx olistudent (closes #2050)

git-svn-id: file:///var/svn/freetz/trunk@10318 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent e2185a5 commit 6bf4b08d7b0d9f5a93cb3ebd76e43afd766edeb4 cuma committed Apr 4, 2013
Showing with 72 additions and 5 deletions.
  1. +19 −5 Config.in
  2. +1 −0 FIRMWARES
  3. +52 −0 patches/scripts/100-7340_7390.sh
View
@@ -331,11 +331,12 @@ config FREETZ_TYPE_LANGUAGE
default "en" if FREETZ_TYPE_LANG_EN
config FREETZ_TYPE_ALIEN_HARDWARE
- bool "Compile image for \"alien\" hardware"
+ bool "Compile image for 'alien' hardware"
depends on \
FREETZ_TYPE_7170 || \
FREETZ_TYPE_7270 || \
FREETZ_TYPE_7330 || \
+ FREETZ_TYPE_7390 && FREETZ_TYPE_LANG_EN || \
FREETZ_TYPE_7570
default n
help
@@ -475,6 +476,13 @@ choice
Enable this to compile an alien image for FritzBox FON WLAN 7320 based
on a 7330 image.
+ config FREETZ_TYPE_7340_7390
+ bool "7340"
+ depends on FREETZ_TYPE_7390
+ help
+ Enable this to compile an alien image for FritzBox FON WLAN 7340 based
+ on a 7390 image.
+
config FREETZ_TYPE_IAD_3331_7170
bool "Alice IAD 3331"
depends on FREETZ_TYPE_7170 && FREETZ_TYPE_LANG_DE
@@ -1487,10 +1495,10 @@ menu "Override options"
default "FRITZ.Box_Fon_WLAN_7360_SL.109.05.22.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7360_SL && FREETZ_TYPE_FIRMWARE_05_2X
default "FRITZ.Box_Fon_WLAN_7360_SL.109.05.50.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7360_SL && FREETZ_TYPE_FIRMWARE_05_5X
default "FRITZ.Box_Fon_WLAN_7390_Labor.84.05.51-24828.image" if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_7390 && FREETZ_TYPE_LANG_DE
- default "FRITZ.Box_Fon_WLAN_7390.84.05.50.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_05_5X
+ default "FRITZ.Box_Fon_WLAN_7390.84.05.50.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_05_5X && FREETZ_TYPE_LANG_DE
default "FRITZ.Box_Fon_WLAN_7390.84.05.22.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_DE
- default "FRITZ.Box_Fon_WLAN_7390.en-de-es-it-fr.84.05.22.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_EN
- default "FRITZ.Box_7390_BETA.en-de-es-it-fr.84.05.23-22868.image" if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_7390 && FREETZ_TYPE_LANG_EN
+ default "FRITZ.Box_Fon_WLAN_7390.en-de-es-it-fr.84.05.22.image" if FREETZ_TYPE_FIRMWARE_FINAL && (FREETZ_TYPE_7390 || FREETZ_TYPE_7340_7390) && FREETZ_TYPE_LANG_EN
+ default "FRITZ.Box_7390_BETA.en-de-es-it-fr.84.05.23-22868.image" if FREETZ_TYPE_FIRMWARE_LABOR && (FREETZ_TYPE_7390 || FREETZ_TYPE_7340_7390) && FREETZ_TYPE_LANG_EN
default "FRITZ.Box_Fon_WLAN_7570_vDSL.en-de-fr.75.04.91.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7570
default "fritz.box_sl_wlan.09.04.34.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3020
default "fritz.box_wlan_3030.21.04.34.image" if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_3030
@@ -1569,7 +1577,7 @@ menu "Override options"
default "913665f19b1faf5082091b338e3a9283" if FREETZ_TYPE_7360_SL && FREETZ_TYPE_FIRMWARE_05_2X
default "ad5448ea20ce00dc5c2d18a93ff7835a" if FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_05_5X
default "e7b50eec03e2fd23a2ff4b21caf7d692" if FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_DE
- default "21755129aa2318e8e6627f650191cacc" if FREETZ_TYPE_7390 && FREETZ_TYPE_FIRMWARE_05_2X && FREETZ_TYPE_LANG_EN
+ default "21755129aa2318e8e6627f650191cacc" if (FREETZ_TYPE_7390 || FREETZ_TYPE_7340_7390) && FREETZ_TYPE_LANG_EN
default "caa18aa1888a6b4990fccaf386d1d86a" if FREETZ_TYPE_7570
default "f483cfab8da97207248f5e0703993a72" if FREETZ_TYPE_3020
default "31653fb1ba044375ab389474951c1cf4" if FREETZ_TYPE_3030
@@ -1596,6 +1604,7 @@ menu "Override options"
FREETZ_TYPE_7141_7170 || \
FREETZ_TYPE_7240_7270 || \
FREETZ_TYPE_7320_7330 || \
+ FREETZ_TYPE_7340_7390 || \
FREETZ_TYPE_W500V_7150 || \
FREETZ_TYPE_W501V || \
FREETZ_TYPE_W701V_7170 || \
@@ -1609,6 +1618,7 @@ menu "Override options"
default "@AVM/fritzbox.fon_wlan_7141/firmware/deutsch" if FREETZ_TYPE_7141_7170
default "@AVM/fritzbox.fon_wlan_7240/firmware/deutsch" if FREETZ_TYPE_7240_7270
default "@AVM/fritzbox.fon_wlan_7320/firmware/deutsch" if FREETZ_TYPE_7320_7330
+ default "@AVM/fritzbox.fon_wlan_7340/firmware/english" if FREETZ_TYPE_7340_7390
default "@TELEKOM/Sinus W 500 V" if FREETZ_TYPE_W500V_7150
default "@TELEKOM/Speedport/Speedport W 701 V" if FREETZ_TYPE_W701V_7170
default "@TELEKOM/Speedport/Speedport W 900V" if FREETZ_TYPE_W900V_7170
@@ -1625,6 +1635,7 @@ menu "Override options"
FREETZ_TYPE_7141_7170 || \
FREETZ_TYPE_7240_7270 || \
FREETZ_TYPE_7320_7330 || \
+ FREETZ_TYPE_7340_7390 || \
FREETZ_TYPE_W500V_7150 || \
FREETZ_TYPE_W501V || \
FREETZ_TYPE_W701V_7170 || \
@@ -1639,6 +1650,7 @@ menu "Override options"
default "FRITZ.Box_Fon_WLAN_7240.73.05.22.image" if FREETZ_TYPE_7240_7270
default "FRITZ.Box_Fon_WLAN_7320.100.05.22.image" if FREETZ_TYPE_7320_7330
default "FRITZ.Box_Fon_WLAN_7270_v2.en-de-es-it-fr.54.04.90.image" if FREETZ_TYPE_7270_V1
+ default "FRITZ.Box_Fon_WLAN_7340.en-de-es-it-fr.99.05.22.image" if FREETZ_TYPE_7340_7390
default "Sinus_W_500V.27.04.27.image" if FREETZ_TYPE_W500V_7150
default "fritz.box_fon_wlan_7141.40.04.37.image" if FREETZ_TYPE_W501V
default "fw_Speedport_W701V_v33.04.57.image" if FREETZ_TYPE_W701V_7170
@@ -1655,6 +1667,7 @@ menu "Override options"
FREETZ_TYPE_7141_7170 || \
FREETZ_TYPE_7240_7270 || \
FREETZ_TYPE_7320_7330 || \
+ FREETZ_TYPE_7340_7390 || \
FREETZ_TYPE_W500V_7150 || \
FREETZ_TYPE_W501V || \
FREETZ_TYPE_W701V_7170 || \
@@ -1668,6 +1681,7 @@ menu "Override options"
default "b612f315216adf3b230e4d99430194a8" if FREETZ_TYPE_7141_7170
default "0f3432079ee4ed93ea18896f38b25e84" if FREETZ_TYPE_7240_7270
default "142b80159404938ea0fb5b576fc27fec" if FREETZ_TYPE_7320_7330
+ default "d887def011101bdc6836d8a84b17b62e" if FREETZ_TYPE_7340_7390
default "716e136d91ab153f028d1a4e13390f71" if FREETZ_TYPE_7270_V1
default "c49167da6dca42cdb34fbffbaf2c4097" if FREETZ_TYPE_W501V
default "e34713bd989c3e266a4650c133582510" if FREETZ_TYPE_W701V_7170
View
@@ -146,3 +146,4 @@ Currently supported boxes and firmwares
* 7270v1: AVM 7270v2
* 7270v2: AVM 7270v1
* 7320: AVM 7330
+ * 7340: AVM 7390
@@ -0,0 +1,52 @@
+isFreetzType 7340_7390 || return 0
+
+if [ -z "$FIRMWARE2" ]; then
+ echo "ERROR: no tk firmware" 1>&2
+ exit 1
+fi
+
+echo1 "adapt firmware for 7390"
+
+echo2 "deleting obsolete files"
+rm_files ${FILESYSTEM_MOD_DIR}/lib/modules/bitfile.bit
+
+echo2 "copying 7340 files"
+files="bitfile_isdn.bit bitfile_pots.bit"
+
+for i in $files; do
+ cp -a "${DIR}/.tk/original/filesystem/lib/modules/$i" "${FILESYSTEM_MOD_DIR}/lib/modules/$i"
+done
+
+files="css/default/images/kopfbalken_mitte.gif"
+files+=" html/de/images/kopfbalken.gif"
+files+=" html/de/images/DectFBoxIcon.png"
+for i in $files; do
+ cp -a \
+ "${DIR}/.tk/original/filesystem/usr/www/avme/$i" \
+ "${FILESYSTEM_MOD_DIR}/usr/www/avme/$i"
+done
+
+echo2 "moving default config dir"
+mv ${FILESYSTEM_MOD_DIR}/etc/default.Fritz_Box_7390 ${FILESYSTEM_MOD_DIR}/etc/default.Fritz_Box_7340
+
+echo2 "patching rc.conf"
+modsed "s/CONFIG_ETH_COUNT=.*$/CONFIG_ETH_COUNT=\"2\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf"
+modsed "s/CONFIG_JFFS2=.*$/CONFIG_JFFS2=\"y\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf"
+modsed "s/CONFIG_NAND=.*$/CONFIG_NAND=\"n\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf"
+modsed "s/CONFIG_YAFFS2=.*$/CONFIG_YAFFS2=\"n\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf"
+modsed "s/CONFIG_CAPI_NT=.*$/CONFIG_CAPI_NT=\"n\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf"
+modsed "s/CONFIG_INSTALL_TYPE=.*$/CONFIG_INSTALL_TYPE=\"iks_16MB_xilinx_2eth_2ab_isdn_te_pots_wlan_usb_host_dect_63350\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf"
+modsed "s/CONFIG_PRODUKT=.*$/CONFIG_PRODUKT=\"Fritz_Box_7340\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf"
+modsed "s/CONFIG_PRODUKT_NAME=.*$/CONFIG_PRODUKT_NAME=\"FRITZ!Box Fon WLAN 7340\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf"
+modsed "s/CONFIG_VERSION_MAJOR=.*$/CONFIG_VERSION_MAJOR=\"99\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf"
+
+# patch loading of bitfile
+if isFreetzType LANG_EN; then
+ modsed "s/bitfile.bit/bitfile_isdn.bit/" "${FILESYSTEM_MOD_DIR}/etc/init.d/S17-isdn"
+ modsed 's#^\(modprobe Piglet_noemif.*\)#\1 piglet_potsbitfile=/lib/modules/bitfile_pots\.bit\${HWRevision_BitFileCount} piglet_bitfilemode=`/bin/testvalue /var/flash/telefon_misc 4 2638`#g' \
+ "${FILESYSTEM_MOD_DIR}/etc/init.d/S17-isdn"
+fi
+
+# patch install script to accept firmware from 7390
+echo2 "applying install patch"
+modsed "s/iks_16MB_xilinx_4eth_2ab_isdn_nt_te_pots_wlan_usb_host_dect_64415/iks_16MB_xilinx_2eth_2ab_isdn_te_pots_wlan_usb_host_dect_63350/g" "${FIRMWARE_MOD_DIR}/var/install"

0 comments on commit 6bf4b08

Please sign in to comment.