| Message ID | b3f2a1e3-8f05-7efb-1fc7-aa36952412ce@monstr.eu |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [GIT,PULL] xilinx patches for v2021.04 | expand |
On Tue, Jan 05, 2021 at 02:41:27PM +0100, Michal Simek wrote: > Hi Tom, > > please pull these patches for 2021.04 release. I tried it merge it with > your next branch and I see some merge conflict but not with my patches > that's why I expect you will be dealing with it self. > > Thanks, > Michal > > > The following changes since commit 21e1cae7902e6a9b1d7cf47cf4764e6fe7d3452a: > > Merge tag 'efi-2021-01-rc5-2' of > https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-12-29 10:23:58 > -0500) > > are available in the Git repository at: > > git@gitlab.denx.de:u-boot/custodians/u-boot-microblaze.git > tags/xilinx-for-v2021.04 > > for you to fetch changes up to 0109db1cd1e63b35c1c84d6bc2ccaa26aa6b7ce3: > > xilinx: Fill git repository for Xilinx boards (2021-01-05 11:54:53 +0100) > Applied to u-boot/next, thanks!
Hi Tom, please pull these patches for 2021.04 release. I tried it merge it with your next branch and I see some merge conflict but not with my patches that's why I expect you will be dealing with it self. Thanks, Michal The following changes since commit 21e1cae7902e6a9b1d7cf47cf4764e6fe7d3452a: Merge tag 'efi-2021-01-rc5-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2020-12-29 10:23:58 -0500) are available in the Git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2021.04 for you to fetch changes up to 0109db1cd1e63b35c1c84d6bc2ccaa26aa6b7ce3: xilinx: Fill git repository for Xilinx boards (2021-01-05 11:54:53 +0100) ---------------------------------------------------------------- Xilinx changes for v2021.04 arm64: - DT updates microblaze: - Add support for NOR device support spi: - Fix unaligned data write issue nand: - Minor code change xilinx: - Fru fix in limit calculation - Fill git repo link for all Xilinx boards video: - Add support for seps525 spi display tools: - Minor Vitis file support cmd/common - Minor code indentation fixes serial: - Uartlite debug uart initialization fix ---------------------------------------------------------------- Adrian Fiergolski (1): tools: zynqmp: Fix regex expression around XPm_ConfigObject Ashok Reddy Soma (1): serial: uartlite: Fix uninitialized ret in debug uartlite Harini Katakam (1): arm64: zynqmp: Add Ethernet node for zcu1285 revA Heinrich Schuchardt (2): zynq: mtd: nand: remove superfluous if fru: ops: avoid out of bounds access Michal Simek (9): cmd: load: Fix code indentation common: usb_storage: Fix code indentation arm64: zynqmp: Sync DT with Linux kernel video: Fix video sync kernel-doc format video: Let video_sync to return error value video: Introduce video_sync operation video: seps525: Add seps525 SPI driver video: Call video_sync in video_clear() xilinx: Fill git repository for Xilinx boards Siva Durga Prasad Paladugu (1): arm64: zynqmp: Add ethernet node for zcu1275 revB T Karthik Reddy (3): microblaze: Set script_offset_nor env variable microblaze: Add nor device to distro boot spi: zynqmp_gqspi: Fix unaligned data writes issue Vikhyat Goyal (1): video: seps525: Add dt binding description MAINTAINERS | 2 + arch/arm/dts/zynqmp-zcu1275-revB.dts | 24 +++++++++++ arch/arm/dts/zynqmp-zcu1285-revA.dts | 23 +++++++++++ arch/arm/dts/zynqmp.dtsi | 61 +++++++++++++--------------- board/xilinx/common/fru_ops.c | 2 +- board/xilinx/microblaze-generic/MAINTAINERS | 1 + board/xilinx/microblaze-generic/microblaze-generic.c | 5 ++- board/xilinx/versal/MAINTAINERS | 1 + board/xilinx/zynq/MAINTAINERS | 1 + board/xilinx/zynqmp/MAINTAINERS | 1 + cmd/load.c | 9 ++--- common/usb_storage.c | 4 +- doc/device-tree-bindings/video/syncoam,seps525.txt | 24 +++++++++++ drivers/mtd/nand/raw/zynq_nand.c | 10 ++--- drivers/serial/serial_xuartlite.c | 2 +- drivers/spi/zynqmp_gqspi.c | 6 +-- drivers/video/Kconfig | 7 ++++ drivers/video/Makefile | 1 + drivers/video/seps525.c | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/video/vidconsole-uclass.c | 40 +++++++++++++------ drivers/video/video-uclass.c | 23 +++++++++-- drivers/video/video_bmp.c | 5 +-- include/configs/microblaze-generic.h | 17 +++++++- include/video.h | 22 ++++++++--- tools/zynqmp_pm_cfg_obj_convert.py | 2 +- 25 files changed, 540 insertions(+), 80 deletions(-) create mode 100644 doc/device-tree-bindings/video/syncoam,seps525.txt create mode 100644 drivers/video/seps525.c