reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-scan-table/dvb-s/Echostar-10+11-110W b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-scan-table/dvb-s/Echostar-10+11-110W
new file mode 100755
index 0000000..6521ab5
--- /dev/null
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-scan-table/dvb-s/Echostar-10+11-110W
@@ -0,0 +1,281 @@
+#Dish Network USA works with PSK/8turbo
+#Just DVBS-USB Genpix Sky Walker 1 or 2 works with PSK/8turbo
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12224000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12239000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12253000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12268000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 20000000
+ INNER_FEC = 5/6
+ MODULATION = QPSK
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12282000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12297000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12297000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12311000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12326000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12341000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12355000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12370000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12384000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 20000000
+ INNER_FEC = 5/6
+ MODULATION = QPSK
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12399000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12414000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12428000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12443000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 20000000
+ INNER_FEC = 7/8
+ MODULATION = QPSK
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12457000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12472000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12486000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12501000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12516000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 20000000
+ INNER_FEC = 7/8
+ MODULATION = QPSK
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12530000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12545000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12559000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12574000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 20000000
+ INNER_FEC = 5/6
+ MODULATION = QPSK
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12589000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 20000000
+ INNER_FEC = 5/6
+ MODULATION = QPSK
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12603000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12618000
+ POLARIZATION = LEFT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12632000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12661000
+ POLARIZATION = RIGHT
+ SYMBOL_RATE = 21500000
+ INNER_FEC = 2/3
+ MODULATION = PSK/8
+ INVERSION = AUTO