[coreboot] New patch to review for coreboot: e11cec9 Let lib_get_sysinfo() pass through the success of get_coreboot_info()
Philip Prindeville (pprindeville@gmail.com)
gerrit at coreboot.org
Sat Dec 24 02:34:48 CET 2011
Philip Prindeville (pprindeville at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/503
-gerrit
commit e11cec94e22b2a6c4086656006a0667ec648e0d5
Author: Philip Prindeville <philipp at redfish-solutions.com>
Date: Fri Dec 23 18:33:05 2011 -0700
Let lib_get_sysinfo() pass through the success of get_coreboot_info()
The return status of get_coreboot_info() might be handy to a platform
driver calling lib_get_sysinfo() to test for the presence of coreboot.
Change-Id: I0176c93ee92c9dff733112026ee50f2ca797bdff
Signed-off-by: Philip Prindeville <philipp at redfish-solutions.com>
---
payloads/libpayload/arch/i386/sysinfo.c | 8 ++++++--
payloads/libpayload/arch/powerpc/sysinfo.c | 8 ++++++--
payloads/libpayload/include/libpayload.h | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/payloads/libpayload/arch/i386/sysinfo.c b/payloads/libpayload/arch/i386/sysinfo.c
index 599a811..6c1ef3f 100644
--- a/payloads/libpayload/arch/i386/sysinfo.c
+++ b/payloads/libpayload/arch/i386/sysinfo.c
@@ -45,8 +45,10 @@ struct sysinfo_t lib_sysinfo = {
#endif
};
-void lib_get_sysinfo(void)
+int lib_get_sysinfo(void)
{
+ int ret;
+
/* Get the CPU speed (for delays). */
lib_sysinfo.cpu_khz = get_cpu_speed();
@@ -59,7 +61,7 @@ void lib_get_sysinfo(void)
/* Get information from the coreboot tables,
* if they exist */
- get_coreboot_info(&lib_sysinfo);
+ ret = get_coreboot_info(&lib_sysinfo);
if (!lib_sysinfo.n_memranges) {
/* If we can't get a good memory range, use the default. */
@@ -73,4 +75,6 @@ void lib_get_sysinfo(void)
lib_sysinfo.memrange[1].size = 31 * 1024 * 1024;
lib_sysinfo.memrange[1].type = CB_MEM_RAM;
}
+
+ return ret;
}
diff --git a/payloads/libpayload/arch/powerpc/sysinfo.c b/payloads/libpayload/arch/powerpc/sysinfo.c
index 599a811..6c1ef3f 100644
--- a/payloads/libpayload/arch/powerpc/sysinfo.c
+++ b/payloads/libpayload/arch/powerpc/sysinfo.c
@@ -45,8 +45,10 @@ struct sysinfo_t lib_sysinfo = {
#endif
};
-void lib_get_sysinfo(void)
+int lib_get_sysinfo(void)
{
+ int ret;
+
/* Get the CPU speed (for delays). */
lib_sysinfo.cpu_khz = get_cpu_speed();
@@ -59,7 +61,7 @@ void lib_get_sysinfo(void)
/* Get information from the coreboot tables,
* if they exist */
- get_coreboot_info(&lib_sysinfo);
+ ret = get_coreboot_info(&lib_sysinfo);
if (!lib_sysinfo.n_memranges) {
/* If we can't get a good memory range, use the default. */
@@ -73,4 +75,6 @@ void lib_get_sysinfo(void)
lib_sysinfo.memrange[1].size = 31 * 1024 * 1024;
lib_sysinfo.memrange[1].type = CB_MEM_RAM;
}
+
+ return ret;
}
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 8c8abc4..d9f7d21 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -369,7 +369,7 @@ int sysinfo_have_multiboot(unsigned long *addr);
int get_coreboot_info(struct sysinfo_t *info);
int get_multiboot_info(struct sysinfo_t *info);
-void lib_get_sysinfo(void);
+int lib_get_sysinfo(void);
/* Timer functions - defined by each architecture. */
unsigned int get_cpu_speed(void);
More information about the coreboot
mailing list