diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-08-23 10:08:29 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-10-03 19:12:06 +0200 |
| commit | f4c3523c98588b528601f40c0c16106379ea6eda (patch) | |
| tree | 35f84eb81cd16ef028fec82ee92b42e6e3143b42 /board/sunxi | |
| parent | 8829076a5b1001ee20009528931383e912496fcd (diff) | |
sunxi: Use sunxi_get_boot_device
Our current board code duplicates a bit the sunxi_get_boot_device logic.
Now that we can use that function in the full-flavoured U-Boot, remove that
duplication and call the function instead.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'board/sunxi')
| -rw-r--r-- | board/sunxi/board.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 610fa89056..7fdcc4a74f 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -32,6 +32,7 @@ #include <libfdt.h> #include <nand.h> #include <net.h> +#include <spl.h> #include <sy8106a.h> #include <asm/setup.h> @@ -720,11 +721,14 @@ static void setup_environment(const void *fdt) int misc_init_r(void) { __maybe_unused int ret; + uint boot; env_set("fel_booted", NULL); env_set("fel_scriptaddr", NULL); + + boot = sunxi_get_boot_device(); /* determine if we are running in FEL mode */ - if (!is_boot0_magic(SPL_ADDR + 4)) { /* eGON.BT0 */ + if (boot == BOOT_DEVICE_BOARD) { env_set("fel_booted", "1"); parse_spl_header(SPL_ADDR); } |