From 7871dde631c05dfc8f0174dade3dbf30f7f3773d Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sun, 27 May 2012 13:37:45 -0400 Subject: Remove redundant wifi config files Also change ccode to ALL in bcmdhd.cal The two .txt files are contained in the vendor/samsung tree Change-Id: Ie7d5a36f16c363d26acb7c3b01fc3a1d22137962 --- configs/bcmdhd.cal | 2 +- configs/nvram_mfg.txt | 112 -------------------------------------------------- configs/nvram_net.txt | 112 -------------------------------------------------- n7000.mk | 2 - 4 files changed, 1 insertion(+), 227 deletions(-) delete mode 100644 configs/nvram_mfg.txt delete mode 100644 configs/nvram_net.txt diff --git a/configs/bcmdhd.cal b/configs/bcmdhd.cal index a820b83..105088f 100755 --- a/configs/bcmdhd.cal +++ b/configs/bcmdhd.cal @@ -15,7 +15,7 @@ ag0=252 ag1=252 aa2g=1 aa5g=1 -ccode=GB +ccode=ALL #for BT-coexistence btc_params80=0 diff --git a/configs/nvram_mfg.txt b/configs/nvram_mfg.txt deleted file mode 100644 index 5311632..0000000 --- a/configs/nvram_mfg.txt +++ /dev/null @@ -1,112 +0,0 @@ -manfid=0x2d0 -prodid=0x0532 -vendid=0x14e4 -devid=0x4360 -boardtype=0x0532 -boardrev=0x20 -boardflags=0x10080201 - -nocrc=1 -xtalfreq=37400 -xtalmode=0x20,0x4,0 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -ag0=255 -ag1=255 -aa2g=1 -ccode=ALL - -btc_params80=0 -btc_params6=10 -btc_params8=10000 - -sd_gpout=0 -sd_oobonly=1 - -# 2G PA para B42G_R08_110729 -pa0b0=0x14CF -pa0b1=0xFD9F -pa0b2=0xFF6D -#pa0itssit=62 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 - -# rssi params for 5GHz B42G_R08_110729 -#rssismf5g=0x4 -rssismf5g=0xa -rssismc5g=0x7 -rssisav5g=0x1 -#PA parameters for lower band -pa1lob0=5907 -pa1lob1=64797 -pa1lob2=65324 -#PA parameters for midband -pa1b0=6071 -pa1b1=64780 -pa1b2=65325 -#PA parameters for high band -pa1hib0=6015 -pa1hib1=64782 -pa1hib2=65321 - -# 2G PA offset B42G_R08_110825 -maxp2ga0=76 -sromrev=3 -cckpo=0 -ofdm2gpo=0x66666666 -mcs2gpo0=0x8888 -mcs2gpo1=0x8888 - -# 5G PA offset B42G_R08_110825 -maxp5ga0=66 -maxp5gla0=66 -maxp5gha0=66 -ofdm5gpo=0x00000000 -ofdm5glpo=0x11111111 -ofdm5ghpo=0x11111111 -mcs5gpo0=0x2222 -mcs5gpo1=0x2222 -mcs5glpo0=0x3333 -mcs5glpo1=0x3333 -mcs5ghpo0=0x3333 -mcs5ghpo1=0x3333 - -cckPwrOffset=4 -cckdigfilttype=21 -ofdmdigfilttype=2 -extpagain5g=2 -#wl0id=0x431b - -# For 2GHz Tx EVM/SM -rfreg033=0x19 -rfreg033_cck=0x1f -pacalidx2g=65 -dacrate2g=160 -txalpfbyp2g=1 -bphyscale=17 - -#5GHz LOFT and IQ CAL -txgaintbl5g=1 -txiqlopapu5g=1 -txiqlopag5g=0x10 -iqlocalidx5g=24 - -# 5GHz Noise CAL parameter -noise_cal_po_5g=5 -noise_cal_enable_5g=0 - -# 2GHz RxPER at low rates -noise_cal_ref_2g=56 -noise_cal_po_bias_2g=-4 -noise_cal_enable_2g=1 - -# Max input level on a-band -triso5g=1 - -# Tx power control, especially temp. -tssitime=1 - -swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff -swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8 - diff --git a/configs/nvram_net.txt b/configs/nvram_net.txt deleted file mode 100644 index c1d5a9b..0000000 --- a/configs/nvram_net.txt +++ /dev/null @@ -1,112 +0,0 @@ -manfid=0x2d0 -prodid=0x0532 -vendid=0x14e4 -devid=0x4360 -boardtype=0x0532 -boardrev=0x20 -boardflags=0x10080201 - -nocrc=1 -xtalfreq=37400 -xtalmode=0x20,0x4,0 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -ag0=252 -ag1=255 -aa2g=1 -ccode=GB - -btc_params80=0 -btc_params6=10 -btc_params8=10000 - -sd_gpout=0 -sd_oobonly=1 - -# 2G PA para B42G_R08_110729 -pa0b0=0x14CF -pa0b1=0xFD9F -pa0b2=0xFF6D -#pa0itssit=62 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 - -# rssi params for 5GHz B42G_R08_110729 -#rssismf5g=0x4 -rssismf5g=0xa -rssismc5g=0x7 -rssisav5g=0x1 -#PA parameters for lower band -pa1lob0=5907 -pa1lob1=64797 -pa1lob2=65324 -#PA parameters for midband -pa1b0=6071 -pa1b1=64780 -pa1b2=65325 -#PA parameters for high band -pa1hib0=6015 -pa1hib1=64782 -pa1hib2=65321 - -# 2G PA offset B42G_R08_110825 -maxp2ga0=80 -sromrev=3 -cckpo=0 -ofdm2gpo=0x66666666 -mcs2gpo0=0x8888 -mcs2gpo1=0x8888 - -# 5G PA offset B42G_R08_110825 -maxp5ga0=66 -maxp5gla0=66 -maxp5gha0=66 -ofdm5gpo=0x00000000 -ofdm5glpo=0x11111111 -ofdm5ghpo=0x11111111 -mcs5gpo0=0x2222 -mcs5gpo1=0x2222 -mcs5glpo0=0x3333 -mcs5glpo1=0x3333 -mcs5ghpo0=0x3333 -mcs5ghpo1=0x3333 - -cckPwrOffset=4 -cckdigfilttype=21 -ofdmdigfilttype=2 -extpagain5g=2 -#wl0id=0x431b - -# For 2GHz Tx EVM/SM -rfreg033=0x19 -rfreg033_cck=0x1f -pacalidx2g=65 -dacrate2g=160 -txalpfbyp2g=1 -bphyscale=17 - -#5GHz LOFT and IQ CAL -txgaintbl5g=1 -txiqlopapu5g=1 -txiqlopag5g=0x10 -iqlocalidx5g=24 - -# 5GHz Noise CAL parameter -noise_cal_po_5g=5 -noise_cal_enable_5g=0 - -# 2GHz RxPER at low rates -noise_cal_ref_2g=56 -noise_cal_po_bias_2g=-4 -noise_cal_enable_2g=1 - -# Max input level on a-band -triso5g=1 - -# Tx power control, especially temp. -tssitime=1 - -swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff -swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8 - diff --git a/n7000.mk b/n7000.mk index 6da7824..9f936bb 100755 --- a/n7000.mk +++ b/n7000.mk @@ -42,8 +42,6 @@ PRODUCT_PROPERTY_OVERRIDES := \ # Wifi PRODUCT_COPY_FILES += \ - device/samsung/n7000/configs/nvram_net.txt:system/etc/nvram_net.txt \ - device/samsung/n7000/configs/nvram_mfg.txt:system/etc/nvram_mfg.txt \ device/samsung/n7000/configs/bcmdhd.cal:system/etc/wifi/bcmdhd.cal PRODUCT_PROPERTY_OVERRIDES += \ -- cgit v1.1