Author: uwe Date: 2008-03-31 22:30:18 +0200 (Mon, 31 Mar 2008) New Revision: 3203
Added: trunk/payloads/coreinfo/nvram_module.c Modified: trunk/payloads/coreinfo/Kconfig trunk/payloads/coreinfo/Makefile trunk/payloads/coreinfo/coreboot_module.c trunk/payloads/coreinfo/coreinfo.c trunk/payloads/coreinfo/coreinfo.h trunk/payloads/coreinfo/cpuinfo_module.c trunk/payloads/coreinfo/pci_module.c Log: Add support for an "NVRAM Dump" screen in coreinfo (optional), as well as for displaying the current date/time in the lower-right corner (optional).
Also, only build/use coreinfo modules which were selected in kconfig. This makes coreinfo truly modular, and you can save quite a bit of ROM space by disabling unwanted parts of coreinfo.
Finally, simplify the Makefile a bit by getting rid of MODULES (and only using OBJECTS).
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Jordan Crouse jordan.crouse@amd.com
Modified: trunk/payloads/coreinfo/Kconfig =================================================================== --- trunk/payloads/coreinfo/Kconfig 2008-03-31 20:21:49 UTC (rev 3202) +++ trunk/payloads/coreinfo/Kconfig 2008-03-31 20:30:18 UTC (rev 3203) @@ -24,10 +24,20 @@
mainmenu "coreinfo Configuration"
+menu "General settings" + +# TODO: Needs changes in coreinfo, won't update without keypress currently. +config SHOW_DATE_TIME + bool "Show current date/time in the menu" + default y + help + Show the current date and time in the lower-right corner of + the coreinfo menu. + +endmenu + menu "Modules"
-# TODO: Currently none of these options has any effect. - config MODULE_COREBOOT bool "Enable the coreboot module" default y @@ -40,5 +50,9 @@ bool "Enable the PCI info module" default y
+config MODULE_NVRAM + bool "Enable the NVRAM dump module" + default y + endmenu
Modified: trunk/payloads/coreinfo/Makefile =================================================================== --- trunk/payloads/coreinfo/Makefile 2008-03-31 20:21:49 UTC (rev 3202) +++ trunk/payloads/coreinfo/Makefile 2008-03-31 20:30:18 UTC (rev 3203) @@ -46,15 +46,15 @@
CC = gcc CROSS_CFLAGS = -m32 -INCLUDES = -I../libpayload/include \ +INCLUDES = -I../libpayload/include -Ibuild \ -I$(shell $(CC) $(CROSS_CFLAGS) -print-search-dirs | \ head -n 1 | cut -d' ' -f2)include LIBPAYLOAD = ../libpayload/libpayload.a LIBGCC := $(shell $(CC) $(CROSS_CFLAGS) -print-libgcc-file-name) CFLAGS := -Wall -Werror -Os -fno-stack-protector -nostdinc $(INCLUDES) -MODULES = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o -OBJECTS = coreinfo.o -OBJS = $(patsubst %,$(obj)/%,$(OBJECTS)) $(patsubst %,$(obj)/%,$(MODULES)) +OBJECTS = cpuinfo_module.o cpuid.S.o pci_module.o coreboot_module.o \ + nvram_module.o coreinfo.o +OBJS = $(patsubst %,$(obj)/%,$(OBJECTS)) TARGET = $(obj)/coreinfo.elf
ifeq ($(strip $(HAVE_DOTCONFIG)),)
Modified: trunk/payloads/coreinfo/coreboot_module.c =================================================================== --- trunk/payloads/coreinfo/coreboot_module.c 2008-03-31 20:21:49 UTC (rev 3202) +++ trunk/payloads/coreinfo/coreboot_module.c 2008-03-31 20:30:18 UTC (rev 3203) @@ -20,6 +20,8 @@ #include <coreboot_tables.h> #include "coreinfo.h"
+#ifdef CONFIG_MODULE_COREBOOT + #define MAX_MEMORY_COUNT 5
static struct { @@ -252,3 +254,10 @@ .init = coreboot_module_init, .redraw = coreboot_module_redraw, }; + +#else + +struct coreinfo_module coreboot_module = { +}; + +#endif
Modified: trunk/payloads/coreinfo/coreinfo.c =================================================================== --- trunk/payloads/coreinfo/coreinfo.c 2008-03-31 20:21:49 UTC (rev 3202) +++ trunk/payloads/coreinfo/coreinfo.c 2008-03-31 20:30:18 UTC (rev 3203) @@ -25,11 +25,21 @@ extern struct coreinfo_module cpuinfo_module; extern struct coreinfo_module pci_module; extern struct coreinfo_module coreboot_module; +extern struct coreinfo_module nvram_module;
struct coreinfo_module *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 };
static WINDOW *modwin; @@ -63,6 +73,16 @@ ptr += sprintf(ptr, "F%d: %s ", i + 1, modules[i]->name);
mvprintw(23, 0, menu); + +#ifdef CONFIG_SHOW_DATE_TIME + mvprintw(23, 59, "%02d/%02d/20%02d - %02d:%02d:%02d", + bcd2dec(nvram_read(NVRAM_RTC_MONTH)), + bcd2dec(nvram_read(NVRAM_RTC_DAY)), + bcd2dec(nvram_read(NVRAM_RTC_YEAR)), + bcd2dec(nvram_read(NVRAM_RTC_HOURS)), + bcd2dec(nvram_read(NVRAM_RTC_MINUTES)), + bcd2dec(nvram_read(NVRAM_RTC_SECONDS))); +#endif }
static void center(int row, const char *str)
Modified: trunk/payloads/coreinfo/coreinfo.h =================================================================== --- trunk/payloads/coreinfo/coreinfo.h 2008-03-31 20:21:49 UTC (rev 3202) +++ trunk/payloads/coreinfo/coreinfo.h 2008-03-31 20:30:18 UTC (rev 3203) @@ -21,6 +21,7 @@ #define COREINFO_H_
#include <libpayload.h> +#include <config.h> #include <curses.h>
struct coreinfo_module {
Modified: trunk/payloads/coreinfo/cpuinfo_module.c =================================================================== --- trunk/payloads/coreinfo/cpuinfo_module.c 2008-03-31 20:21:49 UTC (rev 3202) +++ trunk/payloads/coreinfo/cpuinfo_module.c 2008-03-31 20:30:18 UTC (rev 3203) @@ -23,6 +23,8 @@ #include "coreinfo.h" #include <arch/rdtsc.h>
+#ifdef CONFIG_MODULE_CPUINFO + #define VENDOR_INTEL 0x756e6547 #define VENDOR_AMD 0x68747541 #define VENDOR_CYRIX 0x69727943 @@ -267,5 +269,11 @@ .name = "CPU Info", .init = cpuinfo_module_init, .redraw = cpuinfo_module_redraw, - .handle = NULL, }; + +#else + +struct coreinfo_module cpuinfo_module = { +}; + +#endif
Added: trunk/payloads/coreinfo/nvram_module.c =================================================================== --- trunk/payloads/coreinfo/nvram_module.c (rev 0) +++ trunk/payloads/coreinfo/nvram_module.c 2008-03-31 20:30:18 UTC (rev 3203) @@ -0,0 +1,68 @@ +/* + * This file is part of the coreinfo project. + * + * Copyright (C) 2008 Uwe Hermann uwe@hermann-uwe.de + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "coreinfo.h" + +#ifdef CONFIG_MODULE_NVRAM + +/** + * Dump 256 bytes of NVRAM. + */ +static void dump_nvram(WINDOW *win, int row, int col) +{ + int i, x = 0, y = 0; + + for (i = 1; i < 257; i++) { + mvwprintw(win, row + y, col + x, "%02x ", nvram_read(i - 1)); + x += 3; + if (i % 16 == 0) { + y++; /* Start a newline after 16 bytes. */ + x = 0; + } + if (i % 64 == 0) { + y++; /* Add an empty line after 64 bytes. */ + x = 0; + } + } +} + +static int nvram_module_redraw(WINDOW *win) +{ + print_module_title(win, "NVRAM Dump"); + dump_nvram(win, 2, 1); + return 0; +} + +static int nvram_module_init(void) +{ + return 0; +} + +struct coreinfo_module nvram_module = { + .name = "NVRAM", + .init = nvram_module_init, + .redraw = nvram_module_redraw, +}; + +#else + +struct coreinfo_module nvram_module = { +}; + +#endif
Modified: trunk/payloads/coreinfo/pci_module.c =================================================================== --- trunk/payloads/coreinfo/pci_module.c 2008-03-31 20:21:49 UTC (rev 3202) +++ trunk/payloads/coreinfo/pci_module.c 2008-03-31 20:30:18 UTC (rev 3203) @@ -20,6 +20,8 @@ #include <arch/io.h> #include "coreinfo.h"
+#ifdef CONFIG_MODULE_PCI + struct pci_devices { unsigned short device; unsigned int id; @@ -282,3 +284,10 @@ .redraw = pci_module_redraw, .handle = pci_module_handle, }; + +#else + +struct coreinfo_module pci_module = { +}; + +#endif
-
svn＠coreboot.org