October 2022 - U-Boot

[PATCH] drivers: mmc: Reset watchdog when accessing mmc device
by qianfanguijin＠163.com 27 Oct '22

27 Oct '22

From: qianfan Zhao <qianfanguijin(a)163.com> watchdog will reset when 'mmc read' or 'ext4load' a large file from mmc device. Reset watchdog when accessing mmc device. Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> --- drivers/mmc/mmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 4d9871d69f..27ffdb7fa7 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -24,6 +24,7 @@ #include <memalign.h> #include <linux/list.h> #include <div64.h> +#include <watchdog.h> #include "mmc_private.h" #define DEFAULT_CMD6_TIMEOUT_MS 500 @@ -297,6 +298,7 @@ int mmc_poll_for_busy(struct mmc *mmc, int timeout_ms) if (timeout_ms-- <= 0) break; + WATCHDOG_RESET(); udelay(1000); } @@ -500,6 +502,8 @@ ulong mmc_bread(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt, blocks_todo -= cur; start += cur; dst += cur * mmc->read_bl_len; + + WATCHDOG_RESET(); } while (blocks_todo > 0); return blkcnt; -- 2.25.1

4 5

[PATCH] rpi: copy the eMMC controller configuration from firmware-supplied DT
by Jian-Hong Pan 27 Oct '22

27 Oct '22

From: Ilya Katsnelson <me(a)0upti.me> The RPi firmware adjusts the onboard eMMC controller's DMA mapping ranges of the FDT for each BCM2711 SoC revisions on the Pi 4 and RPi 400 automatically. If the following kernel does not boot with the correct eMMC controller's DMA mapping ranges, the system on the SD card will boot failed and show these error messages: mmc1: invalid bus width mmc1: error -22 whilst initialising SD card This patch carries the adjustment from RPi firmware to the new loaded FDT for the following kernel. Link: https://lists.denx.de/pipermail/u-boot/2021-September/462006.html Fixed: https://bugzilla.kernel.org/show_bug.cgi?id=213753 Signed-off-by: Ilya Katsnelson <me(a)0upti.me> Signed-off-by: Jian-Hong Pan <jhp(a)endlessos.org> --- The code of this patch comes from "[RFC PATCH] rpi: copy the EMMC controller configuration from firmware-supplied DT" [1] basically. I only add the message and some modifcation: * Fix the build failed error: board/raspberrypi/rpi/rpi.c: In function 'copy_emmc_config': board/raspberrypi/rpi/rpi.c:553:9: warning: dereferencing 'void *' pointer 553 | *fw_value = fdt_getprop(fw_fdt, fw_emmc_node, "dma-ranges", &length); | ^~~~~~~~~ board/raspberrypi/rpi/rpi.c:553:19: error: invalid use of void expression 553 | *fw_value = fdt_getprop(fw_fdt, fw_emmc_node, "dma-ranges", &length); | ^ make[1]: *** [scripts/Makefile.build:258: board/raspberrypi/rpi/rpi.o] Error 1 * Replace "EMMC" to "eMMC". * Replace the printf with log_[levels]. So, I keep "Ilya Katsnelson <me(a)0upti.me>" as the author. [1]: https://lists.denx.de/pipermail/u-boot/2021-September/462006.html board/raspberrypi/rpi/rpi.c | 63 +++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 00afb352bd..d7ff8e269e 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -504,6 +504,67 @@ void *board_fdt_blob_setup(int *err) return (void *)fw_dtb_pointer; } +void copy_emmc_config(void *our_fdt) +{ + /* + * As of 2021-09-28, the Pi 4 has two different revisions, one using a + * B0 stepping of the BCM2711 SoC, and one using a C0 stepping. + * + * The two SoC versions have different, incompatible DMA mappings for + * the on-board eMMC controller, which would normally make them require + * two different DTs. + * + * Unfortunately for us, the different revisions don't actually _use_ + * different DTs - instead, the proprietary stage0 bootloader reads the DT, + * patches it in-memory, then passes the corrected DT to the OS. + * + * In our case, the OS is actually U-Boot, and U-Boot can choose to + * completely disregard the firmware-supplied DT and load a custom one + * instead, which is used by, e.g., NixOS. + * + * When that happens, the DT patches applied by the firmware are also + * thrown out, which leads to BCM2711C0 boards being unable to boot + * due to them trying to use the hardcoded DMA mappings in the DT + * (which are for the B0 revision). + * + * Work around that by manually copying the DMA region setup from the + * firmware-provided DT into whatever DT we're actually being asked + * to load. + */ + void *fw_fdt = (void *)fw_dtb_pointer; + int fw_emmc_node; + int our_emmc_node; + int length; + const void *fw_value; + int result; + + fw_emmc_node = fdt_path_offset(fw_fdt, "emmc2bus"); + if (fw_emmc_node < 0) { + log_info("RPi: Failed to find eMMC config in FW DT: %d\n", fw_emmc_node); + return; + } + + our_emmc_node = fdt_path_offset(our_fdt, "emmc2bus"); + if (our_emmc_node < 0) { + log_info("RPi: Failed to find eMMC config in our DT: %d\n", our_emmc_node); + return; + } + + fw_value = fdt_getprop(fw_fdt, fw_emmc_node, "dma-ranges", &length); + if (!fw_value) { + log_info("RPi: Failed to get eMMC DMA ranges property from FW DT: %d\n", length); + return; + } + + result = fdt_setprop(our_fdt, our_emmc_node, "dma-ranges", fw_value, length); + if (result != 0) { + log_warning("RPi: Failed to set eMMC DMA ranges property in our DT: %d\n", result); + return; + } + + log_debug("RPi: successfully copied FW DT eMMC configuration to our DT!\n"); +} + int ft_board_setup(void *blob, struct bd_info *bd) { int node; @@ -518,5 +579,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) EFI_RESERVED_MEMORY_TYPE); #endif + copy_emmc_config(blob); + return 0; } -- 2.38.1

2 1

[PATCH v3 0/4] Update Microchip PolarFire SoC
by Padmarao Begari 27 Oct '22

27 Oct '22

This patch set updates Microchip PolarFire SoC Icicle Kit support of RISC-V U-Boot. The patches are based upon latest U-Boot tree (https://source.denx.de/u-boot/u-boot) at commit id 8bc87a4c55a1723728374a5643f13bced37dad6b The memory device node is updated based on the latest FPGA reference design v2022.10 and a small 4MB reservation is made at the end of 32-bit DDR to provide some memory for the HSS to use, add Microchip QSPI driver. Changes in v3: - Add reference design campatible in the device tree - Change QSPI time out value to 500ms(as per Linux) - Fix some typos Changes in v2: - Add Co-developed-by with patch - Replace spi-nand with flash in device node - Add board details for QSPI NAND - Rename QSPI driver file with microchip-coreqspi - Add microchip,coreqspi-rtl-v2 to the compatible list - Use MICROCHIP_COREQSPI instead of MICROCHIP_QSPI in kconfig Padmarao Begari (4): riscv: dts: Update memory configuration riscv: dts: Add QSPI NAND device node spi: Add Microchip PolarFire SoC QSPI driver riscv: Update Microchip MPFS Icicle Kit support arch/riscv/dts/microchip-mpfs-icicle-kit.dts | 91 ++-- board/microchip/mpfs_icicle/Kconfig | 7 + configs/microchip_mpfs_icicle_defconfig | 1 + drivers/spi/Kconfig | 6 + drivers/spi/Makefile | 1 + drivers/spi/microchip_coreqspi.c | 505 +++++++++++++++++++ 6 files changed, 553 insertions(+), 58 deletions(-) create mode 100644 drivers/spi/microchip_coreqspi.c -- 2.25.1

1 4

[PATCH v6 0/8] Add MV88E6xxx DSA driver and use on gwventana
by Tim Harvey 26 Oct '22

26 Oct '22

This series adds a DSA driver for the MV88E6xxx based on drivers/net/phy/mv88e61xx and uses it in the gwventana_gw5904_defconfig. The hope is that the other three boards that use the MV88E61xx driver can move to this as well eventually so that we can remove the non-dm driver and the 4 Kconfig options it requires. The MV88E6xxx has an MDIO interface thus DM_MDIO must be used so support for a UCLASS_MDIO driver is added to the fec_mxc ethernet driver in a way that allows a fallback to the previous non DM_MDIO case as there are many boards out there using this driver that define DM_MDIO but do not have the required dt props for a DM_MDIO driver which would cause a regression. Additionally some other patches are here suggested by Vladimir: - ensure MDIO children are scanned on post-bind is needed - sanity check DSA driver required ops are present - allow DSA drivers to not require xmit/recv functions - remove unecessary xmit/recv functions from ksz9477 driver v6: - update commit messages - squash accidently change to mv88e6xxx driver into previous patch - remove unused dt label for cpu port - removed unnecessary semicolon - update commit msg (s/MV88E61xx/MV88E6xxx) - remove GbE from commit msg and Kconfig desc - squash accidental change from patch 7 into patch 6 - added error print on failure to read switch id - mv88e6xxx_probe: - check for switch enabled - remove unused variable enabled - remove unnecessary call to dsa_set_tagging - port_probe: - new function to configure phy features by calling phy_config - port_enable: - only enable energy-detect sensing on phy ports - add phy/cmode verification mistmatch warning - remove mv88e6xxx_fixed_port_setup() - always force link up for fixed ports - always set SERDES mode regardless of cpu port - remove unnecessary setting of CPUDEST - port_disable: - remove pointless error check - removed unnecessary priv data for mdio controller - fix indentation - change variable name for clarity v5: - fix typo in defconfig update - added support for MV88E6320 - added Fabio's rb tag v4: - use standard Linux internal MDIO dt structure - use PHY_FIXED_ID define - rename to mv88e6xxx - sort includes alphabetically - remove dsa term from function names - reduce indentation level and remove unecessary code in of probe_mdio function - rename pdev to mdev to represent mdio device v3: - fix mdios node in dt - add Vladimir's rb tag's v2: - added Ramon's rb tag's to first two patches - add patches for dsa-uclass to sanity check ops and make xmit/recv optional - fec: fix fallback for non conforming DM_MDIO dts - mv88e61xx: - rebase on v2022.07-rc2 (use ofnode_get_phy_node) - remove unused commented out fields from struct - remove unused PORT_MASK macro - remove phy from priv struct name - refactor code from original drivers/net/phy/mv88e61xx with suggestions from review to consolidate some functions into mv88e61xx_dsa_port_enable - remove unecessary skiping of disabling of CPU port - remove unecessary dev_set_parent_priv - remove unnecessary static init flag - replace debug with a dev_warn if switch device-id unsupported - remove unnecessary xmit/recv functions as we rely on the fact that only a single port is active instead of mangling packets Tested on a Gateworks GW5904 which has a Marvell 88E6176 switch hanging off the IMX6 FEC. Best Regards, Tim Tim Harvey (8): net: mdio-uclass: scan for dm mdio children on post-bind net: dsa: move cpu port probe to dsa_post_probe net: dsa: ensure dsa driver has proper ops net: dsa: allow rcv() and xmit() to be optional net: ksz9477: remove unnecessary xmit and recv functions net: fec: add support for DM_MDIO net: add MV88E61xx DSA driver board: gw_ventana: enable MV88E61XX DSA support arch/arm/dts/imx6qdl-gw5904.dtsi | 32 +- board/gateworks/gw_ventana/gw_ventana.c | 50 +- configs/gwventana_gw5904_defconfig | 7 +- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/fec_mxc.c | 90 ++- drivers/net/ksz9477.c | 23 - drivers/net/mv88e6xxx.c | 832 ++++++++++++++++++++++++ net/dsa-uclass.c | 55 +- net/mdio-uclass.c | 4 + 10 files changed, 1029 insertions(+), 72 deletions(-) create mode 100644 drivers/net/mv88e6xxx.c -- 2.25.1

3 14

[PATCH] test: Move to a working version of setuptools
by Simon Glass 26 Oct '22

26 Oct '22

The version used on Ubuntu 2022.04 produces a number of warnings: /usr/lib/python3/dist-packages/pkg_resources/__init__.py:116: PkgResourcesDeprecationWarning: 1.16.0-unknown is an invalid version and will not be supported in a future release Same with: 0.1.43ubuntu1 11.4.1ubuntu1 2.22.1ubuntu1 1.1build1 According to [1] this is a bug in setuptools. Employ the workaround for now. [1] https://askubuntu.com/questions/1406952/what-is-the-meaning-of-this- pkgresourcesdeprecationwarning-warning-from-pipenv Signed-off-by: Simon Glass <sjg(a)chromium.org> --- test/py/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/py/requirements.txt b/test/py/requirements.txt index 1bf77b59d84..fae8b59caf4 100644 --- a/test/py/requirements.txt +++ b/test/py/requirements.txt @@ -20,6 +20,7 @@ pytest-xdist==2.5.0 python-mimeparse==1.6.0 python-subunit==1.3.0 requests==2.25.1 +setuptools==58.3.0 six==1.12.0 testtools==2.3.0 traceback2==1.4.0 -- 2.38.0.135.g90850a2211-goog

2 1

[PATCH v2] mkimage: fit: Fix signing of configs with external data
by Sean Anderson 26 Oct '22

26 Oct '22

Just like we exclude data-size, data-position, and data-offset from fit_config_check_sig, we must exclude them while signing as well. While we're at it, use the FIT_DATA_* defines for fit_config_check_sig as welll. Fixes: 8edecd3110e ("fit: Fix verification of images with external data") Fixes: c522949a29d ("rsa: sig: fix config signature check for fit with padding") Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- Changes in v2: - Use FIT_DATA_* defines boot/image-fit-sig.c | 8 ++++---- tools/image-host.c | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/boot/image-fit-sig.c b/boot/image-fit-sig.c index a461d591a0e..12369896fe3 100644 --- a/boot/image-fit-sig.c +++ b/boot/image-fit-sig.c @@ -260,10 +260,10 @@ static int fit_config_check_sig(const void *fit, int noffset, int conf_noffset, char **err_msgp) { static char * const exc_prop[] = { - "data", - "data-size", - "data-position", - "data-offset" + FIT_DATA_PROP, + FIT_DATA_SIZE_PROP, + FIT_DATA_POSITION_PROP, + FIT_DATA_OFFSET_PROP, }; const char *prop, *end, *name; diff --git a/tools/image-host.c b/tools/image-host.c index 698adfb3e1d..4a4e1c10d1e 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -917,7 +917,12 @@ static int fit_config_get_regions(const void *fit, int conf_noffset, int *region_countp, char **region_propp, int *region_proplen) { - char * const exc_prop[] = {"data"}; + char * const exc_prop[] = { + FIT_DATA_PROP, + FIT_DATA_SIZE_PROP, + FIT_DATA_POSITION_PROP, + FIT_DATA_OFFSET_PROP, + }; struct strlist node_inc; struct image_region *region; struct fdt_region fdt_regions[100]; -- 2.35.1.1320.gc452695387.dirty

3 2

[u-boot][PATCH v3 0/4] Introduce MEMORY uclass and TI GPMC driver
by Roger Quadros 26 Oct '22

26 Oct '22

Hi, This series introduces the MEMORY controller uclass for the drivers that exist in drivers/memory directory. With that, we add the TI GPMC Memory controller driver as the first user of this uclass. The GPMC is a unified memory controller dedicated for interfacing with external memory devices like - Asynchronous SRAM-like memories and ASICs - Asynchronous, synchronous, and page mode burst NOR flash - NAND flash - Pseudo-SRAM devices The driver is pulled straight from the Linux kernel and adapted for u-boot. This driver will take care of setting up the GPMC based on the settings specified in the Device tree and then probe its children. cheers, -roger Changelog: v3: - Use CONFIG_MEMORY instead of CONFIG_DM_MEMORY - Introduce CONFIG_SPL_MEMORY and use it to gate inclusion of of drivers/memory for SPL build - Make TI_GPMC depend on OF_CONTROL and CLK as well v2: - Introduce MEMORY uclass Roger Quadros (4): dm: memory: Introduce new uclass scripts: Makefile.spl: Enable memory drivers to be built for SPL dt/bindings: memory: Add bindings for TI GPMC driver memory: Add TI GPMC driver arch/sandbox/dts/test.dts | 4 + common/spl/Kconfig | 7 + .../memory/ti,gpmc-child.yaml | 252 ++++ doc/device-tree-bindings/memory/ti,gpmc.yaml | 190 +++ drivers/memory/Kconfig | 36 + drivers/memory/Makefile | 3 + drivers/memory/memory-sandbox.c | 18 + drivers/memory/memory-uclass.c | 13 + drivers/memory/ti-gpmc.c | 1240 +++++++++++++++++ drivers/memory/ti-gpmc.h | 298 ++++ include/dm/uclass-id.h | 1 + include/linux/mtd/omap_gpmc.h | 3 + scripts/Makefile.spl | 1 + test/dm/Makefile | 1 + test/dm/memory.c | 21 + 15 files changed, 2088 insertions(+) create mode 100644 doc/device-tree-bindings/memory/ti,gpmc-child.yaml create mode 100644 doc/device-tree-bindings/memory/ti,gpmc.yaml create mode 100644 drivers/memory/memory-sandbox.c create mode 100644 drivers/memory/memory-uclass.c create mode 100644 drivers/memory/ti-gpmc.c create mode 100644 drivers/memory/ti-gpmc.h create mode 100644 test/dm/memory.c -- 2.17.1

3 9

[PATCH] crypto: hash: sw: fix Kconfig dependencies
by Benjamin Bara 26 Oct '22

26 Oct '22

From: Benjamin Bara <Benjamin.Bara(a)skidata.com> Fix SHA512 config name and add missing SHA384 config. Signed-off-by: Benjamin Bara <Benjamin.Bara(a)skidata.com> --- drivers/crypto/hash/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/hash/Kconfig b/drivers/crypto/hash/Kconfig index bf9540eca6..aa355c44be 100644 --- a/drivers/crypto/hash/Kconfig +++ b/drivers/crypto/hash/Kconfig @@ -10,7 +10,8 @@ config HASH_SOFTWARE depends on MD5 depends on SHA1 depends on SHA256 - depends on SHA512_ALGO + depends on SHA384 + depends on SHA512 help Enable driver for hashing operations in software. Currently it support multiple hash algorithm including CRC/MD5/SHA. -- 2.34.1

2 1

[PATCH 0/3] Clarify standalone application support
by Paul Barker 26 Oct '22

26 Oct '22

While looking into the support for u-boot standalone applications I noticed that there was some mis-alignment between the license exception and the files which needed to be included to get a functioning application. I also noticed that the set of SPI access functions defined in the jump table was missing a key function and did not match the set of prototypes defined in the exports header. These patches should rectify the issues I found. Paul Barker (3): Licenses: Clarify exceptions for standalone apps examples: hello_world: Drop inclusion of common header exports: Fix export of SPI access functions Licenses/Exceptions | 12 ++++++++---- examples/standalone/hello_world.c | 1 - include/_exports.h | 4 ++++ include/exports.h | 15 ++++++++++++++- 4 files changed, 26 insertions(+), 6 deletions(-) -- 2.25.1

3 11

[PATCH v2] spl: spl_legacy: Fix NAND boot on OMAP3 BeagleBoard
by Roger Quadros 26 Oct '22

26 Oct '22

OMAP3 BeagleBoard NAND boot hangs when spl_load_legacy_img() tries to read the header into 'struct hdr' which is allocated on the stack. As the header has already been read once before by spl_nand.c, we can avoid the extra header allocation and read here by simply passing around the pointer to the header. This fixes NAND boot on OMAP3 BeagleBoard. Signed-off-by: Roger Quadros <rogerq(a)kernel.org> Reviewed-By: Michael Trimarchi <michael(a)amarulasolutions.com> --- Changelog: v2: - Explained that extra allocation is avoided in commit message common/spl/spl_legacy.c | 19 ++++++++----------- common/spl/spl_nand.c | 2 +- common/spl/spl_nor.c | 6 +++++- include/spl.h | 7 +++++-- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c index ae8731c782..2e9226c990 100644 --- a/common/spl/spl_legacy.c +++ b/common/spl/spl_legacy.c @@ -77,32 +77,29 @@ static inline int spl_image_get_comp(const struct image_header *hdr) int spl_load_legacy_img(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, - struct spl_load_info *load, ulong header) + struct spl_load_info *load, ulong offset, + struct image_header *hdr) { __maybe_unused SizeT lzma_len; __maybe_unused void *src; - struct image_header hdr; ulong dataptr; int ret; - /* Read header into local struct */ - load->read(load, header, sizeof(hdr), &hdr); - /* * If the payload is compressed, the decompressed data should be * directly write to its load address. */ - if (spl_image_get_comp(&hdr) != IH_COMP_NONE) + if (spl_image_get_comp(hdr) != IH_COMP_NONE) spl_image->flags |= SPL_COPY_PAYLOAD_ONLY; - ret = spl_parse_image_header(spl_image, bootdev, &hdr); + ret = spl_parse_image_header(spl_image, bootdev, hdr); if (ret) return ret; /* Read image */ - switch (spl_image_get_comp(&hdr)) { + switch (spl_image_get_comp(hdr)) { case IH_COMP_NONE: - dataptr = header; + dataptr = offset; /* * Image header will be skipped only if SPL_COPY_PAYLOAD_ONLY @@ -119,7 +116,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image, lzma_len = LZMA_LEN; /* dataptr points to compressed payload */ - dataptr = header + sizeof(hdr); + dataptr = offset + sizeof(hdr); debug("LZMA: Decompressing %08lx to %08lx\n", dataptr, spl_image->load_addr); @@ -143,7 +140,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image, default: debug("Compression method %s is not supported\n", - genimg_get_comp_short_name(image_get_comp(&hdr))); + genimg_get_comp_short_name(image_get_comp(hdr))); return -EINVAL; } diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 7b7579a2df..5eb67b5468 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -119,7 +119,7 @@ static int spl_nand_load_element(struct spl_image_info *spl_image, load.bl_len = 1; load.read = spl_nand_legacy_read; - return spl_load_legacy_img(spl_image, bootdev, &load, offset); + return spl_load_legacy_img(spl_image, bootdev, &load, offset, header); } else { err = spl_parse_image_header(spl_image, bootdev, header); if (err) diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 7986e930d2..f00a5c395b 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -111,10 +111,14 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, /* Legacy image handling */ if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_FORMAT)) { + struct image_header hdr; + load.bl_len = 1; load.read = spl_nor_load_read; + spl_nor_load_read(&load, spl_nor_get_uboot_base(), sizeof(hdr), &hdr); return spl_load_legacy_img(spl_image, bootdev, &load, - spl_nor_get_uboot_base()); + spl_nor_get_uboot_base(), + &hdr); } return 0; diff --git a/include/spl.h b/include/spl.h index aac6648f94..7fa5e51c39 100644 --- a/include/spl.h +++ b/include/spl.h @@ -353,7 +353,8 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, * spl_load_legacy_img() - Loads a legacy image from a device. * @spl_image: Image description to set up * @load: Structure containing the information required to load data. - * @header: Pointer to image header (including appended image) + * @offset: Pointer to image + * @hdr: Pointer to image header * * Reads an legacy image from the device. Loads u-boot image to * specified load address. @@ -361,7 +362,9 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, */ int spl_load_legacy_img(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, - struct spl_load_info *load, ulong header); + struct spl_load_info *load, ulong offset, + struct image_header *hdr); + /** * spl_load_imx_container() - Loads a imx container image from a device. -- 2.17.1

2 1