On 06/05/08 14:49 -0600, Myles Watson wrote:
I have a number of outstanding patches that need to be ACKed or NAKed. Please review if you have the time:
coreinfo submenu patch: http://www.coreboot.org/pipermail/coreboot/2008-April/033837.html coreinfo: Add "a submenu"
Here's a start for this one.
Thanks, Myles
We were in the risk of running out of space in the option menu at the bottom of the screen - this turns the function keys into "categories" and then list specific items as part of the category.
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Index: coreinfo/coreinfo.c =================================================================== --- coreinfo.orig/coreinfo.c 2008-04-24 18:02:23.000000000 -0600 +++ coreinfo/coreinfo.c 2008-04-25 10:08:02.000000000 -0600 @@ -28,24 +28,46 @@ extern struct coreinfo_module nvram_module; extern struct coreinfo_module bootlog_module;
-struct coreinfo_module *modules[] = { +struct coreinfo_module *system_modules[] = { #ifdef CONFIG_MODULE_CPUINFO &cpuinfo_module, #endif #ifdef CONFIG_MODULE_PCI &pci_module, #endif -#ifdef CONFIG_MODULE_COREBOOT
- &coreboot_module,
-#endif #ifdef CONFIG_MODULE_NVRAM &nvram_module, #endif +};
+struct coreinfo_module *coreboot_modules[] = { +#ifdef CONFIG_MODULE_COREBOOT
- &coreboot_module,
+#endif #ifdef CONFIG_MODULE_BOOTLOG &bootlog_module, #endif };
What happens if I configure it not to have either of these two modules? It hangs for me. Maybe because you took out the check below? Maybe there needs to be a new check for empty categories or an ifdef that gets rid of categories that have no subcategories.
New patch attached that checks for empty categories. Tested on qemu.
Jordan