Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6074
-gerrit
commit d2e00f5b738499946a89db83f0b42ce3cb238e48
Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Date: Fri Jun 20 05:38:07 2014 +0300
PC80 RTC: Use acpi_is_wakeup_s3()
Change-Id: Idc4c47f3802019c2853ec71f8e9c057c3ab8d3ee
Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
---
src/drivers/pc80/mc146818rtc.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/drivers/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c
index 6f8a4eb..73e82ff 100644
--- a/src/drivers/pc80/mc146818rtc.c
+++ b/src/drivers/pc80/mc146818rtc.c
@@ -72,16 +72,14 @@ void rtc_init(int invalid)
#endif
#ifndef __PRE_RAM__
-#if CONFIG_HAVE_ACPI_RESUME
/*
* Avoid clearing pending interrupts and resetting the RTC control
* register in the resume path because the Linux kernel relies on
* this to know if it should restart the RTC timer queue if the wake
* was due to the RTC alarm.
*/
- if (acpi_slp_type == 3)
+ if (acpi_is_wakeup_s3())
return;
-#endif /* CONFIG_HAVE_ACPI_RESUME */
#endif /* __PRE_RAM__ */
printk(BIOS_DEBUG, "RTC Init\n");
the following patch was just integrated into master:
commit 8fac0b3e904138f0642d7ab29c5867002aebf686
Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Date: Tue Jun 17 18:53:36 2014 +1000
src/lib/clog2.c: Fix style and clarity, remove some cruft
Change-Id: I6b37cf945db12d2cf8096c9f49fff9e0bec139d6
Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6058
Tested-by: build bot (Jenkins)
Reviewed-by: Idwer Vollering <vidwer(a)gmail.com>
See http://review.coreboot.org/6058 for details.
-gerrit
the following patch was just integrated into master:
commit 669cb2f0c4af8f01ac1d83d854258287077bbe95
Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Date: Tue Jun 17 15:09:51 2014 +1000
drivers/intel/gma: Equality comparison with extraneous parentheses
Spotted by Clang.
Change-Id: I3e612c0fa050a09fa7e5b1cb643935b84eb2b957
Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6053
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-by: Idwer Vollering <vidwer(a)gmail.com>
See http://review.coreboot.org/6053 for details.
-gerrit