Stub out FILE*, stdout/stdin/stderr and implement fprintf on these

[coreboot.git] / payloads / coreinfo / coreinfo.c

diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c
index b9da49efd039eeaa0d72b664d3857b0ccb40326f..846cf77c1852aca008fbc69024b7b2eac8a3369a 100644 (file)
--- a/payloads/coreinfo/coreinfo.c
+++ b/payloads/coreinfo/coreinfo.c
@@ -27,10 +27,12 @@
 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;
 extern struct coreinfo_module lar_module;
+extern struct coreinfo_module cbfs_module;
 
 struct coreinfo_module *system_modules[] = {
 #ifdef CONFIG_MODULE_CPUINFO
@@ -47,15 +49,21 @@ 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
 #ifdef CONFIG_MODULE_LAR
-       &lar_module
+       &lar_module,
+#endif
+#ifdef CONFIG_MODULE_CBFS
+       &cbfs_module,
 #endif
 };
 
@@ -71,9 +79,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),
        }
 };
 
@@ -276,13 +284,7 @@ int main(void)
        wattrset(modwin, COLOR_PAIR(2));
        wattrset(menuwin, COLOR_PAIR(1) | A_BOLD);
 
-       for (i = 0; i < SCREEN_Y - 1; i++) {
-               wmove(modwin, i - 1, 0);
-               for (j = 0; j < SCREEN_X; j++)
-                       waddch(modwin, ' ');
-       }
-
-       wrefresh(modwin);
+       werase(modwin);
 
        for (i = 0; i < ARRAY_SIZE(categories); i++) {
                for (j = 0; j < categories[i].count; j++)