* [U-Boot] [PATCH] ARM: at91: Don't invoke spl_boot_device() twice
@ 2016-05-14 21:42 Marek Vasut
2016-05-14 21:44 ` Marek Vasut
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Marek Vasut @ 2016-05-14 21:42 UTC (permalink / raw)
To: u-boot
Since the spl_boot_mode() is now passed the boot device to boot from,
make use of it instead of inquiring for the boot device again. This
allows board_boot_order() to function correctly.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bie?mann <andreas.devel@googlemail.com>
---
arch/arm/mach-at91/spl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c
index 561cf5f..236c8ec 100644
--- a/arch/arm/mach-at91/spl.c
+++ b/arch/arm/mach-at91/spl.c
@@ -72,7 +72,7 @@ u32 spl_boot_device(void)
u32 spl_boot_mode(const u32 boot_device)
{
- switch (spl_boot_device()) {
+ switch (boot_device) {
#ifdef CONFIG_SYS_USE_MMC
case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2:
--
2.7.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [U-Boot] [PATCH] ARM: at91: Don't invoke spl_boot_device() twice
2016-05-14 21:42 [U-Boot] [PATCH] ARM: at91: Don't invoke spl_boot_device() twice Marek Vasut
@ 2016-05-14 21:44 ` Marek Vasut
2016-06-25 21:24 ` Andreas Bießmann
2016-06-26 18:20 ` [U-Boot] " Andreas Bießmann
2 siblings, 0 replies; 4+ messages in thread
From: Marek Vasut @ 2016-05-14 21:44 UTC (permalink / raw)
To: u-boot
On 05/14/2016 11:42 PM, Marek Vasut wrote:
> Since the spl_boot_mode() is now passed the boot device to boot from,
> make use of it instead of inquiring for the boot device again. This
> allows board_boot_order() to function correctly.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Andreas Bie?mann <andreas.devel@googlemail.com>
> ---
> arch/arm/mach-at91/spl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
This one depends on :
[PATCH] common: Pass the boot device into spl_boot_mode()
> diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c
> index 561cf5f..236c8ec 100644
> --- a/arch/arm/mach-at91/spl.c
> +++ b/arch/arm/mach-at91/spl.c
> @@ -72,7 +72,7 @@ u32 spl_boot_device(void)
>
> u32 spl_boot_mode(const u32 boot_device)
> {
> - switch (spl_boot_device()) {
> + switch (boot_device) {
> #ifdef CONFIG_SYS_USE_MMC
> case BOOT_DEVICE_MMC1:
> case BOOT_DEVICE_MMC2:
>
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 4+ messages in thread* [U-Boot] [PATCH] ARM: at91: Don't invoke spl_boot_device() twice
2016-05-14 21:42 [U-Boot] [PATCH] ARM: at91: Don't invoke spl_boot_device() twice Marek Vasut
2016-05-14 21:44 ` Marek Vasut
@ 2016-06-25 21:24 ` Andreas Bießmann
2016-06-26 18:20 ` [U-Boot] " Andreas Bießmann
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Bießmann @ 2016-06-25 21:24 UTC (permalink / raw)
To: u-boot
On 14.05.16 23:42, Marek Vasut wrote:
> Since the spl_boot_mode() is now passed the boot device to boot from,
> make use of it instead of inquiring for the boot device again. This
> allows board_boot_order() to function correctly.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Andreas Bie?mann <andreas.devel@googlemail.com>
Reviewed-by: Andreas Bie?mann <andreas@biessmann.org>
> ---
> arch/arm/mach-at91/spl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c
> index 561cf5f..236c8ec 100644
> --- a/arch/arm/mach-at91/spl.c
> +++ b/arch/arm/mach-at91/spl.c
> @@ -72,7 +72,7 @@ u32 spl_boot_device(void)
>
> u32 spl_boot_mode(const u32 boot_device)
> {
> - switch (spl_boot_device()) {
> + switch (boot_device) {
> #ifdef CONFIG_SYS_USE_MMC
> case BOOT_DEVICE_MMC1:
> case BOOT_DEVICE_MMC2:
>
^ permalink raw reply [flat|nested] 4+ messages in thread* [U-Boot] ARM: at91: Don't invoke spl_boot_device() twice
2016-05-14 21:42 [U-Boot] [PATCH] ARM: at91: Don't invoke spl_boot_device() twice Marek Vasut
2016-05-14 21:44 ` Marek Vasut
2016-06-25 21:24 ` Andreas Bießmann
@ 2016-06-26 18:20 ` Andreas Bießmann
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Bießmann @ 2016-06-26 18:20 UTC (permalink / raw)
To: u-boot
Dear Marek Vasut,
Marek Vasut <marex@denx.de> writes:
>Since the spl_boot_mode() is now passed the boot device to boot from,
>make use of it instead of inquiring for the boot device again. This
>allows board_boot_order() to function correctly.
>
>Signed-off-by: Marek Vasut <marex@denx.de>
>Cc: Andreas Bie?mann <andreas.devel@googlemail.com>
>Reviewed-by: Andreas Bie?mann <andreas@biessmann.org>
>---
> arch/arm/mach-at91/spl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
applied to u-boot-atmel/master, thanks!
Best regards,
Andreas Bie?mann
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-26 18:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-14 21:42 [U-Boot] [PATCH] ARM: at91: Don't invoke spl_boot_device() twice Marek Vasut
2016-05-14 21:44 ` Marek Vasut
2016-06-25 21:24 ` Andreas Bießmann
2016-06-26 18:20 ` [U-Boot] " Andreas Bießmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox