diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-06 20:55:10 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-06 20:55:10 +0200 |
commit | a48f831d12934a5c001c68f4bb4dafa8c78e3feb (patch) | |
tree | fba1b2be0e6ee6786f7ab8ab191a0091b19fd0e5 /common | |
parent | aa45c51b965d907ab79f777500e616338fe7de31 (diff) | |
parent | 1c8dc624f53580df32794c6f4a9a3d5030f892c3 (diff) | |
download | barebox-a48f831d12934a5c001c68f4bb4dafa8c78e3feb.tar.gz barebox-a48f831d12934a5c001c68f4bb4dafa8c78e3feb.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'common')
-rw-r--r-- | common/Makefile | 2 | ||||
-rw-r--r-- | common/oftree.c | 1 | ||||
-rw-r--r-- | common/version.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index a9abcd1bc6..4e9681f203 100644 --- a/common/Makefile +++ b/common/Makefile @@ -11,7 +11,7 @@ obj-y += bootsource.o obj-y += restart.o obj-y += poweroff.o obj-$(CONFIG_AUTO_COMPLETE) += complete.o -obj-$(CONFIG_BANNER) += version.o +obj-y += version.o obj-$(CONFIG_BAREBOX_UPDATE) += bbu.o obj-$(CONFIG_BINFMT) += binfmt.o obj-$(CONFIG_BLOCK) += block.o diff --git a/common/oftree.c b/common/oftree.c index 40eb35f188..8a2ede4c60 100644 --- a/common/oftree.c +++ b/common/oftree.c @@ -128,6 +128,7 @@ static int of_fixup_bootargs(struct device_node *root, void *unused) if (!node) return -ENOMEM; + of_property_write_string(node, "barebox-version", release_string); err = of_property_write_string(node, "bootargs", str); diff --git a/common/version.c b/common/version.c index f37cb5527f..8b1fd4dbe7 100644 --- a/common/version.c +++ b/common/version.c @@ -10,6 +10,7 @@ const char release_string[] = "barebox-" UTS_RELEASE; EXPORT_SYMBOL(release_string); +#ifdef CONFIG_BANNER void barebox_banner (void) { printf("\n\n"); @@ -17,3 +18,4 @@ void barebox_banner (void) printf("\n\n"); pr_info("Board: %s\n", barebox_get_model()); } +#endif |