From: Tom Rini <trini@konsulko.com>
Date: Thu, 20 Jan 2022 17:40:20 +0000 (-0500)
Subject: Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=2d7a463e82daeba4f6a7fb59bac0fe94d6f6d3a2;p=u-boot.git

Merge https://source.denx.de/u-boot/custodians/u-boot-marvell

- fdt_support: Add fdt_for_each_node_by_compatible() helper macro
  (Marek)
- turris_omnia: Fixup SATA or PCIe nodes at runtime in DT blob (Pali)
- pci_mvebu: Add support for Kirkwood PCIe controllers (Pali)
- SPL: More verifications for kwbimage in SPL (Pali)
- mvebu: Remove comphy_update_map() (Pali)
- Minor misc stuff
---

2d7a463e82daeba4f6a7fb59bac0fe94d6f6d3a2
diff --cc include/spl.h
index 9fc5ac61f8,469e7fe1cc..8748497bc1
--- a/include/spl.h
+++ b/include/spl.h
@@@ -435,9 -437,10 +437,10 @@@ void spl_set_header_raw_uboot(struct sp
   *
   * @spl_image: Image description to set up
   * @header image header to parse
 - * @return 0 if a header was correctly parsed, -ve on error
 + * Return: 0 if a header was correctly parsed, -ve on error
   */
  int spl_parse_image_header(struct spl_image_info *spl_image,
+ 			   const struct spl_boot_device *bootdev,
  			   const struct image_header *header);
  
  void spl_board_prepare_for_linux(void);