From: Eddie James <eajames@linux.ibm.com>
To: openbmc@lists.ozlabs.org
Cc: Eddie James <eajames@linux.ibm.com>
Subject: [PATCH U-Boot v2019.04-aspeed-openbmc 2/3] arch: ARM: Aspeed: Add SPL eMMC partition boot support
Date: Mon, 28 Sep 2020 15:27:52 -0500 [thread overview]
Message-ID: <20200928202753.58351-3-eajames@linux.ibm.com> (raw)
In-Reply-To: <20200928202753.58351-1-eajames@linux.ibm.com>
Support loading U-Boot from a specific partition on the eMMC
device.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
arch/arm/mach-aspeed/Kconfig | 7 +++++++
arch/arm/mach-aspeed/ast2600/spl_boot.c | 9 ++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-aspeed/Kconfig b/arch/arm/mach-aspeed/Kconfig
index 06f14f4f55..0e3bb841d0 100644
--- a/arch/arm/mach-aspeed/Kconfig
+++ b/arch/arm/mach-aspeed/Kconfig
@@ -90,6 +90,13 @@ config ASPEED_UBOOT_MMC_BASE
The base block number of the U-Boot
image in the eMMC device
+config ASPEED_UBOOT_MMC_PART
+ int "U-Boot eMMC partition"
+ default 0
+ help
+ The partition number of the U-Boot
+ image in the eMMC device
+
config ASPEED_UBOOT_MMC_SIZE
hex "U-Boot eMMC size in blocks"
default 0x0
diff --git a/arch/arm/mach-aspeed/ast2600/spl_boot.c b/arch/arm/mach-aspeed/ast2600/spl_boot.c
index b08c49d204..58a22f646e 100644
--- a/arch/arm/mach-aspeed/ast2600/spl_boot.c
+++ b/arch/arm/mach-aspeed/ast2600/spl_boot.c
@@ -46,8 +46,8 @@ static int aspeed_spl_mmc_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
int err;
+ int part = CONFIG_ASPEED_UBOOT_MMC_PART;
u32 count;
-
struct mmc *mmc = NULL;
struct udevice *dev;
struct blk_desc *bd;
@@ -78,6 +78,13 @@ static int aspeed_spl_mmc_load_image(struct spl_image_info *spl_image,
bd = mmc_get_blk_desc(mmc);
+ if (part) {
+ if (CONFIG_IS_ENABLED(MMC_TINY))
+ err = mmc_switch_part(mmc, part);
+ else
+ err = blk_dselect_hwpart(bd, part);
+ }
+
count = blk_dread(bd, CONFIG_ASPEED_UBOOT_MMC_BASE, CONFIG_ASPEED_UBOOT_MMC_SIZE,
(void *)CONFIG_ASPEED_UBOOT_DRAM_BASE);
if (count != CONFIG_ASPEED_UBOOT_MMC_SIZE) {
--
2.26.2
next prev parent reply other threads:[~2020-09-28 20:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 20:27 [PATCH U-Boot v2019.04-aspeed-openbmc 0/3] Aspeed: Support eMMC boot Eddie James
2020-09-28 20:27 ` [PATCH U-Boot v2019.04-aspeed-openbmc 1/3] ARM: dts: Aspeed: Tacoma and Rainier: Add eMMC nodes and parameters Eddie James
2020-10-09 3:40 ` Joel Stanley
2020-09-28 20:27 ` Eddie James [this message]
2020-10-09 3:41 ` [PATCH U-Boot v2019.04-aspeed-openbmc 2/3] arch: ARM: Aspeed: Add SPL eMMC partition boot support Joel Stanley
2020-10-12 13:34 ` Eddie James
2020-10-28 4:28 ` Joel Stanley
2020-09-28 20:27 ` [PATCH U-Boot v2019.04-aspeed-openbmc 3/3] configs: Add AST2600 SPL eMMC configuration Eddie James
2020-10-09 3:44 ` Joel Stanley
2020-10-12 13:36 ` Eddie James
2020-10-28 4:29 ` Joel Stanley
2020-10-09 3:50 ` Joel Stanley
2020-10-12 13:41 ` Eddie James
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=20200928202753.58351-3-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=openbmc@lists.ozlabs.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.