From 3315434256ac6acc0e6b7f736fb805630196abe0 Mon Sep 17 00:00:00 2001 From: Abel Vesa Date: Wed, 7 Nov 2018 18:12:22 +0200 Subject: [PATCH] MLK-20233 imx8: Fix QSPI read in container parser The check for CONFIG_SPL_SPI_LOAD is fixed, get rid of ret local variable (that's actually a bug) and fix the length for the spi_flash_read call. Signed-off-by: Abel Vesa Reviewed-by: Ye Li (cherry picked from commit 32adc4aed8864fe274de13f14f4e29759062ee1d) --- arch/arm/mach-imx/imx8/parser.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/imx8/parser.c b/arch/arm/mach-imx/imx8/parser.c index 8b94cf7a9b..631f4a33bc 100644 --- a/arch/arm/mach-imx/imx8/parser.c +++ b/arch/arm/mach-imx/imx8/parser.c @@ -55,12 +55,13 @@ static int read(int start, int len, void *load_addr) return -EIO; } } -#elif CONFIG_SPL_SPI_LOAD +#endif +#ifdef CONFIG_SPL_SPI_LOAD if (current_dev_type == QSPI_DEV) { struct spi_flash *flash = (struct spi_flash *)device; - int ret = spi_flash_read(flash, start, - CONTAINER_HDR_ALIGNMENT, load_addr); + ret = spi_flash_read(flash, start, + len, load_addr); if (ret != 0) { debug("Read container image from QSPI failed\n"); return -EIO; -- 2.17.1