diff options
| author | Marek Vasut <marex@denx.de> | 2016-05-14 23:42:07 +0200 |
|---|---|---|
| committer | Andreas Bießmann <andreas@biessmann.org> | 2016-06-26 20:17:22 +0200 |
| commit | 2b1cdafa9fdd0c88eb1bc96e9330e252c9795689 (patch) | |
| tree | 5d81e6fe31f534d1d970eb1d62d1ad10e2837933 /common | |
| parent | 4141e85bcd79c0b9b16def710e527f165107b7af (diff) | |
common: Pass the boot device into spl_boot_mode()
The SPL code already knows which boot device it calls the spl_boot_mode()
on, so pass that information into the function. This allows the code of
spl_boot_mode() avoid invoking spl_boot_device() again, but it also lets
board_boot_order() correctly alter the behavior of the boot process.
The later one is important, since in certain cases, it is desired that
spl_boot_device() return value be overriden using board_boot_order().
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Tom Rini <trini@konsulko.com>
Reviewed-by: Andreas Bießmann <andreas@biessmann.org>
[add newly introduced zynq variant]
Signed-aff-by: Andreas Bießmann <andreas@biessmann.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index ef8583a1a64..c44f1b5dc84 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -286,7 +286,7 @@ int spl_mmc_load_image(u32 boot_device) return err; } - boot_mode = spl_boot_mode(); + boot_mode = spl_boot_mode(boot_device); err = -EINVAL; switch (boot_mode) { case MMCSD_MODE_EMMCBOOT: |