Fix WOL problem in duo2

diff --git a/meta-bsp/vuduo2/recipes/linux/linux-vuplus-3.13.5/brcm_s3_wol.patch b/meta-bsp/vuduo2/recipes/linux/linux-vuplus-3.13.5/brcm_s3_wol.patch
index 1eca800..57baaef 100644 (file)
--- a/meta-bsp/vuduo2/recipes/linux/linux-vuplus-3.13.5/brcm_s3_wol.patch
+++ b/meta-bsp/vuduo2/recipes/linux/linux-vuplus-3.13.5/brcm_s3_wol.patch
@@ -37,14 +37,14 @@ index c23156a..9ae22a9 100644
  
        device_set_wakeup_enable(&dev->dev, wol->wolopts);
        pDevCtrl->wolopts = wol->wolopts;
  
        device_set_wakeup_enable(&dev->dev, wol->wolopts);
        pDevCtrl->wolopts = wol->wolopts;

-diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
-index 62ee437..ffd0bb5 100644
---- a/kernel/power/suspend.c
-+++ b/kernel/power/suspend.c
-@@ -167,6 +167,15 @@ void __attribute__ ((weak)) arch_suspend_enable_irqs(void)
-       local_irq_enable();
+diff --git a/drivers/brcmstb/setup.c b/drivers/brcmstb/setup.c
+index 21a6e42..954b902 100644
+--- a/drivers/brcmstb/setup.c
++++ b/drivers/brcmstb/setup.c
+@@ -932,6 +932,15 @@ void brcm_machine_restart(const char *command)
+                ;

  }
  }

- 
+

 +void (*brcm_s3_cb)(void);
 +
 +
 +void (*brcm_s3_cb)(void);
 +
 +


@@ -54,14 +54,15 @@ index 62ee437..ffd0bb5 100644
 +}
 +EXPORT_SYMBOL(register_brcm_s3_cb);
 +
 +}
 +EXPORT_SYMBOL(register_brcm_s3_cb);
 +

- /**
-  * suspend_enter - Make the system enter the given sleep state.
-  * @state: System sleep state to enter.
-@@ -211,6 +220,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
-       }
- 
-       ftrace_stop();
-+      if(brcm_s3_cb) brcm_s3_cb();
-       error = disable_nonboot_cpus();
-       if (error || suspend_test(TEST_CPUS))
-               goto Enable_cpus;
+ void brcm_machine_halt(void)
+ {
+ #ifdef CONFIG_BRCM_IRW_HALT
+@@ -939,6 +948,7 @@ void brcm_machine_halt(void)
+        BDEV_WR_F_RB(SUN_TOP_CTRL_GENERAL_CTRL_1, irw_top_sw_pwroff, 0);
+        BDEV_WR_F_RB(SUN_TOP_CTRL_GENERAL_CTRL_1, irw_top_sw_pwroff, 1);
+ #endif
++       if(brcm_s3_cb) brcm_s3_cb();
+ #ifdef CONFIG_BRCM_HAS_AON
+        /* may be S3 cold boot */
+        brcm_pm_s3_cold_boot();
+

diff --git a/meta-bsp/vuduo2/recipes/linux/linux-vuplus_3.13.5.bbappend b/meta-bsp/vuduo2/recipes/linux/linux-vuplus_3.13.5.bbappend
index 233ccff..1a1a2ca 100644 (file)
--- a/meta-bsp/vuduo2/recipes/linux/linux-vuplus_3.13.5.bbappend
+++ b/meta-bsp/vuduo2/recipes/linux/linux-vuplus_3.13.5.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 

-PR .= "-bsp1"
+PR .= "-bsp2"

 
 SRC_URI += " \
         file://brcm_s3_wol.patch;patch=1;pnum=1 \
 
 SRC_URI += " \
         file://brcm_s3_wol.patch;patch=1;pnum=1 \

diff --git a/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb b/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
index 7e926b0..ff40cde 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
+++ b/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
@@ -4,7 +4,7 @@ LICENSE = "CLOSED"
 
 
 PV = "1.0"
 
 
 PV = "1.0"

-PR = "r2"
+PR = "r3"

 SRC_REV = ""
 
 SRC_URI = "file://coldboot \
 SRC_REV = ""
 
 SRC_URI = "file://coldboot \


@@ -20,6 +20,6 @@ do_install() {
        install -m 0755 ${WORKDIR}/coldboot.sh ${D}/etc/init.d/coldboot.sh
        install -m 0755 ${WORKDIR}/ethwol.sh ${D}/etc/init.d/ethwol.sh
        install -m 0755 ${WORKDIR}/coldboot ${D}/usr/bin/coldboot
        install -m 0755 ${WORKDIR}/coldboot.sh ${D}/etc/init.d/coldboot.sh
        install -m 0755 ${WORKDIR}/ethwol.sh ${D}/etc/init.d/ethwol.sh
        install -m 0755 ${WORKDIR}/coldboot ${D}/usr/bin/coldboot

-        ln -sf   ../init.d/coldboot.sh ${D}${sysconfdir}/rc0.d/S30coldboot.sh
+        ln -sf   ../init.d/coldboot.sh ${D}${sysconfdir}/rc0.d/S50coldboot.sh

         ln -sf   ../init.d/ethwol.sh ${D}${sysconfdir}/rc0.d/K32ethwol.sh
 }
         ln -sf   ../init.d/ethwol.sh ${D}${sysconfdir}/rc0.d/K32ethwol.sh
 }

diff --git a/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot/coldboot b/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot/coldboot
index 0e35588..6c21623 100755 (executable)
Binary files a/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot/coldboot and b/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot/coldboot differ