Hi Jonas,
On 2023/5/10 14:48, Jonas Karlman wrote:
Looks like the following two commits in your enablement efforts tree may be a source of some of these dependency conflicts.
- rockchip: rk3588-rock-5b: Add spi nor flash node
- ARM: dts: rockchip: rk3588-rock-5b-u-boot: enable SPI flash in SPL
Those commits should come after all your pending series, same/similar commits are included in this defconfig/spinor series, series that I have tried to base on top of your series 😄
I will rebase my series on top of rockchip U-Boot Custodian Tree master and Eugen's series.
I had some time over and prepared a rebase branch with the following series from Eugen:
[2/2] reset: rockchip: implement rk3588 lookup table https://patchwork.ozlabs.org/project/uboot/patch/20230413113646.261415-2-eug...
[v5,1/6] ARM: dts: rockchip: rk3588-rock-5b-u-boot: add USB 2.0 host https://patchwork.ozlabs.org/project/uboot/list/?series=351534
[v3,1/2] ARM: dts: rk3588-rock-5b-u-boot: add bootph-all to pinctrl for sdmmc https://patchwork.ozlabs.org/project/uboot/list/?series=351078
[v3,1/7] pci: pcie_dw_rockchip: Add rk3588 compatible https://patchwork.ozlabs.org/project/uboot/list/?series=352596
This patch set will need a rebase due to conflict since 0005.
And on top of those my series:
rockchip: rk35xx: Update defconfigs and enable boot from SPI NOR flash https://patchwork.ozlabs.org/project/uboot/list/?series=351973
Conflict since 0008 rockchip: rk3568-rock-3a: Enable boot from SPI NOR flash
rockchip: Fix eMMC performance regression https://patchwork.ozlabs.org/project/uboot/list/?series=353826
Conflict for configs/rock-pi-4-rk3399_defconfig in 0004 rockchip: rock-pi-4: Use SDMA to boost eMMC performance
Please send the update, maybe after new version "pci: pcie_dw_rockchip: Add rk3588 compatible" from Eugen.
I have apply part of these patches for the driver is fine and conflict only happen in dts level. Will apply new version
if available.
Thanks,
- Kever
I think that should be the correct apply order.
The rebase branch can be found at: https://github.com/Kwiboo/u-boot-rockchip/commits/rebase-20230510a
I will hold off on sending out my v2 series until Eugen have had a chance to finalize and send out his series 😄