public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Jagan Teki <jagan@amarulasolutions.com>
To: u-boot@lists.denx.de
Subject: [PATCH v2 1/9] spl: Try to get SPL boot device via board_get_int
Date: Wed, 20 May 2020 00:53:32 +0530	[thread overview]
Message-ID: <20200519192340.16624-2-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20200519192340.16624-1-jagan@amarulasolutions.com>

Usually, the associated board would supply spl boot device
using spl_boot_device() but some boards have board driver
that are possible to supply boot device via board_get_int
with BOARD_SPL_BOOT_DEVICE id.

This patch add support for those.

Cc: Mario Six <mario.six@gdsys.cc>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Jean-Jacques Hiblot <jjhiblot@ti.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- new patch

 common/spl/spl.c | 14 +++++++++++++-
 include/board.h  |  9 +++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c
index fc5cbbbeba..a07b71b3c1 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bloblist.h>
 #include <binman_sym.h>
+#include <board.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -483,9 +484,20 @@ int spl_init(void)
 #define BOOT_DEVICE_NONE 0xdeadbeef
 #endif
 
+__weak u32 spl_boot_device(void)
+{
+	return 0;
+}
+
 __weak void board_boot_order(u32 *spl_boot_list)
 {
-	spl_boot_list[0] = spl_boot_device();
+	struct udevice *board;
+
+	if (!board_get(&board))
+		board_get_int(board, BOARD_SPL_BOOT_DEVICE,
+			      (int *)&spl_boot_list[0]);
+	else
+		spl_boot_list[0] = spl_boot_device();
 }
 
 static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
diff --git a/include/board.h b/include/board.h
index 678b652b0a..ce4eaba38d 100644
--- a/include/board.h
+++ b/include/board.h
@@ -211,3 +211,12 @@ static inline int board_get_fit_loadable(struct udevice *dev, int index,
 }
 
 #endif
+
+/**
+ * Common board unique identifier
+ *
+ * @BOARD_SPL_BOOT_DEVICE:	id to get SPL boot device.
+ */
+enum common_ids {
+	BOARD_SPL_BOOT_DEVICE,
+};
-- 
2.20.1

  reply	other threads:[~2020-05-19 19:23 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-19 19:23 [PATCH v2 0/9] riscv: sifive/fu540: Booting from SPI Jagan Teki
2020-05-19 19:23 ` Jagan Teki [this message]
2020-05-20 13:02   ` [PATCH v2 1/9] spl: Try to get SPL boot device via board_get_int Tom Rini
2020-05-20 13:16     ` Jagan Teki
2020-05-20 14:10       ` Tom Rini
2020-05-22 16:12         ` Jagan Teki
2020-05-22 21:25           ` Tom Rini
2020-05-25  8:31             ` Jagan Teki
2020-05-25 13:15               ` Tom Rini
2020-05-19 19:23 ` [PATCH v2 2/9] dt-bindings: board: Document sifive,fu540-modeselect Jagan Teki
2020-05-20 13:13   ` [PATCH v2 2/9] dt-bindings: board: Document sifive, fu540-modeselect Bin Meng
2020-05-19 19:23 ` [PATCH v2 3/9] riscv: dts: fu540-c000-u-boot: Add " Jagan Teki
2020-05-19 19:23 ` [PATCH v2 4/9] drivers: Add fu540 board driver Jagan Teki
2020-05-19 19:23 ` [PATCH v2 5/9] sifive: fu540: Add Booting from SPI Jagan Teki
2020-05-19 19:23 ` [PATCH v2 6/9] env: Enable SPI flash env for SiFive FU540 Jagan Teki
2020-05-19 19:23 ` [PATCH v2 7/9] sifive: fu540: Mark the default env as SPI flash Jagan Teki
2020-05-19 19:23 ` [PATCH v2 8/9] sifive: fu540: Add boot flash script offset, size Jagan Teki
2020-05-19 19:23 ` [PATCH v2 9/9] sifive: fu540: Enable SF distro bootcmd Jagan Teki
2020-05-25  2:10 ` [PATCH v2 0/9] riscv: sifive/fu540: Booting from SPI Bin Meng
2020-05-25  2:27   ` Bin Meng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200519192340.16624-2-jagan@amarulasolutions.com \
    --to=jagan@amarulasolutions.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox