From: Markus Lehtonen Date: Tue, 3 Jul 2012 15:10:46 +0000 (+0300) Subject: Update to WW26 release from MCG X-Git-Tag: 2.1b_release~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f338c8b9a5892493be48c92667f2e0c057d8582b;p=platform%2Fadaptation%2Fintel_mfld%2Flinux-firmware-mfld.git Update to WW26 release from MCG Also changes packaging so that firmware binaries are easily just copied from the mcg release. Signed-off-by: Markus Lehtonen --- diff --git a/packaging/TIInit_10.5.20.bts b/firmware/TIInit_10.5.20.bts similarity index 100% rename from packaging/TIInit_10.5.20.bts rename to firmware/TIInit_10.5.20.bts diff --git a/packaging/TIInit_10.6.15.bts b/firmware/TIInit_10.6.15.bts similarity index 70% rename from packaging/TIInit_10.6.15.bts rename to firmware/TIInit_10.6.15.bts index e593d3e..9bfd5ea 100644 Binary files a/packaging/TIInit_10.6.15.bts and b/firmware/TIInit_10.6.15.bts differ diff --git a/packaging/aac_dec_1.bin b/firmware/aac_dec_1.bin similarity index 100% rename from packaging/aac_dec_1.bin rename to firmware/aac_dec_1.bin diff --git a/packaging/aac_enc_1.bin b/firmware/aac_enc_1.bin similarity index 100% rename from packaging/aac_enc_1.bin rename to firmware/aac_enc_1.bin diff --git a/packaging/aac_v1_dec_1.bin b/firmware/aac_v1_dec_1.bin similarity index 100% rename from packaging/aac_v1_dec_1.bin rename to firmware/aac_v1_dec_1.bin diff --git a/packaging/aac_v2_dec_1.bin b/firmware/aac_v2_dec_1.bin similarity index 100% rename from packaging/aac_v2_dec_1.bin rename to firmware/aac_v2_dec_1.bin diff --git a/packaging/dis_cam14mp.bin b/firmware/dis_cam14mp.bin similarity index 100% rename from packaging/dis_cam14mp.bin rename to firmware/dis_cam14mp.bin diff --git a/packaging/fa_extension.bin b/firmware/fa_extension.bin similarity index 100% rename from packaging/fa_extension.bin rename to firmware/fa_extension.bin diff --git a/packaging/fw_sst_082f.bin b/firmware/fw_sst_082f.bin similarity index 63% rename from packaging/fw_sst_082f.bin rename to firmware/fw_sst_082f.bin index 827f7aa..7914b2c 100644 Binary files a/packaging/fw_sst_082f.bin and b/firmware/fw_sst_082f.bin differ diff --git a/packaging/fw_sst_08e7.bin b/firmware/fw_sst_08e7.bin similarity index 86% rename from packaging/fw_sst_08e7.bin rename to firmware/fw_sst_08e7.bin index 4e856f2..5ef088d 100644 Binary files a/packaging/fw_sst_08e7.bin and b/firmware/fw_sst_08e7.bin differ diff --git a/firmware/intel_absp.bin b/firmware/intel_absp.bin new file mode 100644 index 0000000..c15f35c --- /dev/null +++ b/firmware/intel_absp.bin @@ -0,0 +1 @@ +version: 00000000-000 diff --git a/packaging/isp_acc_fusion.bin b/firmware/isp_acc_fusion.bin similarity index 100% rename from packaging/isp_acc_fusion.bin rename to firmware/isp_acc_fusion.bin diff --git a/packaging/isp_acc_multires.bin b/firmware/isp_acc_multires.bin similarity index 100% rename from packaging/isp_acc_multires.bin rename to firmware/isp_acc_multires.bin diff --git a/packaging/isp_acc_warp_deghost.bin b/firmware/isp_acc_warp_deghost.bin similarity index 100% rename from packaging/isp_acc_warp_deghost.bin rename to firmware/isp_acc_warp_deghost.bin diff --git a/firmware/modem/radio_firmware.bin b/firmware/modem/radio_firmware.bin new file mode 100644 index 0000000..1a71b64 Binary files /dev/null and b/firmware/modem/radio_firmware.bin differ diff --git a/packaging/mp3_dec_1.bin b/firmware/mp3_dec_1.bin similarity index 100% rename from packaging/mp3_dec_1.bin rename to firmware/mp3_dec_1.bin diff --git a/packaging/msvdx_fw.bin b/firmware/msvdx_fw.bin similarity index 100% rename from packaging/msvdx_fw.bin rename to firmware/msvdx_fw.bin diff --git a/packaging/msvdx_fw_mfld.bin b/firmware/msvdx_fw_mfld.bin similarity index 100% rename from packaging/msvdx_fw_mfld.bin rename to firmware/msvdx_fw_mfld.bin diff --git a/packaging/msvdx_fw_mfld_DE2.0.bin b/firmware/msvdx_fw_mfld_DE2.0.bin similarity index 100% rename from packaging/msvdx_fw_mfld_DE2.0.bin rename to firmware/msvdx_fw_mfld_DE2.0.bin diff --git a/firmware/shisp.bin b/firmware/shisp.bin new file mode 100644 index 0000000..80f24c8 Binary files /dev/null and b/firmware/shisp.bin differ diff --git a/packaging/wl128x-fw-multirole-plt.bin b/firmware/ti-connectivity/wl128x-fw-multirole-plt.bin similarity index 100% rename from packaging/wl128x-fw-multirole-plt.bin rename to firmware/ti-connectivity/wl128x-fw-multirole-plt.bin diff --git a/packaging/wl128x-fw-multirole-roc.bin b/firmware/ti-connectivity/wl128x-fw-multirole-roc.bin similarity index 56% rename from packaging/wl128x-fw-multirole-roc.bin rename to firmware/ti-connectivity/wl128x-fw-multirole-roc.bin index 4a3b447..0eff65e 100644 Binary files a/packaging/wl128x-fw-multirole-roc.bin and b/firmware/ti-connectivity/wl128x-fw-multirole-roc.bin differ diff --git a/packaging/topaz_fw.bin b/firmware/topaz_fw.bin similarity index 100% rename from packaging/topaz_fw.bin rename to firmware/topaz_fw.bin diff --git a/packaging/topazsc_fw.bin b/firmware/topazsc_fw.bin similarity index 100% rename from packaging/topazsc_fw.bin rename to firmware/topazsc_fw.bin diff --git a/packaging/vpimg_es305b.bin b/firmware/vpimg_es305b-BB.bin similarity index 99% rename from packaging/vpimg_es305b.bin rename to firmware/vpimg_es305b-BB.bin index bc1860b..fd20af3 100644 Binary files a/packaging/vpimg_es305b.bin and b/firmware/vpimg_es305b-BB.bin differ diff --git a/firmware/vpimg_es305b-NH.bin b/firmware/vpimg_es305b-NH.bin new file mode 100644 index 0000000..d139476 Binary files /dev/null and b/firmware/vpimg_es305b-NH.bin differ diff --git a/packaging/wma9_dec_1.bin b/firmware/wma9_dec_1.bin similarity index 100% rename from packaging/wma9_dec_1.bin rename to firmware/wma9_dec_1.bin diff --git a/packaging/firmware_wl128x.bin b/packaging/firmware_wl128x.bin deleted file mode 100644 index a3a55f1..0000000 Binary files a/packaging/firmware_wl128x.bin and /dev/null differ diff --git a/packaging/linux-firmware-mfld.spec b/packaging/linux-firmware-mfld.spec index e7fc3ec..0466a2e 100644 --- a/packaging/linux-firmware-mfld.spec +++ b/packaging/linux-firmware-mfld.spec @@ -1,96 +1,30 @@ Name: linux-firmware-mfld -Version: 12.19 +Version: 12.26 Release: 1 Summary: firmware files for Medfield platform drivers Group: System/Kernel License: Redistributable, no modification permitted -# sst -Source0: aac_dec_1.bin -Source1: aac_enc_1.bin -Source2: aac_v1_dec_1.bin -Source3: aac_v2_dec_1.bin -Source4: fw_sst_082f.bin -Source5: mp3_dec_1.bin -Source6: wma9_dec_1.bin -Source7: fw_sst_08e7.bin -#camera -Source20: shisp.bin -Source21: dis_cam14mp.bin -Source22: fa_extension.bin -Source23: isp_acc_fusion.bin -Source24: isp_acc_multires.bin -Source25: isp_acc_warp_deghost.bin -# video -Source30: msvdx_fw.bin -Source31: msvdx_fw_mfld.bin -Source32: msvdx_fw_mfld_DE2.0.bin -Source33: topaz_fw.bin -Source34: topazsc_fw.bin -# TI WL128x Bluetooth -Source50: TIInit_10.5.20.bts -Source51: TIInit_10.6.15.bts -# TI WL12xx Wifi -Source60: TQS_D_1.7.ini -Source61: firmware_wl128x.bin -Source62: wl128x-fw-multirole-plt.bin -Source63: wl128x-fw-multirole-roc.bin -Source64: wl1271-nvs.bin -Source65: regulatory.bin - -# Audio for telephony -Source70: vpimg_es305b.bin - +Source0: %{name}-%{version}.tar.bz2 %description Firmware files for kernel drivers specific to the Medfield platform %prep - +%setup -q %build %install -mkdir -p $RPM_BUILD_ROOT/lib/firmware -mkdir -p $RPM_BUILD_ROOT/lib/firmware/ti-connectivity -install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE20} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE21} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE22} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE23} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE24} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE25} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE30} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE31} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE32} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE33} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE34} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE50} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE51} $RPM_BUILD_ROOT/lib/firmware -install -m 644 %{SOURCE60} $RPM_BUILD_ROOT/lib/firmware/ti-connectivity -install -m 644 %{SOURCE61} $RPM_BUILD_ROOT/lib/firmware/ti-connectivity -install -m 644 %{SOURCE62} $RPM_BUILD_ROOT/lib/firmware/ti-connectivity -install -m 644 %{SOURCE63} $RPM_BUILD_ROOT/lib/firmware/ti-connectivity -install -m 644 %{SOURCE64} $RPM_BUILD_ROOT/lib/firmware/ti-connectivity -install -m 644 %{SOURCE65} $RPM_BUILD_ROOT/lib/firmware/ti-connectivity -install -m 644 %{SOURCE70} $RPM_BUILD_ROOT/lib/firmware -# The wl12xx driver looks for filenames that don't match these for some reason -pushd $RPM_BUILD_ROOT/lib/firmware/ti-connectivity -ln -s wl1271-nvs.bin wl128x-nvs.bin -ln -s firmware_wl128x.bin wl128x-fw.bin -popd +install -d %{buildroot}/lib/ +cp -r firmware %{buildroot}/lib/ +cp -r wifi/*bin %{buildroot}/lib/firmware/ti-connectivity/ + %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files diff --git a/packaging/regulatory.bin b/packaging/regulatory.bin deleted file mode 100644 index ca8ceff..0000000 Binary files a/packaging/regulatory.bin and /dev/null differ diff --git a/packaging/shisp.bin b/packaging/shisp.bin deleted file mode 100644 index 8d20eaa..0000000 Binary files a/packaging/shisp.bin and /dev/null differ diff --git a/packaging/update-bins.sh b/packaging/update-bins.sh deleted file mode 100644 index 81d7de2..0000000 --- a/packaging/update-bins.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -e -PROG=`basename $0` - -ANDROID_BASE_DIR="$HOME/android/umg-android-ics/" -#BIN_SEARCH_DIRS="$ANDROID_BASE_DIR/device" -BIN_SEARCH_DIRS=" - $ANDROID_BASE_DIR/device/intel \ - $ANDROID_BASE_DIR/vendor/intel/medfield \ - $ANDROID_BASE_DIR/vendor/intel/mfld_pr2 \ -" - - - -echo "Searching for binaries under '$BIN_SEARCH_DIRS'" -_OLD="`find -maxdepth 1 -type f ! \( -name '*spec' -o -name '*changes' -o -name $PROG \)`" -for bin in $_OLD; do - #echo "Searching for $bin" - _FILENAME="`basename $bin`" - _NEW=`find $BIN_SEARCH_DIRS -name "$_FILENAME"` - if [ -n "$_NEW" ]; then - if [ `echo "$_NEW" | wc -l` -gt 1 ]; then - echo -e "!!!\n!!!WARNING: Multiple binaries with name '$_FILENAME' found, using the first one\n!!!" - _NEW="`echo "$_NEW" | head -n1`" - fi - echo "Copying $_NEW to $_FILENAME" - cp $_NEW . - else - echo -e "!!!\n!!!WARNING: '$_FILENAME' not found in source dir\n!!!" - fi - #echo "Fixing permissions of $_FILENAME" - #chmod 644 $_FILENAME -done - diff --git a/packaging/TQS_D_1.7.ini b/wifi/TQS.ini similarity index 100% rename from packaging/TQS_D_1.7.ini rename to wifi/TQS.ini diff --git a/wifi/hostapd.conf b/wifi/hostapd.conf new file mode 100644 index 0000000..f0b215a --- /dev/null +++ b/wifi/hostapd.conf @@ -0,0 +1,88 @@ +driver=nl80211 +logger_syslog=-1 +logger_syslog_level=2 +logger_stdout=1 +logger_stdout_level=4 +dump_file=/data/misc/wifi/hostapd.dump +ctrl_interface=/data/misc/wifi/sockets GROUP=wifi +#ctrl_interface=/dev/socket +#ctrl_interface_group=0 +hw_mode=g +channel=11 +beacon_int=100 +dtim_period=2 +max_num_sta=8 +supported_rates=10 20 55 110 60 90 120 180 240 360 480 540 +preamble=1 +macaddr_acl=0 +auth_algs=1 +ignore_broadcast_ssid=0 +wme_enabled=0 +wmm_enabled=1 +wep_rekey_period=0 +eap_server=0 +own_ip_addr=127.0.0.1 +wpa_group_rekey=0 +wpa_gmk_rekey=0 +wpa_ptk_rekey=0 +interface=wlan1 +ssid=AndroidAP +ap_table_max_size=255 +ap_table_expiration_time=3600 +macaddr_acl=0 +auth_algs=3 +tx_queue_data3_aifs=7 +tx_queue_data3_cwmin=15 +tx_queue_data3_cwmax=1023 +tx_queue_data3_burst=0 +tx_queue_data2_aifs=2 +tx_queue_data2_cwmin=15 +tx_queue_data2_cwmax=63 +tx_queue_data2_burst=0 +tx_queue_data1_aifs=1 +tx_queue_data1_cwmin=7 +tx_queue_data1_cwmax=15 +tx_queue_data1_burst=3.0 +tx_queue_data0_aifs=1 +tx_queue_data0_cwmin=3 +tx_queue_data0_cwmax=7 +tx_queue_data0_burst=1.5 +wme_enabled=1 +wme_ac_bk_cwmin=4 +wme_ac_bk_cwmax=10 +wme_ac_bk_aifs=7 +wme_ac_bk_txop_limit=0 +wme_ac_bk_acm=0 +wme_ac_be_aifs=3 +wme_ac_be_cwmin=4 +wme_ac_be_cwmax=10 +wme_ac_be_txop_limit=0 +wme_ac_be_acm=0 +wme_ac_vi_aifs=2 +wme_ac_vi_cwmin=3 +wme_ac_vi_cwmax=4 +wme_ac_vi_txop_limit=94 +wme_ac_vi_acm=0 +wme_ac_vo_aifs=2 +wme_ac_vo_cwmin=2 +wme_ac_vo_cwmax=3 +wme_ac_vo_txop_limit=47 +wme_ac_vo_acm=0 +uapsd_advertisement_enabled=1 +wep_rekey_period=0 +own_ip_addr=127.0.0.1 +wpa_group_rekey=0 +wpa_gmk_rekey=0 +wpa_ptk_rekey=0 +ap_table_max_size=255 +ap_table_expiration_time=60 +wps_state=2 +ap_setup_locked=1 +uuid=12345678-9abc-def0-1234-56789abcdef0 +eap_server=1 +disassoc_low_ack=1 +ap_max_inactivity=10000 +#ieee80211d=1 +#country_code=US +ieee80211n=1 +ht_capab=[SHORT-GI-20][GF][RX-STBC1] diff --git a/wifi/p2p_supplicant.conf b/wifi/p2p_supplicant.conf new file mode 100644 index 0000000..14c9b9b --- /dev/null +++ b/wifi/p2p_supplicant.conf @@ -0,0 +1,5 @@ +update_config=1 +ctrl_interface=wlan0:0 +# eapol_version=1 +ap_scan=1 +fast_reauth=1 diff --git a/wifi/widi_supplicant.conf b/wifi/widi_supplicant.conf new file mode 100644 index 0000000..fa2ea53 --- /dev/null +++ b/wifi/widi_supplicant.conf @@ -0,0 +1,6 @@ +update_config=0 +ctrl_interface=wlan0:0 +# eapol_version=1 +ap_scan=0 +fast_reauth=1 + diff --git a/packaging/wl1271-nvs.bin b/wifi/wl1271-nvs.bin similarity index 100% rename from packaging/wl1271-nvs.bin rename to wifi/wl1271-nvs.bin diff --git a/wifi/wpa_supplicant.conf b/wifi/wpa_supplicant.conf new file mode 100644 index 0000000..b861ea6 --- /dev/null +++ b/wifi/wpa_supplicant.conf @@ -0,0 +1,16 @@ +update_config=1 +ctrl_interface=wlan0:0 +# eapol_version=1 +ap_scan=1 +fast_reauth=1 +device_name=PR3 +manufacturer=Intel +model_name=R2 +model_number=3 +serial_number=11111 +config_methods=virtual_push_button physical_push_button virtual_display physical_display push_button keypad +bss_expiration_age=60 +bss_expiration_scan_count=10 +device_name=medfield +model_name=mfld_pr2 +model_number=3