summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2008-08-05 14:36:20 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2008-08-05 14:36:20 +0000
commita70872cfde84863637dba1fb00498dc8a61dba48 (patch)
tree38d5deedb9f4a9cbd378e737ef8e57d1de13fa11
parent754edf712cc5ee4a8014dc115ee18bb9126cbb64 (diff)
Move out some hardcoded strings in coreinfo to become Kconfig variables.
This is useful for use with (e.g.) Bayou in order let the user customize the payload name, description, version, etc. For instance, instead of using stock coreinfo and calling the payload "coreinfo" and the Bayou menu item "Show system information" a user might only be interested in an NVRAM dump payload. Thus, he/she can enable only the NVRAM coreinfo module via Kconfig, and tell Kconfig to call the payload "NVRAMdumper" and the Bayou menu item "Show NVRAM contents". This is build-tested, and tested against Bayou in QEMU. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Jordan Crouse <jordan.crouse@amd.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3472 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--payloads/coreinfo/Kconfig24
-rw-r--r--payloads/coreinfo/coreinfo.c8
2 files changed, 28 insertions, 4 deletions
diff --git a/payloads/coreinfo/Kconfig b/payloads/coreinfo/Kconfig
index 4281c66829..0cca33c016 100644
--- a/payloads/coreinfo/Kconfig
+++ b/payloads/coreinfo/Kconfig
@@ -36,6 +36,30 @@ config SHOW_DATE_TIME
This option will increase the ELF file size by ca. 256 bytes.
+config PAYLOAD_INFO_NAME
+ string "Payload name"
+ default "coreinfo"
+ help
+ The name of this payload for use in (e.g.) Bayou.
+
+config PAYLOAD_INFO_LISTNAME
+ string "Payload menu entry name"
+ default "System Information"
+ help
+ The name of this payload's menu entry for use in (e.g.) Bayou.
+
+config PAYLOAD_INFO_DESC
+ string "Payload description"
+ default "Display information about the system"
+ help
+ The description of this payload for use in (e.g.) Bayou.
+
+config PAYLOAD_INFO_VERSION
+ string "Payload version"
+ default "0.1"
+ help
+ The version number of this payload.
+
endmenu
menu "Modules"
diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c
index 0c5136c80e..d158b29f8e 100644
--- a/payloads/coreinfo/coreinfo.c
+++ b/payloads/coreinfo/coreinfo.c
@@ -221,7 +221,7 @@ static void loop(void)
{
int key;
- center(0, "coreinfo v0.1");
+ center(0, CONFIG_PAYLOAD_INFO_NAME " " CONFIG_PAYLOAD_INFO_VERSION);
refresh();
print_menu();
@@ -301,6 +301,6 @@ int main(void)
return 0;
}
-PAYLOAD_INFO(name, "coreinfo");
-PAYLOAD_INFO(listname, "System Information");
-PAYLOAD_INFO(desc, "Display information about the system");
+PAYLOAD_INFO(name, CONFIG_PAYLOAD_INFO_NAME);
+PAYLOAD_INFO(listname, CONFIG_PAYLOAD_INFO_LISTNAME);
+PAYLOAD_INFO(desc, CONFIG_PAYLOAD_INFO_DESC);