diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-09 12:48:25 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-10 08:18:25 +0200 |
| commit | 6a7b4b186a6d6e6c6987f0b2d82800f91609d28d (patch) | |
| tree | 204042f8f362451bdb9157b2f18c72d790484d3d | |
| parent | e29efeb0af9a2b8a602e9ff2f9f4b00945eb3f50 (diff) | |
| download | barebox-6a7b4b186a6d6e6c6987f0b2d82800f91609d28d.tar.gz barebox-6a7b4b186a6d6e6c6987f0b2d82800f91609d28d.tar.xz | |
ARM: Layerscape: TQMLS1046a: Support booting from QSPI
We have to build correct images suitable for QSPI, thus have to call
lspbl_spi_image instead of lspbl_image. In lowlevel code call the
xload function which detects the bootsource rather than hardcoding
SD/MMC.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/boards/tqmls1046a/lowlevel.c | 2 | ||||
| -rw-r--r-- | images/Makefile.layerscape | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boards/tqmls1046a/lowlevel.c b/arch/arm/boards/tqmls1046a/lowlevel.c index 9815925599..2d0223ce89 100644 --- a/arch/arm/boards/tqmls1046a/lowlevel.c +++ b/arch/arm/boards/tqmls1046a/lowlevel.c @@ -257,7 +257,7 @@ static noinline __noreturn void tqmls1046a_r_entry(void) ls1046a_errata_post_ddr(); - ls1046a_esdhc_start_image(0, 0, 0); + ls1046a_xload_start_image(0, 0, 0); pr_err("Booting failed\n"); diff --git a/images/Makefile.layerscape b/images/Makefile.layerscape index 0f892aeb62..d20cc6a37e 100644 --- a/images/Makefile.layerscape +++ b/images/Makefile.layerscape @@ -37,7 +37,7 @@ $(obj)/barebox-ls1046ardb-emmc.image: $(obj)/start_ls1046ardb.pblb \ $(obj)/barebox-ls1046ardb-qspi.image: $(obj)/start_ls1046ardb.pblb \ $(board)/ls1046ardb/ls1046ardb_rcw_qspi.cfg \ $(board)/ls1046ardb/ls1046ardb_pbi.cfg - $(call if_changed,lspbl_image) + $(call if_changed,lspbl_spi_image) image-$(CONFIG_MACH_LS1046ARDB) += barebox-ls1046ardb-sd.image barebox-ls1046ardb-qspi.image \ barebox-ls1046ardb-emmc.image barebox-ls1046ardb-2nd.image @@ -54,7 +54,7 @@ $(obj)/barebox-tqmls1046a-sd.image: $(obj)/start_tqmls1046a.pblb \ $(obj)/barebox-tqmls1046a-qspi.image: $(obj)/start_tqmls1046a.pblb \ $(board)/tqmls1046a/tqmls1046a_rcw_qspi_3333_5559.cfg \ $(board)/tqmls1046a/tqmls1046a_pbi.cfg - $(call if_changed,lspbl_image) + $(call if_changed,lspbl_spi_image) image-$(CONFIG_MACH_TQMLS1046A) += barebox-tqmls1046a-sd.image \ barebox-tqmls1046a-qspi.image barebox-tqmls1046a-2nd.image |