bootm: Move fixup_silent_linux() earlier in the bootm stages

Before the bootm refactor, fixup_silent_linux() was done only in the monolithic bootm case, not in the subcommand case. With the refactor, it is done always, which is good. Unfortunately it is done too late, since it is the PREP or CMDLINE stages that set up the command line for Linux. Move fixup_silent_linux() into the LOADOS stage, which is where we find out the OS being used, and can thus decide whether to perform this step. Signed-off-by: Simon Glass <sjg@chromium.org>

bootm: Move fixup_silent_linux() earlier in the bootm stages
Before the bootm refactor, fixup_silent_linux() was done only in the monolithic bootm case, not in the subcommand case. With the refactor, it is done always, which is good. Unfortunately it is done too late, since it is the PREP or CMDLINE stages that set up the command line for Linux. Move fixup_silent_linux() into the LOADOS stage, which is where we find out the OS being used, and can thus decide whether to perform this step. Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass · Tom Rini
1 parent c3e0afca48
Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff
common/cmd_bootm.c
@@ -542,10 +542,6 @@
 		bootm_start_standalone(argc, argv);
 		return 0;
 	}
-#ifdef CONFIG_SILENT_CONSOLE
-	if (images->os.os == IH_OS_LINUX)
-		fixup_silent_linux();
-#endif
 	arch_preboot_os();
 	boot_fn(state, argc, argv, images);
 	if (state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */
@@ -656,6 +652,10 @@
 			goto err;
 		else if (ret == BOOTM_ERR_OVERLAP)
 			ret = 0;
+#ifdef CONFIG_SILENT_CONSOLE
+		if (images->os.os == IH_OS_LINUX)
+			fixup_silent_linux();
+#endif
 	}
  
 	/* Relocate the ramdisk */
...	...	@@ -542,10 +542,6 @@
542	542	bootm_start_standalone(argc, argv);
543	543	return 0;
544	544	}
545		-#ifdef CONFIG_SILENT_CONSOLE
546		- if (images->os.os == IH_OS_LINUX)
547		- fixup_silent_linux();
548		-#endif
549	545	arch_preboot_os();
550	546	boot_fn(state, argc, argv, images);
551	547	if (state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */
...	...	@@ -656,6 +652,10 @@
656	652	goto err;
657	653	else if (ret == BOOTM_ERR_OVERLAP)
658	654	ret = 0;
	655	+#ifdef CONFIG_SILENT_CONSOLE
	656	+ if (images->os.os == IH_OS_LINUX)
	657	+ fixup_silent_linux();
	658	+#endif
659	659	}
660	660
661	661	/* Relocate the ramdisk */