diff options
| author | Tom Rini <trini@konsulko.com> | 2025-08-25 10:06:03 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-08-25 10:06:03 -0600 |
| commit | 4a7ae028f8602658f729f5d0b3ae51afaab74cd7 (patch) | |
| tree | 5baeb82cfc6aa679e303a30d32e03979341f0d49 /drivers/fpga/altera.c | |
| parent | 7d879baa6f7ca201bcecff74f2a7545560289280 (diff) | |
| parent | 37aee09d83863cf7fecb67f0f0eeea18e03a43ea (diff) | |
Merge tag 'xilinx-for-v2025.10-rc3' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
AMD/Xilinx/FPGA changes for v2025.10-rc3
Fix smatch issues in zynqmp ipi and pinctrl drivers
zynqmp:
- Add missing zu1cg device
- Add missing ethernet alias for kr260-revB
- Define empty BOOTENV_DEV_SHARED_XSPI macro
fpga:
- Address reported coverity issues
net:
- axi_emac: Fix timeout test
versal2:
- Define usb_pgood_delay for fix device detection
Diffstat (limited to 'drivers/fpga/altera.c')
| -rw-r--r-- | drivers/fpga/altera.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c index 64fda3a307c..4a9aa74357e 100644 --- a/drivers/fpga/altera.c +++ b/drivers/fpga/altera.c @@ -28,10 +28,7 @@ static const struct altera_fpga { int (*dump)(Altera_desc *, const void *, size_t); int (*info)(Altera_desc *); } altera_fpga[] = { -#if defined(CONFIG_FPGA_ACEX1K) - { Altera_ACEX1K, "ACEX1K", ACEX1K_load, ACEX1K_dump, ACEX1K_info }, - { Altera_CYC2, "ACEX1K", ACEX1K_load, ACEX1K_dump, ACEX1K_info }, -#elif defined(CONFIG_FPGA_CYCLON2) +#if defined(CONFIG_FPGA_CYCLON2) { Altera_ACEX1K, "CycloneII", CYC2_load, CYC2_dump, CYC2_info }, { Altera_CYC2, "CycloneII", CYC2_load, CYC2_dump, CYC2_info }, #endif |