From: Tom Rini <trini@konsulko.com>
Date: Sun, 8 Oct 2023 13:58:55 +0000 (-0400)
Subject: Merge tag 'u-boot-rockchip-20231007' of https://source.denx.de/u-boot/custodians... 
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=d9bb6d779b69c2548891e568e5e2a23e1b7eedaa;p=u-boot.git

Merge tag 'u-boot-rockchip-20231007' of https://source.denx.de/u-boot/custodians/u-boot-rockchip

- Add Board: rk3568 Bananapi R2Pro;
- Update pcie bifurcation support;
- dwc_eth_qos controller support for rk3568 and rk3588;
- Compressed binary support for U-Boot on rockchip platform;
- dts and config updates for different board and soc;

[ trini: Fix conflict on include/spl.h ]
Signed-off-by: Tom Rini <trini@konsulko.com>
---

d9bb6d779b69c2548891e568e5e2a23e1b7eedaa
diff --cc include/spl.h
index a222db9c55,f62f385afa..f713363f8c
--- a/include/spl.h
+++ b/include/spl.h
@@@ -921,14 -898,13 +921,23 @@@ struct legacy_img_hdr *spl_get_load_buf
  void board_boot_order(u32 *spl_boot_list);
  void spl_save_restore_data(void);
  
 +/**
 + * spl_load_fit_image() - Fully parse and a FIT image in SPL
 + *
 + * @spl_image: SPL Image data to fill in
 + * @header: Pointer to FIT image
 + * Return 0 if OK, -ve on error
 + */
 +int spl_load_fit_image(struct spl_image_info *spl_image,
 +		       const struct legacy_img_hdr *header);
 +
+ /*
+  * spl_decompression_enabled() - check decompression support is enabled for SPL build
+  *
+  * Returns  true  if decompression support is enabled, else False
+  */
+ static inline bool spl_decompression_enabled(void)
+ {
+ 	return IS_ENABLED(CONFIG_SPL_GZIP) || IS_ENABLED(CONFIG_SPL_LZMA);
+ }
  #endif