Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6080
-gerrit
commit 7dffad43b8acd20228c2a572a83b02e2464e687f
Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Date: Fri Jun 20 21:49:39 2014 +1000
device/{cardbus,agp}.h: Missing header for device_t type.
Missing header for the ramstage version of device_t which is a struct
ptr.
Change-Id: Ie2a30b75ee1d0513397276b81e8df1d995707f6f
Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
---
src/include/device/agp.h | 6 ++++--
src/include/device/cardbus.h | 5 ++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/include/device/agp.h b/src/include/device/agp.h
index 564b0bb..be2b833 100644
--- a/src/include/device/agp.h
+++ b/src/include/device/agp.h
@@ -1,6 +1,9 @@
+/* (c) 2005 Linux Networx GPL see COPYING for details */
+
#ifndef DEVICE_AGP_H
#define DEVICE_AGP_H
-/* (c) 2005 Linux Networx GPL see COPYING for details */
+
+#include <device/device.h>
unsigned int agp_scan_bus(struct bus *bus,
unsigned min_devfn, unsigned max_devfn, unsigned int max);
@@ -8,5 +11,4 @@ unsigned int agp_scan_bridge(device_t dev, unsigned int max);
extern struct device_operations default_agp_ops_bus;
-
#endif /* DEVICE_AGP_H */
diff --git a/src/include/device/cardbus.h b/src/include/device/cardbus.h
index c48a19b..45ae24f 100644
--- a/src/include/device/cardbus.h
+++ b/src/include/device/cardbus.h
@@ -1,6 +1,9 @@
+/* (c) 2005 Linux Networx GPL see COPYING for details */
+
#ifndef DEVICE_CARDBUS_H
#define DEVICE_CARDBUS_H
-/* (c) 2005 Linux Networx GPL see COPYING for details */
+
+#include <device/device.h>
void cardbus_read_resources(device_t dev);
void cardbus_enable_resources(device_t dev);
Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6080
-gerrit
commit f8d8c62fc1acd8bb51c0632e870c60377586c108
Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Date: Fri Jun 20 21:49:39 2014 +1000
device/cardbus.h: Missing header for device_t type.
Missing header for the ramstage version of device_t which is a struct
ptr.
Change-Id: Ie2a30b75ee1d0513397276b81e8df1d995707f6f
Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
---
src/include/device/cardbus.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/include/device/cardbus.h b/src/include/device/cardbus.h
index c48a19b..45ae24f 100644
--- a/src/include/device/cardbus.h
+++ b/src/include/device/cardbus.h
@@ -1,6 +1,9 @@
+/* (c) 2005 Linux Networx GPL see COPYING for details */
+
#ifndef DEVICE_CARDBUS_H
#define DEVICE_CARDBUS_H
-/* (c) 2005 Linux Networx GPL see COPYING for details */
+
+#include <device/device.h>
void cardbus_read_resources(device_t dev);
void cardbus_enable_resources(device_t dev);
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 b9f4b72c1462da0887e848270e18d2c350c2c3f2
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 | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/drivers/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c
index 6f8a4eb..c54f6ce 100644
--- a/src/drivers/pc80/mc146818rtc.c
+++ b/src/drivers/pc80/mc146818rtc.c
@@ -8,10 +8,7 @@
#include "option_table.h"
#include <cbfs.h>
#endif
-#if CONFIG_HAVE_ACPI_RESUME
#include <arch/acpi.h>
-#endif
-
static void rtc_update_cmos_date(u8 has_century)
{
@@ -72,16 +69,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");