From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v4 24/54] ARM: i.MX: xload-esdhc: Allow custom buffer address, device offset
Date: Mon, 11 Jun 2018 18:52:56 -0700 [thread overview]
Message-ID: <20180612015326.26192-25-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180612015326.26192-1-andrew.smirnov@gmail.com>
Add code to support specifying different buffer address and SD/MMC
device offset to read it from in esdhc_start_image(). This change is
needed to support i.MX8.
NOTE: We intentionnaly "emulate" reading at arbitrary offset in
esdhc_start_image() as opposed to implementing it in
esdhc_read_blocks() in order to avoid having to detect if units of
blocks or bytes should be used to specify offset to CMD18.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
arch/arm/mach-imx/xload-esdhc.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-imx/xload-esdhc.c b/arch/arm/mach-imx/xload-esdhc.c
index 4580f53cd..6ab4cabb7 100644
--- a/arch/arm/mach-imx/xload-esdhc.c
+++ b/arch/arm/mach-imx/xload-esdhc.c
@@ -216,10 +216,11 @@ static int esdhc_read_blocks(struct esdhc *esdhc, void *dst, size_t len)
return 0;
}
-static int esdhc_start_image(struct esdhc *esdhc)
+static int
+esdhc_start_image(struct esdhc *esdhc, ptrdiff_t address, u32 offset)
{
- void *buf = (void *)0x10000000;
- u32 *ivt = buf + SZ_1K;
+ void *buf = (void *)address;
+ u32 *ivt = buf + offset + SZ_1K;
int ret, len;
void __noreturn (*bb)(void);
unsigned int ofs;
@@ -227,9 +228,10 @@ static int esdhc_start_image(struct esdhc *esdhc)
len = imx_image_size();
len = ALIGN(len, SECTOR_SIZE);
- ret = esdhc_read_blocks(esdhc, buf, 3 * SECTOR_SIZE);
+ ret = esdhc_read_blocks(esdhc, buf, offset + SZ_1K + SECTOR_SIZE);
if (ret)
return ret;
+
if (*(u32 *)(ivt) != 0x402000d1) {
pr_debug("IVT header not found on SD card. Found 0x%08x instead of 0x402000d1\n",
*ivt);
@@ -238,7 +240,7 @@ static int esdhc_start_image(struct esdhc *esdhc)
pr_debug("Check ok, loading image\n");
- ret = esdhc_read_blocks(esdhc, buf, len);
+ ret = esdhc_read_blocks(esdhc, buf, offset + len);
if (ret) {
pr_err("Loading image failed with %d\n", ret);
return ret;
@@ -246,7 +248,7 @@ static int esdhc_start_image(struct esdhc *esdhc)
pr_debug("Image loaded successfully\n");
- ofs = *(ivt + 1) - *(ivt + 8);
+ ofs = offset + *(ivt + 1) - *(ivt + 8);
bb = buf + ofs;
@@ -288,5 +290,5 @@ int imx6_esdhc_start_image(int instance)
esdhc.is_mx6 = 1;
- return esdhc_start_image(&esdhc);
+ return esdhc_start_image(&esdhc, 0x10000000, 0);
}
--
2.17.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-06-12 1:56 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-12 1:52 [PATCH v4 00/54] ARM: i.MX8MQ and EVK support Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 01/54] ARM: i.MX: xload: Fix compiler warning Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 02/54] ARM: i.MX: compile arm32 specific errata only for CPU32 Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 03/54] ARM: Add i.MX8 support Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 04/54] aarch64: Add i.MX8 debug UART support Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 05/54] Include our own include/dt-bindings Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 06/54] mci: imx-esdhc: use dma mapping functions Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 07/54] net: fec_imx: remove unnecessary DMA sync ops Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 08/54] net: fec_imx: Use dma mapping functions Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 09/54] net: fec_imx: Make use of IS_ALIGNED Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 10/54] clock: Add i.MX8MQ clock driver Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 11/54] serial: i.MX: Add i.MX8 support Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 12/54] mmc: i.MX esdhc: " Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 13/54] gpio: i.MX: Add i.MX8mq support Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 14/54] ARM: i.MX: ocotp: Add i.MX8MQ support Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 15/54] ARM: i.MX: Split shared CCM code into a separate file Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 16/54] ARM: i.MX: Add IOMUX pad constants for i.MX8 Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 17/54] ARM: i.MX: Add basic CCM " Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 18/54] ARM: Add constants and helpers for system counter interface Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 19/54] clocksource: armv8-timer: Convert explicit assembly into helpers Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 20/54] ARM: i.MX8: Initialize system counter Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 21/54] ARM: i.MX: boot: Fix address casting on 64-bit platforms Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 22/54] ARM: boot: Add trivial i.MX8 support Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 23/54] ARM: i.MX: xload-esdhc: Rework to make code be less i.MX6-specific Andrey Smirnov
2018-06-12 1:52 ` Andrey Smirnov [this message]
2018-06-12 1:52 ` [PATCH v4 25/54] ARM: i.MX: xload-esdhc: Add support for i.MX8 Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 26/54] pinctrl: i.MX: " Andrey Smirnov
2018-06-12 1:52 ` [PATCH v4 27/54] Documentation: imx: Change block size for 'dd' to 1024 Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 28/54] Documentation: i.MX: Add missing <soctype> Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 29/54] clocksource: armv8-timer: Make armv8_clocksource_read() static Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 30/54] clocksource: armv8-timer: Make use of postcore_platform_driver() Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 31/54] Port <linux/iopoll.h> from U-Boot Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 32/54] common/clock: Move delay and timeout functions to lib/ Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 33/54] clock: Use udelay() to implement mdelay() Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 34/54] ARM: i.MX8: Add DDRC PHY and DDR CTL base addresses Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 35/54] Kbuild: Add $(quote) Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 36/54] Add builtin firmware support Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 37/54] ARM: i.MX8: Add DDRC PHY support code Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 38/54] ARM: Specify HAVE_PBL_IMAGE for CPU_64 Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 39/54] ARM: lib64: Make string functions aware of MMU configuration Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 40/54] ARM: mmu: Make use of dsb() and isb() helpers Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 41/54] ARM: cache: Remove unused cache ops struct Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 42/54] ARM: no-mmu: Disable building for ARMv8 Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 43/54] ARM: interrupts64: Include ESR value in exception traceback Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 44/54] ARM: mmu64: Trivial code simplification Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 45/54] ARM: mmu64: Make use of create_table() Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 46/54] ARM: mmu64: Convert flags in arch_remap_range() Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 47/54] ARM: include: dma: Add missing no-MMU stubs Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 48/54] scripts: imx-image: Drop error return from write_dcd() Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 49/54] scripts: imx-image: Limit v2 header size to HEADER_LEN Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 50/54] scripts: imx-image: Use a loop to create multiple header copies Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 51/54] scripts: imx-image: Share the code to write barebox header Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 52/54] scripts: imx-image: Add i.MX8MQ support Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 53/54] ARM: i.MX8: Add i.MX8mq EVK support Andrey Smirnov
2018-06-12 2:58 ` Fabio Estevam
2018-06-12 14:52 ` Andrey Smirnov
2018-06-12 5:49 ` Holger Schurig
2018-06-12 14:53 ` Andrey Smirnov
2018-06-12 1:53 ` [PATCH v4 54/54] ARM: Introduce imx_v8_defconfig Andrey Smirnov
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=20180612015326.26192-25-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox