diff options
| author | Tom Rini <[email protected]> | 2025-02-06 08:09:54 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-02-06 08:09:54 -0600 |
| commit | c2e00482d0058908014014b1c703e0eaaf1490d7 (patch) | |
| tree | dd7fee96b40ca0d97d9ad8d7fff490d1daf611c9 /include | |
| parent | b3c09eb36529fbb277bec17b35e638f42cb33683 (diff) | |
| parent | 0f019056b2d23aaa839fab31c016d73009870a23 (diff) | |
Merge tag 'xilinx-for-v2025.04-rc2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
AMD/Xilinx changes for v2025.04-rc2
fpga:
- Cleanup help
- Show xilinx only options on Xilinx devices
ospi-versal:
- Fix alignment issue
- Fix cadence_qspi_flash_reset() prototype
zynqmp:
- Define usb_pgood_delay
- Fix bootseq number
versal:
- Fix mini_ospi configuration
versal2:
- Enable OPTEE
xilinx:
- Enable some flashes
- Clean up SYS_MALLOC_F_LEN Kconfig
- Some binman fixes
- DT updates
- Enable mkfwumdata compilation
- Enable meminfo command
- Switch to LWIP and enable HTTPS
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 1 | ||||
| -rw-r--r-- | include/fpga.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index bb0db7c5ca3..13941ba3589 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -179,6 +179,7 @@ #ifndef CFG_EXTRA_ENV_SETTINGS #define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ + "usb_pgood_delay=1000\0" \ BOOTENV #endif diff --git a/include/fpga.h b/include/fpga.h index 44f2755a3f1..4cc44164b2f 100644 --- a/include/fpga.h +++ b/include/fpga.h @@ -58,7 +58,7 @@ typedef enum { void fpga_init(void); int fpga_add(fpga_type devtype, void *desc); int fpga_count(void); -const fpga_desc *const fpga_get_desc(int devnum); +const fpga_desc *fpga_get_desc(int devnum); int fpga_is_partial_data(int devnum, size_t img_len); #if CONFIG_IS_ENABLED(FPGA) int fpga_load(int devnum, const void *buf, size_t bsize, @@ -78,8 +78,8 @@ int fpga_loadbitstream(int devnum, char *fpgadata, size_t size, bitstream_type bstype); int fpga_dump(int devnum, const void *buf, size_t bsize); int fpga_info(int devnum); -const fpga_desc *const fpga_validate(int devnum, const void *buf, - size_t bsize, char *fn); +const fpga_desc *fpga_validate(int devnum, const void *buf, + size_t bsize, char *fn); int fpga_compatible2flag(int devnum, const char *compatible); #endif /* _FPGA_H_ */ |