From 5136f34c9aa0a2550b89eb17bc07aaad1d1fbf3b Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 2 Mar 2017 15:19:51 +0000 Subject: [PATCH] Bump version to 2.3 Fix Asturian translation Update kernel and firmware Add missing dtbs Add wifi regulatory domain database --- BUILDME.sh | 2 +- buildroot/.config | 8 +- buildroot/.gitignore | 2 - buildroot/kernelconfig-recovery.armv6 | 1 + buildroot/kernelconfig-recovery.armv7 | 1 + buildroot/linux-regdb.patch | 1324 +++++++++++++++++ .../package/rpi-firmware/rpi-firmware.mk | 5 +- recovery/config.h | 2 +- recovery/icons.qrc | 4 +- recovery/icons/es_XA.png | Bin 293 -> 0 bytes recovery/languagedialog.cpp | 5 + recovery/recovery.pro | 2 +- ...ranslation_es_XA.ts => translation_ast.ts} | 2 +- 13 files changed, 1345 insertions(+), 13 deletions(-) create mode 100644 buildroot/linux-regdb.patch delete mode 100644 recovery/icons/es_XA.png rename recovery/{translation_es_XA.ts => translation_ast.ts} (99%) diff --git a/BUILDME.sh b/BUILDME.sh index b9ef69bc..c2db9b1a 100755 --- a/BUILDME.sh +++ b/BUILDME.sh @@ -112,7 +112,7 @@ SKIP_KERNEL_REBUILD=0 for i in $*; do # Update raspberrypi/firmware master HEAD version in package/rpi-firmware/rpi-firmware.mk to latest if [ $i = "update-firmware" ]; then - update_github_package_version rpi-firmware raspberrypi/firmware master + update_github_package_version rpi-firmware raspberrypi/firmware stable fi # Update raspberrypi/userland master HEAD version in package/rpi-userland/rpi-userland.mk to latest diff --git a/buildroot/.config b/buildroot/.config index a4249964..e8062b2a 100644 --- a/buildroot/.config +++ b/buildroot/.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Buildroot 2015.02-git-dirty Configuration +# Buildroot 2015.02-git-00025-gb997269-dirty Configuration # BR2_HAVE_DOT_CONFIG=y @@ -307,9 +307,9 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y # BR2_LINUX_KERNEL_CUSTOM_HG is not set # BR2_LINUX_KERNEL_CUSTOM_LOCAL is not set BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8d1dd639a4db6ccc416bb0a00afc7a8888018b3d" -BR2_LINUX_KERNEL_VERSION="8d1dd639a4db6ccc416bb0a00afc7a8888018b3d" -BR2_LINUX_KERNEL_PATCH="" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e223d71ef728c559aa865d0c5a4cedbdf8789cfd" +BR2_LINUX_KERNEL_VERSION="e223d71ef728c559aa865d0c5a4cedbdf8789cfd" +BR2_LINUX_KERNEL_PATCH="linux-regdb.patch" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="kernelconfig-recovery.armv6" diff --git a/buildroot/.gitignore b/buildroot/.gitignore index bb02d9f5..317e2daa 100644 --- a/buildroot/.gitignore +++ b/buildroot/.gitignore @@ -7,8 +7,6 @@ /.config *.depend *.o -/*.patch -/*.diff *.orig *.rej *~ diff --git a/buildroot/kernelconfig-recovery.armv6 b/buildroot/kernelconfig-recovery.armv6 index 87299bc6..cc9c35bf 100644 --- a/buildroot/kernelconfig-recovery.armv6 +++ b/buildroot/kernelconfig-recovery.armv6 @@ -41,6 +41,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_CFG80211=y +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y diff --git a/buildroot/kernelconfig-recovery.armv7 b/buildroot/kernelconfig-recovery.armv7 index a9ed3096..837b8abb 100644 --- a/buildroot/kernelconfig-recovery.armv7 +++ b/buildroot/kernelconfig-recovery.armv7 @@ -46,6 +46,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_CFG80211=y +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y diff --git a/buildroot/linux-regdb.patch b/buildroot/linux-regdb.patch new file mode 100644 index 00000000..59841030 --- /dev/null +++ b/buildroot/linux-regdb.patch @@ -0,0 +1,1324 @@ +diff -u -r a/net/wireless/db.txt b/net/wireless/db.txt +--- a/net/wireless/db.txt 2017-02-20 12:28:41.000000000 +0000 ++++ b/net/wireless/db.txt 2017-03-03 14:49:10.430281862 +0000 +@@ -1,17 +1,1306 @@ ++# This is the world regulatory domain ++country 00: ++ (2402 - 2472 @ 40), (20) ++ # Channel 12 - 13. ++ (2457 - 2482 @ 20), (20), NO-IR, AUTO-BW ++ # Channel 14. Only JP enables this and for 802.11b only ++ (2474 - 2494 @ 20), (20), NO-IR, NO-OFDM ++ # Channel 36 - 48 ++ (5170 - 5250 @ 80), (20), NO-IR, AUTO-BW ++ # Channel 52 - 64 ++ (5250 - 5330 @ 80), (20), NO-IR, DFS, AUTO-BW ++ # Channel 100 - 144 ++ (5490 - 5730 @ 160), (20), NO-IR, DFS ++ # Channel 149 - 165 ++ (5735 - 5835 @ 80), (20), NO-IR ++ # IEEE 802.11ad (60GHz), channels 1..3 ++ (57240 - 63720 @ 2160), (0) ++ ++ ++country AD: ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20) ++ (5250 - 5330 @ 80), (20), DFS ++ (5490 - 5710 @ 80), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country AE: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country AF: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++# Source: ++# http://pucanguilla.org/Downloads/January2005-Anguilla%20Table%20of%20Allocations.pdf ++country AI: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country AL: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20.00), AUTO-BW ++ (5250 - 5330 @ 80), (20.00), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27.00), DFS ++ ++country AM: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 20), (18) ++ (5250 - 5330 @ 20), (18), DFS ++ ++country AN: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country AR: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country AS: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country AT: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country AU: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country AW: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country AZ: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (18), AUTO-BW ++ (5250 - 5330 @ 80), (18), DFS, AUTO-BW ++ ++country BA: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country BB: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (23), AUTO-BW ++ (5250 - 5330 @ 80), (23), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (30) ++ ++country BD: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5735 - 5835 @ 80), (30) ++ ++country BE: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country BF: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++# Bulgarian rules as defined by the Communications Regulation Commission in the ++# following documents: + # +-# This file is a placeholder to prevent accidental build breakage if someone +-# enables CONFIG_CFG80211_INTERNAL_REGDB. Almost no one actually needs to +-# enable that build option. +-# +-# You should be using CRDA instead. It is even better if you use the CRDA +-# package provided by your distribution, since they will probably keep it +-# up-to-date on your behalf. +-# +-# If you _really_ intend to use CONFIG_CFG80211_INTERNAL_REGDB then you will +-# need to replace this file with one containing appropriately formatted +-# regulatory rules that cover the regulatory domains you will be using. Your +-# best option is to extract the db.txt file from the wireless-regdb git +-# repository: ++# Rules for carrying out electronic communications through radio equipment using ++# radio spectrum, which does not need to be individually assigned (the Rules): ++# http://www.crc.bg/files/_bg/Pravila_09_06_2015.pdf + # +-# git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git ++# List of radio equipment that uses harmonized within the European Union bands ++# and electronic communications terminal equipment (the List): ++# http://www.crc.bg/files/_bg/Spisak_2015.pdf + # ++# Note: The transmit power limits in the 5250-5350 MHz and 5470-5725 MHz bands ++# can be raised by 3 dBm if TPC is enabled. Refer to BDS EN 301 893 for details. ++country BG: DFS-ETSI ++ # Wideband data transmission systems (WDTS) in the 2.4GHz ISM band, ref: ++ # I.22 of the List, BDS EN 300 328 ++ (2402 - 2482 @ 40), (20) ++ # 5 GHz Radio Local Area Networks (RLANs), ref: ++ # II.H01 of the List, BDS EN 301 893 ++ (5170 - 5250 @ 80), (23), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ # II.H01 of the List, I.54 from the List, BDS EN 301 893 ++ (5490 - 5710 @ 160), (27), DFS ++ # Short range devices (SRDs) in the 5725-5875 MHz frequency range, ref: ++ # I.43 of the List, BDS EN 300 440-2, BDS EN 300 440-1 ++ (5725 - 5875 @ 80), (14) ++ # 60 GHz Multiple-Gigabit RLAN Systems, ref: ++ # II.H03 of the List, BDS EN 302 567-2 ++ (57000 - 66000 @ 2160), (40), NO-OUTDOOR ++ ++country BH: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 20), (20) ++ (5250 - 5330 @ 20), (20), DFS ++ (5735 - 5835 @ 20), (20) ++ ++country BL: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country BM: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country BN: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (20) ++ ++country BO: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5250 - 5330 @ 80), (30), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country BR: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country BS: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++# Source: ++# http://www.bicma.gov.bt/paper/publication/nrrpart4.pdf ++country BT: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country BY: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country BZ: DFS-JP ++ (2402 - 2482 @ 40), (30) ++ (5735 - 5835 @ 80), (30) ++ ++country CA: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5150 - 5250 @ 80), (23), AUTO-BW ++ (5250 - 5350 @ 80), (24), DFS, AUTO-BW ++ (5470 - 5600 @ 80), (24), DFS ++ (5650 - 5730 @ 80), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++# Source: ++# http://www.art-rca.org ++country CF: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 40), (17) ++ (5250 - 5330 @ 40), (24), DFS ++ (5490 - 5730 @ 40), (24), DFS ++ (5735 - 5835 @ 40), (30) ++ ++country CH: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country CI: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country CL: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (20) ++ ++country CN: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (23), AUTO-BW ++ (5250 - 5330 @ 80), (23), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (30) ++ # 60 GHz band channels 1,4: 28dBm, channels 2,3: 44dBm ++ # ref: http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf ++ (57240 - 59400 @ 2160), (28) ++ (59400 - 63720 @ 2160), (44) ++ (63720 - 65880 @ 2160), (28) ++ ++country CO: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country CR: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 20), (17) ++ (5250 - 5330 @ 20), (24), DFS ++ (5490 - 5730 @ 20), (24), DFS ++ (5735 - 5835 @ 20), (30) ++ ++# http://www.mincom.gob.cu/?q=marcoregulatorio ++# - Redes Informáticas ++# Resolución 127, 2011 - Reglamento Banda 2,4 GHz. ++country CU: DFS-FCC ++ (2400 - 2483.5 @ 40), (200 mW) ++ ++country CX: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country CY: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++# Data from http://www.ctu.eu/164/download/VOR/VOR-12-08-2005-34.pdf ++# and http://www.ctu.eu/164/download/VOR/VOR-12-05-2007-6-AN.pdf ++# Power at 5250 - 5350 MHz and 5470 - 5725 MHz can be doubled if TPC is ++# implemented. ++country CZ: DFS-ETSI ++ (2400 - 2483.5 @ 40), (100 mW) ++ (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW ++ (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW ++ (5470 - 5725 @ 160), (500 mW), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++# Allocation for the 2.4 GHz band (Vfg 10 / 2013, Allgemeinzuteilung von ++# Frequenzen für die Nutzung in lokalen Netzwerken; Wireless Local Area ++# Networks (WLAN-Funkanwendungen). ++# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2013_10_WLAN_2,4GHz_pdf.pdf ++# ++# Allocation for the 5 GHz band (Vfg. 7 / 2010, Allgemeinzuteilung von ++# Frequenzen in den Bereichen 5150 MHz - 5350 MHz und 5470 MHz - 5725 MHz für ++# Funkanwendungen zur breitbandigen Datenübertragung, WAS/WLAN („Wireless ++# Access Systems including Wireless Local Area Networks“). ++# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2010_07_WLAN_5GHz_pdf.pdf ++# The values for the 5 GHz have been reduced by a factor of 2 (3db) for non TPC ++# devices (in other words: devices with TPC can use twice the tx power of this ++# table). Note that the docs do not require TPC for 5150--5250; the reduction ++# to 100mW thus is not strictly required -- however the conservative 100mW ++# limit is used here as the non-interference with radar and satellite ++# apps relies on the attenuation by the building walls only in the ++# absence of DFS; the neighbour countries have 100mW limit here as well. ++# ++# The ETSI EN 300 440-1 standard for short range devices in the 5 GHz band has ++# been implemented in Germany: ++# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2014_69_SRD_pdf.pdf ++# ++# Allocation for the 60 GHz band (Allgemeinzuteilung von Frequenzen im ++# Bereich 57 GHz - 66 GHz für Funkanwendungen für weitbandige ++# Datenübertragungssysteme; „Multiple Gigabit WAS/RLAN Systems (MGWS)“). ++# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2011_08_MGWS_pdf.pdf ++ ++country DE: DFS-ETSI ++ (2400 - 2483.5 @ 40), (100 mW) ++ (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR, AUTO-BW ++ (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW ++ (5470 - 5725 @ 160), (500 mW), DFS ++ # short range devices (ETSI EN 300 440-1) ++ (5725 - 5875 @ 80), (25 mW) ++ # 60 GHz band channels 1-4 (ETSI EN 302 567) ++ (57000 - 66000 @ 2160), (40) ++ ++country DK: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++# Source: ++# http://www.ntrcdom.org/index.php?option=com_content&view=category&layout=blog&id=10&Itemid=55 ++country DM: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (23), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (30) ++ ++country DO: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (23), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (30) ++ ++country DZ: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5170.000 - 5250.000 @ 80.000), (23.00), AUTO-BW ++ (5250.000 - 5330.000 @ 80.000), (23.00), DFS, AUTO-BW ++ (5490.000 - 5670.000 @ 160.000), (23.00), DFS ++ ++country EC: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 20), (17) ++ (5250 - 5330 @ 20), (24), DFS ++ (5490 - 5730 @ 20), (24), DFS ++ (5735 - 5835 @ 20), (30) ++ ++country EE: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country EG: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 40), (20) ++ (5250 - 5330 @ 40), (20), DFS ++ ++# Orden IET/787/2013, de 25 de abril, por la que se aprueba ++# el cuadro nacional de atribución de frecuencias. ++# http://www.boe.es/diario_boe/txt.php?id=BOE-A-2013-4845 ++# ++# more info at "Cuadro nacional de atribución de frecuencias (CNAF)": ++# http://www.minetur.gob.es/telecomunicaciones/espectro/paginas/cnaf.aspx ++ ++country ES: DFS-ETSI ++ (2400 - 2483.5 @ 40), (100 mW) ++ (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW ++ (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW ++ (5470 - 5725 @ 160), (500 mW), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country ET: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country FI: DFS-ETSI ++ (2400 - 2483.5 @ 40), (20) ++ (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW ++ (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW ++ (5470 - 5725 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country FM: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country FR: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country GB: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country GD: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country GE: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (18), AUTO-BW ++ (5250 - 5330 @ 80), (18), DFS, AUTO-BW ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country GF: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country GH: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country GL: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country GP: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country GR: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country GT: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (23), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (30) ++ ++country GU: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 20), (17) ++ (5250 - 5330 @ 20), (24), DFS ++ (5490 - 5730 @ 20), (24), DFS ++ (5735 - 5835 @ 20), (30) ++ ++country GY: ++ (2402 - 2482 @ 40), (30) ++ (5735 - 5835 @ 80), (30) ++ ++country HK: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country HN: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country HR: DFS-ETSI ++ (2400 - 2483.5 @ 40), (20) ++ (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW ++ (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW ++ (5470 - 5725 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country HT: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country HU: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country ID: DFS-JP ++ # ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf ++ (2402 - 2482 @ 20), (20) ++ (5735 - 5815 @ 20), (23) ++ ++country IE: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country IL: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW ++ (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, DFS, AUTO-BW ++ ++country IN: ++ (2402 - 2482 @ 40), (20) ++ (5150 - 5350 @ 160), (23) ++ (5725 - 5875 @ 80), (23) ++ ++country IR: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5735 - 5835 @ 80), (30) ++ ++country IS: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country IT: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country JM: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country JO: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (23) ++ (5735 - 5835 @ 80), (23) ++ ++country JP: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (2474 - 2494 @ 20), (20), NO-OFDM ++ (4910 - 4990 @ 40), (23) ++ (5030 - 5090 @ 40), (23) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (23), DFS ++ # 60 GHz band channels 2-4 at 10mW, ++ # ref: http://www.arib.or.jp/english/html/overview/doc/1-STD-T74v1_1.pdf ++ (59000 - 66000 @ 2160), (10 mW) ++ ++country KE: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (23) ++ (5490 - 5570 @ 80), (30), DFS ++ (5735 - 5775 @ 40), (23) ++ ++country KH: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++# Source ++# http://ntrc.kn/?page_id=7 ++country KN: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (30), DFS ++ (5735 - 5815 @ 80), (30) ++ ++country KP: DFS-JP ++ (2402 - 2482 @ 20), (20) ++ (5170 - 5250 @ 20), (20) ++ (5250 - 5330 @ 20), (20), DFS ++ (5490 - 5630 @ 20), (30), DFS ++ (5735 - 5815 @ 20), (30) ++ ++country KR: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (30), DFS ++ (5735 - 5835 @ 80), (30) ++ # 60 GHz band channels 1-4, ++ # ref: http://www.law.go.kr/%ED%96%89%EC%A0%95%EA%B7%9C%EC%B9%99/%EB%AC%B4%EC%84%A0%EC%84%A4%EB%B9%84%EA%B7%9C%EC%B9%99 ++ (57000 - 66000 @ 2160), (43) ++ ++country KW: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ ++country KY: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country KZ: ++ (2402 - 2482 @ 40), (20) ++ ++country LB: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++# Source: ++# http://www.ntrc.org.lc/operational_structures.htm ++country LC: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (30), DFS ++ (5735 - 5815 @ 80), (30) ++ ++country LI: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country LK: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 20), (17) ++ (5250 - 5330 @ 20), (24), DFS ++ (5490 - 5730 @ 20), (24), DFS ++ (5735 - 5835 @ 20), (30) ++ ++# Source: ++# http://lca.org.ls/images/documents/lesotho_national_frequency_allocation_plan.pdf ++country LS: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country LT: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country LU: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country LV: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country MA: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ ++country MC: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++# Source: ++# http://www.cnfr.md/index.php?pag=sec&id=117&l=en ++country MD: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++# Source: ++# http://www.cept.org/files/1050/Tools%20and%20Services/EFIS%20-%20ECO%20Frequency%20Information%20System/National%20frequency%20tables/Montenegro%20NAFT%20-%202010.pdf ++country ME: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country MF: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country MH: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country MK: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country MN: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country MO: DFS-FCC ++ (2402 - 2482 @ 40), (23) ++ (5170 - 5250 @ 80), (23), AUTO-BW ++ (5250 - 5330 @ 80), (23), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (30), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country MP: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country MQ: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++# Source: ++# http://www.are.mr/pdfs/telec_freq_TNAbf_2010.pdf ++country MR: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country MT: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country MU: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++# Source: ++# http://www.cam.gov.mv/docs/tech_standards/TAM-TS-100-2004-WLAN.pdf ++country MV: DFS-ETSI ++ (2400 - 2483.5 @ 40), (100 mW) ++ (5150 - 5250 @ 80), (200 mW), AUTO-BW ++ (5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW ++ (5725 - 5850 @ 80), (100 mW) ++ ++country MW: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country MX: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country MY: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5650 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (24) ++ ++country NG: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5250 - 5330 @ 80), (30), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country NI: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++# Regulation on the use of frequency space without a license and ++# without notification 2015 ++# ++# http://wetten.overheid.nl/BWBR0036378/2015-03-05 ++ ++country NL: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), NO-OUTDOOR, AUTO-BW ++ (5250 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # short range devices (ETSI EN 300 440-1) ++ (5725 - 5875 @ 80), (25 mW) ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++# Data from http://www.lovdata.no/dokument/SF/forskrift/2012-01-19-77 ++# Power at 5250 - 5350 MHz, 5470 - 5725 MHz and 5815 – 5850 MHz can ++# be doubled if TPC is implemented. ++# Up to 2W (or 4W with TPC) is allowed in the 5725 – 5795 MHz band ++# which has been merged with 5470 - 5725 MHz to allow wide channels ++country NO: DFS-ETSI ++ (2400 - 2483.5 @ 40), (100 mW) ++ (5150 - 5250 @ 80), (200 mW), AUTO-BW ++ (5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW ++ (5470 - 5795 @ 160), (500 mW), DFS ++ (5815 - 5850 @ 35), (2000 mW), DFS ++ (17100 - 17300 @ 200), (100 mW) ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country NP: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (20) ++ ++country NZ: DFS-ETSI ++ (2402 - 2482 @ 40), (30) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country OM: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country PA: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (23), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (30) ++ ++country PE: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country PF: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country PG: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country PH: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country PK: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5735 - 5835 @ 80), (30) ++ ++country PL: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country PM: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country PR: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country PT: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country PW: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country PY: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country QA: DFS-JP ++ (2402 - 2482 @ 40), (20) ++ (5735 - 5835 @ 80), (30) ++ ++country RE: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country RO: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++ ++# Source: ++# http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf ++country RS: DFS-ETSI ++ (2400 - 2483.5 @ 40), (100 mW) ++ (5150 - 5350 @ 40), (200 mW), NO-OUTDOOR ++ (5470 - 5725 @ 20), (1000 mW), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country RU: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5650 - 5730 @ 80), (30), DFS ++ (5735 - 5835 @ 80), (30) ++ # 60 GHz band channels 1-4, ref: Changes to NLA 124_Order №129_22042015.pdf ++ (57000 - 66000 @ 2160), (40) ++ ++country RW: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country SA: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country SE: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country SG: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country SI: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country SK: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++# Source: ++# Regulation N° 2004-005 ART/DG/DRC/D.Rég ++country SN: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country SR: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country SV: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 20), (17) ++ (5250 - 5330 @ 20), (23), DFS ++ (5735 - 5835 @ 20), (30) ++ ++country SY: ++ (2402 - 2482 @ 40), (20) ++ ++# Source: ++# http://www.telecommission.tc/Spectrum-plan20110324-101210.html ++country TC: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country TD: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country TG: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 40), (20) ++ (5250 - 5330 @ 40), (20), DFS ++ (5490 - 5710 @ 40), (27), DFS ++ ++country TH: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country TN: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ ++country TR: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country TT: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++# Source: ++# Table of Frequency Allocations of Republic of China (Taiwan) / Nov 2014: ++# http://www.motc.gov.tw/websitedowndoc?file=post/201411171137330.doc& \ ++# filedisplay=Table+of+radio+frequency+allocation.doc ++# LP0002 Low-power Radio-frequency Devices Technical Regulations / 28 Jun 2011: ++# http://www.ncc.gov.tw/english/show_file.aspx?table_name=news&file_sn=681 ++# (section 3.10.1, 4.7) ++country TW: DFS-FCC ++ (2400 - 2483.5 @ 40), (30) ++ # Follow US 5.15 ~ 5.25 GHz: 30 dBm for master mode, 23 dBm for clients ++ (5150 - 5250 @ 80), (23), AUTO-BW ++ (5250 - 5350 @ 80), (23), DFS, AUTO-BW ++ (5470 - 5725 @ 160), (23), DFS ++ (5725 - 5850 @ 80), (30) ++ ++country TZ: ++ (2402 - 2482 @ 40), (20) ++ (5735 - 5835 @ 80), (30) ++ ++# Source: ++# #914 / 06 Sep 2007: http://www.ucrf.gov.ua/uk/doc/nkrz/1196068874 ++# #1174 / 23 Oct 2008: http://www.nkrz.gov.ua/uk/activities/ruling/1225269361 ++# (appendix 8) ++# Listed 5GHz range is a lowest common denominator for all related ++# rules in the referenced laws. Such a range is used because of ++# disputable definitions there. ++country UA: DFS-ETSI ++ (2400 - 2483.5 @ 40), (20), NO-OUTDOOR ++ (5150 - 5250 @ 80), (20), NO-OUTDOOR, AUTO-BW ++ (5250 - 5350 @ 80), (20), DFS, NO-OUTDOOR, AUTO-BW ++ (5490 - 5670 @ 160), (20), DFS ++ (5735 - 5835 @ 80), (20) ++ # 60 GHz band channels 1-4, ref: Etsi En 302 567 ++ (57000 - 66000 @ 2160), (40) ++ ++country UG: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country US: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ # 5.15 ~ 5.25 GHz: 30 dBm for master mode, 23 dBm for clients ++ (5170 - 5250 @ 80), (23), AUTO-BW ++ (5250 - 5330 @ 80), (23), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (23), DFS ++ (5735 - 5835 @ 80), (30) ++ # 60g band ++ # reference: http://cfr.regstoday.com/47cfr15.aspx#47_CFR_15p255 ++ # channels 1,2,3, EIRP=40dBm(43dBm peak) ++ (57240 - 63720 @ 2160), (40) ++ ++country UY: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (23), AUTO-BW ++ (5250 - 5330 @ 80), (23), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (30) ++ ++# Source: ++# http://cemc.uz/article/1976/ ++country UZ: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ ++# Source: ++# http://www.ntrc.vc/regulations/Jun_2006_Spectrum_Managment_Regulations.pdf ++country VC: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++# Source: ++# Official Gazette (Gaceta Oficial) concerning Unlicensed transmitter use ++# (10 June 2013) ++# http://www.conatel.gob.ve/ ++country VE: DFS-FCC ++ (2402 - 2482 @ 40), (30) ++ (5170 - 5250 @ 80), (23), AUTO-BW ++ (5250 - 5330 @ 80), (23), DFS, AUTO-BW ++ (5735 - 5835 @ 80), (30) ++ ++country VI: DFS-FCC ++ (2402 - 2472 @ 40), (30) ++ (5170 - 5250 @ 80), (24), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country VN: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17) ++ (5250 - 5330 @ 80), (24), DFS ++ (5490 - 5730 @ 80), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++# Source: ++# http://www.trr.vu/attachments/category/130/GURL_for_Short-range_Radiocommunication_Devices2.pdf ++country VU: DFS-FCC ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (17), AUTO-BW ++ (5250 - 5330 @ 80), (24), DFS, AUTO-BW ++ (5490 - 5730 @ 160), (24), DFS ++ (5735 - 5835 @ 80), (30) ++ ++country WF: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country WS: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 40), (20) ++ (5250 - 5330 @ 40), (20), DFS ++ (5490 - 5710 @ 40), (27), DFS ++ ++country YE: ++ (2402 - 2482 @ 40), (20) ++ ++country YT: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ ++country ZA: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (30) ++ ++country ZW: DFS-ETSI ++ (2402 - 2482 @ 40), (20) ++ (5170 - 5250 @ 80), (20), AUTO-BW ++ (5250 - 5330 @ 80), (20), DFS, AUTO-BW ++ (5490 - 5710 @ 160), (27), DFS ++ diff --git a/buildroot/package/rpi-firmware/rpi-firmware.mk b/buildroot/package/rpi-firmware/rpi-firmware.mk index 1e1dfd82..ae29b7cc 100644 --- a/buildroot/package/rpi-firmware/rpi-firmware.mk +++ b/buildroot/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 2b495acb7ed00d629bd865209858c9eccff8f77f +RPI_FIRMWARE_VERSION = b51046a2b2bb69771579a549d157205d9982f858 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3c RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom @@ -15,10 +15,13 @@ RPI_FIRMWARE_DEPENDENCIES += host-rpi-firmware ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y) define RPI_FIRMWARE_INSTALL_DTB + $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-0-w.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-0-w.dtb $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb + $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-cm.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-cm.dtb $(INSTALL) -D -m 0644 $(@D)/boot/bcm2709-rpi-2-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2709-rpi-2-b.dtb $(INSTALL) -D -m 0644 $(@D)/boot/bcm2710-rpi-3-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2710-rpi-3-b.dtb + $(INSTALL) -D -m 0644 $(@D)/boot/bcm2710-rpi-cm3.dtb $(BINARIES_DIR)/rpi-firmware/bcm2710-rpi-cm3.dtb endef endif diff --git a/recovery/config.h b/recovery/config.h index de0472f1..a12631a5 100644 --- a/recovery/config.h +++ b/recovery/config.h @@ -2,7 +2,7 @@ #define CONFIG_H /* Version number displayed in the title bar */ -#define VERSION_NUMBER "2.2" +#define VERSION_NUMBER "2.3" /* Color of the background */ // #define BACKGROUND_COLOR Qt::white diff --git a/recovery/icons.qrc b/recovery/icons.qrc index ec3c6ef4..06dc739e 100644 --- a/recovery/icons.qrc +++ b/recovery/icons.qrc @@ -17,8 +17,8 @@ translation_de.qm icons/de.png translation_es.qm - translation_es_XA.qm - icons/es_XA.png + translation_ast.qm + icons/ast.png icons/es.png translation_eu.qm icons/eu.png diff --git a/recovery/icons/es_XA.png b/recovery/icons/es_XA.png deleted file mode 100644 index 3388b909d96fbbbfcb3cd5ac85e69f91ae538f8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~o!2~3KHq6QcQfx`y?k)`fL2$v|<&%LToCO|{ z#XwcUAk4@xYmNj^kiEpy*OmP~yM(AYzfejw3s7j2r;B5V#`)wFkKgAVxDuQm{!JHn zRN>#mmU-{_^W--Y|Af{)yeZxpe&0oMM&|{EgI~M4zgkOw&Nq8@zo+N_Rn~mt2Op%k zTP8iKl+)h->1DcS;<@cBcXfxbzMCSKk(O{|QKO)o*Bl-D8#C% - + BootSelectionDialog