aboutsummaryrefslogtreecommitdiff
path: root/payloads/coreinfo/coreinfo.c
diff options
context:
space:
mode:
authorJordan Crouse <jordan@cosmicpenguin.net>2008-11-11 19:53:42 +0000
committerJordan Crouse <jordan.crouse@amd.com>2008-11-11 19:53:42 +0000
commit5cb4d9d663d2ed5b8225dbbb00507637016d3fc4 (patch)
tree4407169053b81a93b5255d6c3d2a97c81f01402d /payloads/coreinfo/coreinfo.c
parent6c6e4333c4ef8a86e70e14fcff57a5747339b165 (diff)
[PATCH] coreinfo: Add multiboot parsing support
Rename the "coreboot" menu "firmware", and add a module to parse the multiboot table. For now, just parse memory, but it can be expanded as needed. Signed-off-by: Jordan Crouse <jordan@cosmicpenguin.net> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3744 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'payloads/coreinfo/coreinfo.c')
-rw-r--r--payloads/coreinfo/coreinfo.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c
index 3d8f42b99a..befe988c2d 100644
--- a/payloads/coreinfo/coreinfo.c
+++ b/payloads/coreinfo/coreinfo.c
@@ -27,6 +27,7 @@
extern struct coreinfo_module cpuinfo_module;
extern struct coreinfo_module pci_module;
extern struct coreinfo_module coreboot_module;
+extern struct coreinfo_module multiboot_module;
extern struct coreinfo_module nvram_module;
extern struct coreinfo_module bootlog_module;
extern struct coreinfo_module ramdump_module;
@@ -47,10 +48,13 @@ struct coreinfo_module *system_modules[] = {
#endif
};
-struct coreinfo_module *coreboot_modules[] = {
+struct coreinfo_module *firmware_modules[] = {
#ifdef CONFIG_MODULE_COREBOOT
&coreboot_module,
#endif
+#ifdef CONFIG_MODULE_MULTIBOOT
+ &multiboot_module,
+#endif
#ifdef CONFIG_MODULE_BOOTLOG
&bootlog_module,
#endif
@@ -71,9 +75,9 @@ struct coreinfo_cat {
.count = ARRAY_SIZE(system_modules),
},
{
- .name = "Coreboot",
- .modules = coreboot_modules,
- .count = ARRAY_SIZE(coreboot_modules),
+ .name = "Firmware",
+ .modules = firmware_modules,
+ .count = ARRAY_SIZE(firmware_modules),
}
};