]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge tag 'u-boot-rockchip-20231007' of https://source.denx.de/u-boot/custodians...
authorTom Rini <trini@konsulko.com>
Sun, 8 Oct 2023 13:58:55 +0000 (09:58 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 8 Oct 2023 13:58:55 +0000 (09:58 -0400)
- 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>
1  2 
common/spl/spl_fit.c
include/spl.h

Simple merge
diff --cc include/spl.h
index a222db9c559566e0e9805a8c678537b63047c038,f62f385afaf611e5a21e099a5627e8740bc92bbb..f713363f8cd5b556f2205954703dcc38449f296e
@@@ -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