diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:26 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:26 +0200 |
| commit | 2da2a9c583775e966e940a21016309ca661979f5 (patch) | |
| tree | 383b5dd6a5d37b5698e4a8c8ab666ef243638348 /common | |
| parent | ea7fdd5f550a63f45a90f76cb1ac1e1eeecffe00 (diff) | |
| parent | 01b53d3b728073996e7e7c1f308a2bf79f0ae609 (diff) | |
| download | barebox-2da2a9c583775e966e940a21016309ca661979f5.tar.gz barebox-2da2a9c583775e966e940a21016309ca661979f5.tar.xz | |
Merge branch 'for-next/buildsystem-version' into master
Diffstat (limited to 'common')
| -rw-r--r-- | common/globalvar.c | 6 | ||||
| -rw-r--r-- | common/imd-barebox.c | 1 | ||||
| -rw-r--r-- | common/imd.c | 3 | ||||
| -rw-r--r-- | common/version.c | 6 |
4 files changed, 16 insertions, 0 deletions
diff --git a/common/globalvar.c b/common/globalvar.c index 5bde86aad0..09479da548 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -652,11 +652,17 @@ static int globalvar_init(void) globalvar_add_simple("version", UTS_RELEASE); + if (strlen(buildsystem_version_string) > 0) + globalvar_add_simple("buildsystem.version", buildsystem_version_string); + return 0; } pure_initcall(globalvar_init); BAREBOX_MAGICVAR_NAMED(global_version, global.version, "The barebox version"); +BAREBOX_MAGICVAR_NAMED(global_buildsystem_version, + global.buildsystem.version, + "version of buildsystem barebox was built with"); /** * nvvar_save - save NV variables to persistent environment diff --git a/common/imd-barebox.c b/common/imd-barebox.c index e5cdfd1aed..06731d0600 100644 --- a/common/imd-barebox.c +++ b/common/imd-barebox.c @@ -23,4 +23,5 @@ __BAREBOX_IMD_SECTION(.barebox_imd_end) = { BAREBOX_IMD_TAG_STRING(imd_build_tag, IMD_TYPE_BUILD, UTS_VERSION, 1); BAREBOX_IMD_TAG_STRING(imd_release_tag, IMD_TYPE_RELEASE, UTS_RELEASE, 1); +BAREBOX_IMD_TAG_STRING(imd_buildsystem_version_tag, IMD_TYPE_BUILDSYSTEM, BUILDSYSTEM_VERSION, 1); BAREBOX_IMD_CRC(imd_crc32, 0x0, 1); diff --git a/common/imd.c b/common/imd.c index 0644e6d3bf..4fd4431aa9 100644 --- a/common/imd.c +++ b/common/imd.c @@ -168,6 +168,9 @@ static struct imd_type_names imd_types[] = { }, { .type = IMD_TYPE_CRC32, .name = "crc32", + }, { + .type = IMD_TYPE_BUILDSYSTEM, + .name = "buildsystem version", }, }; diff --git a/common/version.c b/common/version.c index 8b1fd4dbe7..54cec5335d 100644 --- a/common/version.c +++ b/common/version.c @@ -10,11 +10,17 @@ const char release_string[] = "barebox-" UTS_RELEASE; EXPORT_SYMBOL(release_string); +const char buildsystem_version_string[] = + BUILDSYSTEM_VERSION; +EXPORT_SYMBOL(buildsystem_version_string); + #ifdef CONFIG_BANNER void barebox_banner (void) { printf("\n\n"); pr_info("%s", version_string); + if (strlen(buildsystem_version_string) > 0) + pr_info("Buildsystem version: %s", buildsystem_version_string); printf("\n\n"); pr_info("Board: %s\n", barebox_get_model()); } |