leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Tom Rini 2014-03-28 12:03:38 -04:00
parent db60580649
commit ba9a6708ec
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
board/ti/am335x/board.c
View File

@ -30,6 +30,7 @@
#include <power/tps65910.h> #include <power/tps65910.h>
#include <environment.h> #include <environment.h>
#include <watchdog.h> #include <watchdog.h>
#include <environment.h>
#include "board.h" #include "board.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -219,7 +220,17 @@ static struct emif_regs ddr3_evm_emif_reg_data = {
int spl_start_uboot(void) int spl_start_uboot(void)
{ {
/* break into full u-boot on 'c' */ /* 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 #endif