diff options
author | Marek Vasut <marex@denx.de> | 2016-05-15 00:42:07 +0300 |
---|---|---|
committer | Andreas Bießmann <andreas@biessmann.org> | 2016-06-26 21:17:22 +0300 |
commit | 2b1cdafa9fdd0c88eb1bc96e9330e252c9795689 (patch) | |
tree | 5d81e6fe31f534d1d970eb1d62d1ad10e2837933 /arch/arm/cpu/arm1136 | |
parent | 4141e85bcd79c0b9b16def710e527f165107b7af (diff) | |
download | u-boot-2b1cdafa9fdd0c88eb1bc96e9330e252c9795689.tar.xz |
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 'arch/arm/cpu/arm1136')
-rw-r--r-- | arch/arm/cpu/arm1136/mx35/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c index bc98edda7a..068d93eeec 100644 --- a/arch/arm/cpu/arm1136/mx35/generic.c +++ b/arch/arm/cpu/arm1136/mx35/generic.c @@ -526,7 +526,7 @@ u32 spl_boot_device(void) } #ifdef CONFIG_SPL_BUILD -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { switch (spl_boot_device()) { case BOOT_DEVICE_MMC1: |