summaryrefslogtreecommitdiff
path: root/arch/arm/lib/bootm.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-03-22 19:09:58 -0400
committerTom Rini <trini@konsulko.com>2019-03-22 19:09:58 -0400
commitcfb3e102c4bdf96a41cbd3eeb1d3a9a56c69c46c (patch)
tree5951f299b8b05cb6011deb8522a8b883a5d260e2 /arch/arm/lib/bootm.c
parent7b80644e271544848db90fb0407d67b3e3749a8e (diff)
parent2e7365518acdb8fb6e9be332c8a6c57b457188d9 (diff)
Merge branch '2019-03-22-master-imports'
- Don't attempt to write to ext4 volumes with the metadata_csum feature we don't support - Correct how we build dtb files. - Fix regression on SPL_FIT with FIT_IMAGE_TINY - Minor TI platform fixes
Diffstat (limited to 'arch/arm/lib/bootm.c')
-rw-r--r--arch/arm/lib/bootm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 329f20c2bfe..bf68a5ba622 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -88,8 +88,6 @@ __weak void board_quiesce_devices(void)
*/
static void announce_and_cleanup(int fake)
{
- printf("\nStarting kernel ...%s\n\n", fake ?
- "(fake run for tracing)" : "");
bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
#ifdef CONFIG_BOOTSTAGE_FDT
bootstage_fdt_add_report();
@@ -104,6 +102,8 @@ static void announce_and_cleanup(int fake)
board_quiesce_devices();
+ printf("\nStarting kernel ...%s\n\n", fake ?
+ "(fake run for tracing)" : "");
/*
* Call remove function of all devices with a removal flag set.
* This may be useful for last-stage operations, like cancelling