Hi Tom, On 07/01/21 7:41 pm, Tom Rini wrote: > On Thu, Jan 07, 2021 at 11:20:41AM +0530, Lokesh Vutla wrote: > >> Hi Tom, >> Please find the PR for next branch targeted for v2021.04 release. >> Details about the PR are updated in the tag message. >> >> Gitlab build report: >> https://gitlab.denx.de/u-boot/custodians/u-boot-ti/-/pipelines/5778 >> >> The following changes since commit c15f44acf9d473f4682bfdc63b8aebd313492b15: >> >> Prepare v2021.01-rc4 (2020-12-21 15:03:24 -0500) >> >> are available in the Git repository at: >> >> https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git >> tags/ti-v2021.04-next > > The PR doesn't apply cleanly now in a few cases, can you take a look at > drivers/video/ti/am335x-fb.c and test/dm/test-fdt.c?
I am based on top of rc4. Any specific base you would prefer for next branch PR? > >> for you to fetch changes up to feff9fd0d893067bdc2e08969b5c916d10e9fc12: >> >> remoteproc: ti_k3_arm64: Program CNTFID0 register in GTC (2021-01-07 >> 09:55:34 +0530) > [snip] >> Pali Rohár (3): >> Nokia RX-51: Convert to CONFIG_DM_MMC > > This is also bringing up a conflict, and I think part of the real > problem is that we shouldn't be having a single U_BOOT_DRVINFOS > (formerly U_BOOT_DEVICES) but one per peripheral. It may work but it's > not intentional (adding Simon in case he wants to correct me here). > Thanks and regards, Lokesh > Thanks! >
