From b986f4f1ee4881c4c1d81738cf9f0366381f7066 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 14 Aug 2013 16:12:31 +0200 Subject: remove remaining references of CONFIG_BOARDINFO With this all code uses barebox_get_model() and no longer a compile time generated string. Also this renames barebox_boardinfo() to barebox_get_model() since we are going to add the corresponding _set_ function and 'model' corresponds to the devicetree notion. Signed-off-by: Sascha Hauer --- common/Kconfig | 2 +- common/misc.c | 20 ++++++++++---------- common/version.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'common') diff --git a/common/Kconfig b/common/Kconfig index 6322d9dcdb..dd705782ab 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -353,7 +353,7 @@ config HUSH_FANCY_PROMPT prompt "allow fancy hush prompts" help Allow to set PS1 from the command line. PS1 can have several escaped commands - like \h for CONFIG_BOARDINFO or \w for the current working directory. + like \h for the 'model' string or \w for the current working directory. config HUSH_GETOPT bool diff --git a/common/misc.c b/common/misc.c index 806649431d..14c33048a9 100644 --- a/common/misc.c +++ b/common/misc.c @@ -126,19 +126,19 @@ EXPORT_SYMBOL(perror); void (*do_execute)(void *func, int argc, char *argv[]); EXPORT_SYMBOL(do_execute); -static const char *boardinfo; +static const char *model; -const char *barebox_boardinfo(void) +const char *barebox_get_model(void) { - if (boardinfo) - return boardinfo; + if (model) + return model; - boardinfo = of_get_model(); - if (boardinfo) - boardinfo = xstrdup(boardinfo); + model = of_get_model(); + if (model) + model = xstrdup(model); else - boardinfo = CONFIG_BOARDINFO; + model = CONFIG_BOARDINFO; - return boardinfo; + return model; } -EXPORT_SYMBOL(barebox_boardinfo); +EXPORT_SYMBOL(barebox_get_model); diff --git a/common/version.c b/common/version.c index e21dbbedfa..79b2a54b97 100644 --- a/common/version.c +++ b/common/version.c @@ -9,5 +9,5 @@ EXPORT_SYMBOL(version_string); void barebox_banner (void) { pr_info("\n\n%s\n\n", version_string); - pr_info("Board: %s\n", barebox_boardinfo()); + pr_info("Board: %s\n", barebox_get_model()); } -- cgit v1.2.3