diff options
| author | Tom Rini <[email protected]> | 2022-11-22 12:33:48 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-11-22 12:33:48 -0500 |
| commit | 521277ec15eb794229403ec24b8c00a4ff02b0b6 (patch) | |
| tree | 7eb2da32590f4c48bc9e2ef8cde5ae85c3d9e7bf /board | |
| parent | 536c642ffef545b4b5b02d065a0c1de9785549d7 (diff) | |
| parent | 3655dd22a4c219d0ee69dc4a29e5553c1a1bb5d7 (diff) | |
Merge tag 'xilinx-for-v2023.01-rc3' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2023.01-rc3
microblaze:
- Enable 32 bit addressing mode for SPIs
zynq:
- Minor DT fixes (PL clock enabling)
zynqmp:
- Disable watchdog by default
- Remove unused xlnx,eeprom chosen support
- Add missing symlink for vck190 SC revB
- Use mdio bus with ethernet-phy-id description
versal:
- Add mini qspi/ospi configuration
versal-net:
- Add soc driver
- Fix Kconfig entry for SOC
- Fix loading address location for MINI configuration
- Disable LMB for mini configuration
net:
- Fix ethernet-phy-id usage in the code
pinctrl:
- Revert high impedance/output enable support
timer:
- Fix timer relocation for Microblaze
- Fix timer wrap in 32bit Xilinx timer driver
Diffstat (limited to 'board')
| -rw-r--r-- | board/xilinx/common/board.c | 28 | ||||
| l--------- | board/xilinx/zynqmp/zynqmp-e-a2197-00-revB | 1 |
2 files changed, 1 insertions, 28 deletions
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 99fdbac639b..59d87f23520 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -54,34 +54,6 @@ struct efi_capsule_update_info update_info = { u8 num_image_type_guids = ARRAY_SIZE(fw_images); #endif /* EFI_HAVE_CAPSULE_SUPPORT */ -#if defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET) -int zynq_board_read_rom_ethaddr(unsigned char *ethaddr) -{ - int ret = -EINVAL; - struct udevice *dev; - ofnode eeprom; - - eeprom = ofnode_get_chosen_node("xlnx,eeprom"); - if (!ofnode_valid(eeprom)) - return -ENODEV; - - debug("%s: Path to EEPROM %s\n", __func__, - ofnode_read_chosen_string("xlnx,eeprom")); - - ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, eeprom, &dev); - if (ret) - return ret; - - ret = dm_i2c_read(dev, CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET, ethaddr, 6); - if (ret) - debug("%s: I2C EEPROM MAC address read failed\n", __func__); - else - debug("%s: I2C EEPROM MAC %pM\n", __func__, ethaddr); - - return ret; -} -#endif - #define EEPROM_HEADER_MAGIC 0xdaaddeed #define EEPROM_HDR_MANUFACTURER_LEN 16 #define EEPROM_HDR_NAME_LEN 16 diff --git a/board/xilinx/zynqmp/zynqmp-e-a2197-00-revB b/board/xilinx/zynqmp/zynqmp-e-a2197-00-revB new file mode 120000 index 00000000000..15ccce3fd24 --- /dev/null +++ b/board/xilinx/zynqmp/zynqmp-e-a2197-00-revB @@ -0,0 +1 @@ +zynqmp-e-a2197-00-revA
\ No newline at end of file |