Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
authorhschang <chang@dev3>
Thu, 7 Aug 2014 01:17:28 +0000 (10:17 +0900)
committerhschang <chang@dev3>
Thu, 7 Aug 2014 01:17:28 +0000 (10:17 +0900)
Conflicts:
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb

16 files changed:
meta-bsp/bm750/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm.patch [new file with mode: 0644]
meta-bsp/bm750/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm7335.patch [deleted file]
meta-bsp/bm750/recipes/linux/linux-vuplus_3.9.6.bbappend
meta-bsp/common/recipes/linux/linux-vuplus-3.13.5/linux-tcp_output.patch [new file with mode: 0644]
meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb
meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb
meta-bsp/vusolose/conf/machine/vusolose.conf
meta-bsp/vusolose/recipes/vuplus/vuplus-bootlogo.bbappend
meta-bsp/vusolose/recipes/vuplus/vuplus-bootlogo/vmlinuz-initrd-7241b0 [deleted file]
meta-bsp/vuultimo/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm.patch [new file with mode: 0644]
meta-bsp/vuultimo/recipes/linux/linux-vuplus_3.9.6.bbappend
meta-bsp/vuuno/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm.patch [new file with mode: 0644]
meta-bsp/vuuno/recipes/linux/linux-vuplus_3.9.6.bbappend
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb

diff --git a/meta-bsp/bm750/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm.patch b/meta-bsp/bm750/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm.patch
new file mode 100644 (file)
index 0000000..cbfc4b7
--- /dev/null
@@ -0,0 +1,55 @@
+diff --git a/drivers/ata/sata_brcmstb.c b/drivers/ata/sata_brcmstb.c
+index 7ba20e0..1e2e947 100644
+--- a/drivers/ata/sata_brcmstb.c
++++ b/drivers/ata/sata_brcmstb.c
+@@ -330,6 +330,22 @@ static void brcm_EnableOOBWindowFix(void __iomem *mmio_base, int port)
+       mdio_write_reg(mmio_base, port, 0x0D, sval);
+ }
++static void brcm_Enable256AlignDetection(void __iomem *mmio_base, int port)
++{
++        uint32_t tmp32;
++        void __iomem *port_mmio;
++
++        port_mmio = PORT_BASE(mmio_base, port);
++
++        tmp32 = readl(port_mmio + K2_SATA_SICR1_OFFSET);
++        tmp32 |= 0x08000000;
++        writel(tmp32, port_mmio + K2_SATA_SICR1_OFFSET);
++
++        tmp32 = readl(port_mmio + K2_SATA_SICR2_OFFSET);
++        tmp32 |= 0x00800000;
++        writel(tmp32, port_mmio + K2_SATA_SICR2_OFFSET);
++}
++
+ static void brcm_AnalogReset(void __iomem *mmio_base, int port)
+ {
+       /* do analog reset */
+@@ -385,6 +401,8 @@ static void brcm_InitSata_1_5Gb(void __iomem *mmio_base, int port)
+       brcm_SetPllTxRxCtrl(mmio_base, port);
+       brcm_EnableOOBWindowFix(mmio_base, port);
++      brcm_Enable256AlignDetection(mmio_base, port);
++
+       if (!port) {
+ #ifdef CONFIG_BRCM_SATA_75MHZ_PLL
+               /* use 75Mhz PLL clock */
+@@ -446,6 +464,8 @@ static void brcm_InitSata2_3Gb(void __iomem *mmio_base, int port)
+       brcm_SetPllTxRxCtrl(mmio_base, port);
+       brcm_EnableOOBWindowFix(mmio_base, port);
++      brcm_Enable256AlignDetection(mmio_base, port);
++
+       if (!port) {
+ #ifdef CONFIG_BRCM_SATA_75MHZ_PLL
+               /* use 75Mhz PLL clock */
+@@ -1135,7 +1155,9 @@ static int k2_sata_resume(struct device *dev)
+               ap = host->ports[i];
+               ata_for_each_link(link, ap, EDGE) {
++                      spin_unlock_irqrestore(&hp->lock, flags);
+                       sata_std_hardreset(link, NULL, 1000);
++                      spin_lock_irqsave(&hp->lock, flags);
+               }
+       }
diff --git a/meta-bsp/bm750/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm7335.patch b/meta-bsp/bm750/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm7335.patch
deleted file mode 100644 (file)
index cbfc4b7..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/drivers/ata/sata_brcmstb.c b/drivers/ata/sata_brcmstb.c
-index 7ba20e0..1e2e947 100644
---- a/drivers/ata/sata_brcmstb.c
-+++ b/drivers/ata/sata_brcmstb.c
-@@ -330,6 +330,22 @@ static void brcm_EnableOOBWindowFix(void __iomem *mmio_base, int port)
-       mdio_write_reg(mmio_base, port, 0x0D, sval);
- }
-+static void brcm_Enable256AlignDetection(void __iomem *mmio_base, int port)
-+{
-+        uint32_t tmp32;
-+        void __iomem *port_mmio;
-+
-+        port_mmio = PORT_BASE(mmio_base, port);
-+
-+        tmp32 = readl(port_mmio + K2_SATA_SICR1_OFFSET);
-+        tmp32 |= 0x08000000;
-+        writel(tmp32, port_mmio + K2_SATA_SICR1_OFFSET);
-+
-+        tmp32 = readl(port_mmio + K2_SATA_SICR2_OFFSET);
-+        tmp32 |= 0x00800000;
-+        writel(tmp32, port_mmio + K2_SATA_SICR2_OFFSET);
-+}
-+
- static void brcm_AnalogReset(void __iomem *mmio_base, int port)
- {
-       /* do analog reset */
-@@ -385,6 +401,8 @@ static void brcm_InitSata_1_5Gb(void __iomem *mmio_base, int port)
-       brcm_SetPllTxRxCtrl(mmio_base, port);
-       brcm_EnableOOBWindowFix(mmio_base, port);
-+      brcm_Enable256AlignDetection(mmio_base, port);
-+
-       if (!port) {
- #ifdef CONFIG_BRCM_SATA_75MHZ_PLL
-               /* use 75Mhz PLL clock */
-@@ -446,6 +464,8 @@ static void brcm_InitSata2_3Gb(void __iomem *mmio_base, int port)
-       brcm_SetPllTxRxCtrl(mmio_base, port);
-       brcm_EnableOOBWindowFix(mmio_base, port);
-+      brcm_Enable256AlignDetection(mmio_base, port);
-+
-       if (!port) {
- #ifdef CONFIG_BRCM_SATA_75MHZ_PLL
-               /* use 75Mhz PLL clock */
-@@ -1135,7 +1155,9 @@ static int k2_sata_resume(struct device *dev)
-               ap = host->ports[i];
-               ata_for_each_link(link, ap, EDGE) {
-+                      spin_unlock_irqrestore(&hp->lock, flags);
-                       sata_std_hardreset(link, NULL, 1000);
-+                      spin_lock_irqsave(&hp->lock, flags);
-               }
-       }
index 25ffa7b..45f7298 100644 (file)
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PR .= "-bsp2"
+PR .= "-bsp3"
 SRC_URI += "\
-        file://linux-sata_bcm7335.patch;patch=1;pnum=1 \
+        file://linux-sata_bcm.patch \
 "
diff --git a/meta-bsp/common/recipes/linux/linux-vuplus-3.13.5/linux-tcp_output.patch b/meta-bsp/common/recipes/linux/linux-vuplus-3.13.5/linux-tcp_output.patch
new file mode 100644 (file)
index 0000000..cda1c68
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
+index 7820f3a..fb6b332 100644
+--- a/net/ipv4/tcp_output.c
++++ b/net/ipv4/tcp_output.c
+@@ -51,7 +51,7 @@ int sysctl_tcp_retrans_collapse __read_mostly = 1;
+ int sysctl_tcp_workaround_signed_windows __read_mostly = 0;
+ /* Default TSQ limit of two TSO segments */
+-int sysctl_tcp_limit_output_bytes __read_mostly = 131072;
++int sysctl_tcp_limit_output_bytes __read_mostly = 4194304;
+ /* This limits the percentage of the congestion window which we
+  * will allow a single TSO frame to consume.  Building TSO frames
index 08ed154..75d37d1 100644 (file)
@@ -5,13 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "3.13.5"
 
-PR = "r3"
+PR = "r4"
 SRCREV = ""
 
 MODULE = "linux-3.13.5"
 
 SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-${KV}.tar.bz2 \
         file://rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch \
+        file://linux-tcp_output.patch \
         file://${MACHINE}_defconfig \
        "
 
index 0d8943a..ad82342 100755 (executable)
@@ -6,19 +6,55 @@ RDEPENDS_${PN} = "ncurses"
 LICENSE = "CLOSED"
 
 PV = "3.5"
-PR = "r2"
+PR = "r3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI = "http://archive.vuplus.com/download/utils/vuplus-blindscan-utils-${PV}.tar.bz2"
 
 S = "${WORKDIR}/blindscan-utils"
 
+PLUGABLE_MODEL_BLINDSCAN = "tda1002x vuplus_blindscan vuplus_6211_blindscan vuplus_6222_blindscan ssh108 ssh108_t2_scan"
+PLUGABLE_SOLOSE_BLINDSCAN = "tda1002x vuplus_blindscan vuplus_6211_blindscan ssh108 ssh108_t2_scan"
+
 do_install() {
-       install -d ${D}/${bindir}/
-       for i in `find ${S} -type f -maxdepth 1`; do
-               install -m 0755 $i ${D}/${bindir}/;
-       done;
+       install -d "${D}/${bindir}"
+       install -m 0755 "${S}/tda1002x" "${D}/${bindir}"
+}
+
+do_install_vuuno() {
+       install -d "${D}/${bindir}"
+       for f in ${PLUGABLE_MODEL_BLINDSCAN}; do
+               install -m 0755 "${S}/$f" "${D}/${bindir}"
+       done
+}
+
+do_install_vuultimo() {
+       install -d "${D}/${bindir}"
+       for f in ${PLUGABLE_MODEL_BLINDSCAN}; do
+               install -m 0755 "${S}/$f" "${D}/${bindir}"
+       done
+}
+
+do_install_vusolo2() {
+       install -d "${D}/${bindir}"
+       install -m 0755 "${S}/tda1002x" "${D}/${bindir}"
+       install -m 0755 "${S}/vuplus_bcm7346_blindscan" "${D}/${bindir}"
+}
+
+do_install_vuduo2() {
+       install -d "${D}/${bindir}"
+       for f in ${PLUGABLE_MODEL_BLINDSCAN}; do
+               install -m 0755 "${S}/$f" "${D}/${bindir}"
+       done
+}
+
+do_install_vusolose() {
+       install -d "${D}/${bindir}"
+       for f in ${PLUGABLE_SOLOSE_BLINDSCAN}; do
+               install -m 0755 "${S}/$f" "${D}/${bindir}"
+       done
 }
 
 SRC_URI[md5sum] = "2d977dcee29c8b93d04cd818410be293"
 SRC_URI[sha256sum] = "549c6aa1f480d072e2f37ce3f6a767c24a9b8be24a533f1340e491a3f71f7453"
+
index bfed01f..4c028ea 100644 (file)
@@ -17,7 +17,6 @@ VUPLUS_FEATURES += "autoshutdown"
 VUPLUS_FEATURES += "transcoding"
 VUPLUS_FEATURES += "webmanual"
 VUPLUS_FEATURES += "audioeffect"
-VUPLUS_FEATURES += "wol"
 
 IMAGE_UNPACK_PATH = "vuplus/solose"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
index 4434894..08223ac 100644 (file)
@@ -1,15 +1,15 @@
-PR .= "-splash2"
+PR .= "-splash3"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-# TODO_NEW
-SRC_URI_append = " file://vmlinuz-initrd-7241b0 file://splash_cfe_auto.bin"
+SRCDATE = "20140728"
+SRC_URI_append = " http://archive.vuplus.com/download/kernel/vmlinuz-initrd_${MACHINE}_${SRCDATE}.tar.gz file://splash_cfe_auto.bin"
 
 do_install_append() {
        install -m 0755 ${S}/vmlinuz-initrd-7241b0 ${D}/boot/initrd_cfe_auto.bin
         install -m 0755 ${S}/splash_cfe_auto.bin ${D}/boot/splash_cfe_auto.bin
 }
 
-#SRC_URI[md5sum] = "3b45489e7902cbf98e9abdddea14567a"
-#SRC_URI[sha256sum] = "e7a7e747dcd7240c5d36c2235d11b2d0e703ed55be1120d6109220478d23fb09"
+SRC_URI[md5sum] = "908f5bd70cb3d6be3b002393fc7e797a"
+SRC_URI[sha256sum] = "cf0d93b11468636c3a1d3f6a3beea50f6027a59aabf0f73109367755bcd00add"
 
diff --git a/meta-bsp/vusolose/recipes/vuplus/vuplus-bootlogo/vmlinuz-initrd-7241b0 b/meta-bsp/vusolose/recipes/vuplus/vuplus-bootlogo/vmlinuz-initrd-7241b0
deleted file mode 100644 (file)
index 9a9dedb..0000000
Binary files a/meta-bsp/vusolose/recipes/vuplus/vuplus-bootlogo/vmlinuz-initrd-7241b0 and /dev/null differ
diff --git a/meta-bsp/vuultimo/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm.patch b/meta-bsp/vuultimo/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm.patch
new file mode 100644 (file)
index 0000000..cbfc4b7
--- /dev/null
@@ -0,0 +1,55 @@
+diff --git a/drivers/ata/sata_brcmstb.c b/drivers/ata/sata_brcmstb.c
+index 7ba20e0..1e2e947 100644
+--- a/drivers/ata/sata_brcmstb.c
++++ b/drivers/ata/sata_brcmstb.c
+@@ -330,6 +330,22 @@ static void brcm_EnableOOBWindowFix(void __iomem *mmio_base, int port)
+       mdio_write_reg(mmio_base, port, 0x0D, sval);
+ }
++static void brcm_Enable256AlignDetection(void __iomem *mmio_base, int port)
++{
++        uint32_t tmp32;
++        void __iomem *port_mmio;
++
++        port_mmio = PORT_BASE(mmio_base, port);
++
++        tmp32 = readl(port_mmio + K2_SATA_SICR1_OFFSET);
++        tmp32 |= 0x08000000;
++        writel(tmp32, port_mmio + K2_SATA_SICR1_OFFSET);
++
++        tmp32 = readl(port_mmio + K2_SATA_SICR2_OFFSET);
++        tmp32 |= 0x00800000;
++        writel(tmp32, port_mmio + K2_SATA_SICR2_OFFSET);
++}
++
+ static void brcm_AnalogReset(void __iomem *mmio_base, int port)
+ {
+       /* do analog reset */
+@@ -385,6 +401,8 @@ static void brcm_InitSata_1_5Gb(void __iomem *mmio_base, int port)
+       brcm_SetPllTxRxCtrl(mmio_base, port);
+       brcm_EnableOOBWindowFix(mmio_base, port);
++      brcm_Enable256AlignDetection(mmio_base, port);
++
+       if (!port) {
+ #ifdef CONFIG_BRCM_SATA_75MHZ_PLL
+               /* use 75Mhz PLL clock */
+@@ -446,6 +464,8 @@ static void brcm_InitSata2_3Gb(void __iomem *mmio_base, int port)
+       brcm_SetPllTxRxCtrl(mmio_base, port);
+       brcm_EnableOOBWindowFix(mmio_base, port);
++      brcm_Enable256AlignDetection(mmio_base, port);
++
+       if (!port) {
+ #ifdef CONFIG_BRCM_SATA_75MHZ_PLL
+               /* use 75Mhz PLL clock */
+@@ -1135,7 +1155,9 @@ static int k2_sata_resume(struct device *dev)
+               ap = host->ports[i];
+               ata_for_each_link(link, ap, EDGE) {
++                      spin_unlock_irqrestore(&hp->lock, flags);
+                       sata_std_hardreset(link, NULL, 1000);
++                      spin_lock_irqsave(&hp->lock, flags);
+               }
+       }
index b531b5b..a8ca9f0 100644 (file)
@@ -1,9 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PR .= "-bsp1"
+PR .= "-bsp2"
 
 SRC_URI += "\
-        file://vu_ultimo_fixed_mtd.patch;patch=1;pnum=1 \
+        file://vu_ultimo_fixed_mtd.patch \
+        file://linux-sata_bcm.patch \
         "       
 
 
diff --git a/meta-bsp/vuuno/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm.patch b/meta-bsp/vuuno/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm.patch
new file mode 100644 (file)
index 0000000..cbfc4b7
--- /dev/null
@@ -0,0 +1,55 @@
+diff --git a/drivers/ata/sata_brcmstb.c b/drivers/ata/sata_brcmstb.c
+index 7ba20e0..1e2e947 100644
+--- a/drivers/ata/sata_brcmstb.c
++++ b/drivers/ata/sata_brcmstb.c
+@@ -330,6 +330,22 @@ static void brcm_EnableOOBWindowFix(void __iomem *mmio_base, int port)
+       mdio_write_reg(mmio_base, port, 0x0D, sval);
+ }
++static void brcm_Enable256AlignDetection(void __iomem *mmio_base, int port)
++{
++        uint32_t tmp32;
++        void __iomem *port_mmio;
++
++        port_mmio = PORT_BASE(mmio_base, port);
++
++        tmp32 = readl(port_mmio + K2_SATA_SICR1_OFFSET);
++        tmp32 |= 0x08000000;
++        writel(tmp32, port_mmio + K2_SATA_SICR1_OFFSET);
++
++        tmp32 = readl(port_mmio + K2_SATA_SICR2_OFFSET);
++        tmp32 |= 0x00800000;
++        writel(tmp32, port_mmio + K2_SATA_SICR2_OFFSET);
++}
++
+ static void brcm_AnalogReset(void __iomem *mmio_base, int port)
+ {
+       /* do analog reset */
+@@ -385,6 +401,8 @@ static void brcm_InitSata_1_5Gb(void __iomem *mmio_base, int port)
+       brcm_SetPllTxRxCtrl(mmio_base, port);
+       brcm_EnableOOBWindowFix(mmio_base, port);
++      brcm_Enable256AlignDetection(mmio_base, port);
++
+       if (!port) {
+ #ifdef CONFIG_BRCM_SATA_75MHZ_PLL
+               /* use 75Mhz PLL clock */
+@@ -446,6 +464,8 @@ static void brcm_InitSata2_3Gb(void __iomem *mmio_base, int port)
+       brcm_SetPllTxRxCtrl(mmio_base, port);
+       brcm_EnableOOBWindowFix(mmio_base, port);
++      brcm_Enable256AlignDetection(mmio_base, port);
++
+       if (!port) {
+ #ifdef CONFIG_BRCM_SATA_75MHZ_PLL
+               /* use 75Mhz PLL clock */
+@@ -1135,7 +1155,9 @@ static int k2_sata_resume(struct device *dev)
+               ap = host->ports[i];
+               ata_for_each_link(link, ap, EDGE) {
++                      spin_unlock_irqrestore(&hp->lock, flags);
+                       sata_std_hardreset(link, NULL, 1000);
++                      spin_lock_irqsave(&hp->lock, flags);
+               }
+       }
index bc27547..f4253c8 100644 (file)
@@ -1,6 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PR .= "-bsp1"
+PR .= "-bsp2"
 
 SRC_URI += "\
+       file://linux-sata_bcm.patch \
 "
index b364ec6..c35ccc7 100644 (file)
@@ -88,7 +88,7 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
 PN = "enigma2"
-PR = "r80"
+PR = "r82"
 
 inherit gitpkgv pythonnative
 
index 42766a5..54a9610 100644 (file)
@@ -5,7 +5,7 @@ LICENSE = "CLOSED"
 DEPENDS = "mpfr gmp"
 RDEPENDS_${PN} = "sysfsutils vuplus-dvb-modules"
 
-SRC_DATE = "20140721_0"
+SRC_DATE = "20140725_0"
 
 PR = "r1_${SRC_DATE}"
 SRC_URI = ""
@@ -74,6 +74,6 @@ PACKAGES = "${PN}"
 
 FILES_${PN} = "/"
 
-SRC_URI[md5sum] = "a47c373ab7f132c388bc3f74891fc80a"
-SRC_URI[sha256sum] = "81a6285dde9809a9d6c4b4dfd67bd4b09b54d01ba24fc82688509c3bda595b33"
+SRC_URI[md5sum] = "1ba7691c826856431c0dba1d4251f32e"
+SRC_URI[sha256sum] = "0bc932152a3eda86c3e871a87ea58e0a8693aa707b93c8cf174c29663ec00d5c"
 
index e0b9538..20caccc 100644 (file)
@@ -2,7 +2,7 @@ SUMMARY = "Enigma2 set of packages for Vuplus"
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r1"
+PR = "r2"
 
 inherit packagegroup