From 4b9b6ddb9f41356d85d5a056c6b9fafdf8529dc0 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 5 May 2020 14:34:32 +0200 Subject: Use rtems_get_version_string() Update #3970. --- bsps/powerpc/beatnik/start/bspstart.c | 2 +- bsps/powerpc/motorola_powerpc/start/bspstart.c | 2 +- bsps/powerpc/mvme3100/start/bspstart.c | 2 +- bsps/powerpc/mvme5500/start/bspstart.c | 2 +- cpukit/libmisc/shell/shell.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bsps/powerpc/beatnik/start/bspstart.c b/bsps/powerpc/beatnik/start/bspstart.c index 4e0f007d41..520d908930 100644 --- a/bsps/powerpc/beatnik/start/bspstart.c +++ b/bsps/powerpc/beatnik/start/bspstart.c @@ -207,7 +207,7 @@ static void bsp_early( void ) /* Make sure we detect a known host bridge */ BSP_getDiscoveryVersion(/* assert detection */ 1); - printk("Welcome to RTEMS %s\n", _RTEMS_version ); + printk("Welcome to RTEMS %s\n", rtems_get_version_string() ); /* Leave all caches as MotLoad left them. Seems to be fine */ diff --git a/bsps/powerpc/motorola_powerpc/start/bspstart.c b/bsps/powerpc/motorola_powerpc/start/bspstart.c index c28d5d21b5..e74b02c446 100644 --- a/bsps/powerpc/motorola_powerpc/start/bspstart.c +++ b/bsps/powerpc/motorola_powerpc/start/bspstart.c @@ -219,7 +219,7 @@ static void bsp_early( void ) myBoard = getMotorolaBoard(); printk("-----------------------------------------\n"); - printk("Welcome to %s on %s\n", _RTEMS_version, + printk("Welcome to %s on %s\n", rtems_get_version_string(), motorolaBoardToString(myBoard)); printk("-----------------------------------------\n"); #ifdef SHOW_MORE_INIT_SETTINGS diff --git a/bsps/powerpc/mvme3100/start/bspstart.c b/bsps/powerpc/mvme3100/start/bspstart.c index f20a40fed1..0ec215e33b 100644 --- a/bsps/powerpc/mvme3100/start/bspstart.c +++ b/bsps/powerpc/mvme3100/start/bspstart.c @@ -231,7 +231,7 @@ VpdBufRec vpdData [] = { myCpu = get_ppc_cpu_type(); myCpuRevision = get_ppc_cpu_revision(); - printk("Welcome to %s\n", _RTEMS_version); + printk("Welcome to %s\n", rtems_get_version_string()); printk("BSP: %s, CVS Release ($Name$)\n", "mvme3100"); /* diff --git a/bsps/powerpc/mvme5500/start/bspstart.c b/bsps/powerpc/mvme5500/start/bspstart.c index 90fc8cf961..3a9ef69f0f 100644 --- a/bsps/powerpc/mvme5500/start/bspstart.c +++ b/bsps/powerpc/mvme5500/start/bspstart.c @@ -227,7 +227,7 @@ static void bsp_early( void ) * More PCI1 memory mapping to be done after BSP_pgtbl_activate. */ printk("-----------------------------------------\n"); - printk("Welcome to %s on MVME5500-0163\n", _RTEMS_version ); + printk("Welcome to %s on MVME5500-0163\n", rtems_get_version_string() ); printk("-----------------------------------------\n"); BSP_mem_size = probeMemoryEnd(); diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c index f00ae54b49..79c1afcb5a 100644 --- a/cpukit/libmisc/shell/shell.c +++ b/cpukit/libmisc/shell/shell.c @@ -683,7 +683,7 @@ static bool rtems_shell_login(rtems_shell_env_t *env, FILE * in,FILE * out) fprintf(out,"RTEMS"); break; case 'V': - fprintf(out,"%s\n%s",_RTEMS_version, _Copyright_Notice); + fprintf(out,"%s\n%s",rtems_get_version_string(), _Copyright_Notice); break; case '@': fprintf(out,"@"); @@ -735,10 +735,10 @@ static bool rtems_shell_login(rtems_shell_env_t *env, FILE * in,FILE * out) fprintf(out,"(" CPU_NAME "/" CPU_MODEL_NAME ")"); break; case 'r': - fprintf(out,_RTEMS_version); + fprintf(out,rtems_get_version_string()); break; case 'v': - fprintf(out,"%s\n%s",_RTEMS_version,_Copyright_Notice); + fprintf(out,"%s\n%s",rtems_get_version_string(),_Copyright_Notice); break; case '%':fprintf(out,"%%"); break; -- cgit v1.2.3