diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-11-22 08:33:27 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-11-22 08:33:27 +1100 |
| commit | c1862061cae04f6fd2c4bd4a723a408a76e8be81 (patch) | |
| tree | 5d247c9345e746442973402077d404391d92b653 /core | |
| parent | 0b446b4c8c3883b847f00722b9fd43d3110f7af1 (diff) | |
| parent | 23f147ea00fbc246106040cb95b1b6f0dfe4e961 (diff) | |
| download | skiboot-c1862061cae04f6fd2c4bd4a723a408a76e8be81.zip skiboot-c1862061cae04f6fd2c4bd4a723a408a76e8be81.tar.gz skiboot-c1862061cae04f6fd2c4bd4a723a408a76e8be81.tar.bz2 | |
Merge remote-tracking branch 'ltcgit/master'
Diffstat (limited to 'core')
| -rw-r--r-- | core/init.c | 2 | ||||
| -rw-r--r-- | core/opal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/init.c b/core/init.c index d934e78..d8e9d20 100644 --- a/core/init.c +++ b/core/init.c @@ -492,7 +492,7 @@ void __noreturn main_cpu_entry(const void *fdt, u32 master_cpu) */ clear_console(); - printf("SkiBoot %s starting...\n", gitid); + printf("SkiBoot %s starting...\n", version); printf("initial console log level: memory %d, driver %d\n", (debug_descriptor.console_log_levels >> 4), (debug_descriptor.console_log_levels & 0x0f)); diff --git a/core/opal.c b/core/opal.c index 345d619..5b96064 100644 --- a/core/opal.c +++ b/core/opal.c @@ -118,7 +118,7 @@ static void add_opal_firmware_node(void) dt_add_property_string(firmware, "compatible", "ibm,opal-firmware"); dt_add_property_string(firmware, "name", "firmware"); - dt_add_property_string(firmware, "git-id", gitid); + dt_add_property_string(firmware, "version", version); dt_add_property(firmware, "symbol-map", __sym_map_start, __sym_map_end - __sym_map_start); } |