kernel: init: simplify boot banner printing
Just use printk directly instead of going over defines.
For some reason, this change lets us pass on master when running
tests/kernel/timer/timer_monotonic test. This test started failing after
rc2 was tagged, just because the changing git version string passing to
BUILD_VERSION. This is still under investigation.
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
diff --git a/kernel/init.c b/kernel/init.c
index d805dc3..e93403a 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -49,20 +49,6 @@
#define BOOT_DELAY_BANNER ""
#endif
-#ifdef BUILD_VERSION
-#define BOOT_BANNER "Booting Zephyr OS build " \
- STRINGIFY(BUILD_VERSION) BOOT_DELAY_BANNER
-#else
-#define BOOT_BANNER "Booting Zephyr OS version " \
- KERNEL_VERSION_STRING BOOT_DELAY_BANNER
-#endif
-
-#if !defined(CONFIG_BOOT_BANNER)
-#define PRINT_BOOT_BANNER() do { } while (false)
-#else
-#define PRINT_BOOT_BANNER() printk("***** " BOOT_BANNER " *****\n")
-#endif
-
/* boot time measurement items */
#ifdef CONFIG_BOOT_TIME_MEASUREMENT
@@ -256,7 +242,16 @@
"ms (per build configuration) *****\n");
k_busy_wait(CONFIG_BOOT_DELAY * USEC_PER_MSEC);
}
- PRINT_BOOT_BANNER();
+
+#if defined(CONFIG_BOOT_BANNER)
+#ifdef BUILD_VERSION
+ printk("*** Booting Zephyr OS build %s %s ***\n",
+ STRINGIFY(BUILD_VERSION), BOOT_DELAY_BANNER);
+#else
+ printk("*** Booting Zephyr OS version %s %s ***\n",
+ KERNEL_VERSION_STRING, BOOT_DELAY_BANNER);
+#endif
+#endif
/* Final init level before app starts */
z_sys_device_do_config_level(_SYS_INIT_LEVEL_APPLICATION);
