From: Tom Rini <trini@ti.com>
Date: Fri, 28 Mar 2014 16:03:38 +0000 (-0400)
Subject: am335x_evm: Make SPL_OS also check the boot_os variable for falcon mode
X-Git-Tag: v2014.07-rc1~2^2~3^2~37
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ba9a6708ec51c294a9674d6901a8be7c3ef76f57;p=u-boot

am335x_evm: Make SPL_OS also check the boot_os variable for falcon mode

We use the same variable as a3m071 in the environment to determine if we
should boot into Linux or U-Boot.  This is useful on boards like
Beaglebone Black or AM335x GP EVM where we have persistent storage for
the environment.

Signed-off-by: Tom Rini <trini@ti.com>
---

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 554398f346..ce7a8b041e 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -30,6 +30,7 @@
 #include <power/tps65910.h>
 #include <environment.h>
 #include <watchdog.h>
+#include <environment.h>
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -219,7 +220,17 @@ static struct emif_regs ddr3_evm_emif_reg_data = {
 int spl_start_uboot(void)
 {
 	/* break into full u-boot on 'c' */
-	return (serial_tstc() && serial_getc() == 'c');
+	if (serial_tstc() && serial_getc() == 'c')
+		return 1;
+
+#ifdef CONFIG_SPL_ENV_SUPPORT
+	env_init();
+	env_relocate_spec();
+	if (getenv_yesno("boot_os") != 1)
+		return 1;
+#endif
+
+	return 0;
 }
 #endif