Skip to content

Instantly share code, notes, and snippets.

@nmenon

nmenon/upstream-sync.md Secret

Last active April 10, 2023 16:50
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save nmenon/030b11b085473fa008145429b39fcc75 to your computer and use it in GitHub Desktop.
Save nmenon/030b11b085473fa008145429b39fcc75 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
upstream-sync.md

Current situation:

Upstream U-boot Vs Upstream kernel.org dts diff: https://gist.github.com/nmenon/7fd543d2181234d47e676a8c3ab6c9d9 is a mess. At this point, I cant see a clean way to get things back in sync.

  • Stage 1: First we need to clean this up and set up a process
  • Stage 2: Then we can add new stuff or fix broken stuff.

Cleanup Steps:

Hence I propose the following to cleanup:

  • Sync with closest kernel tag v6.3-rc2 to final formal tag say v6.3 - this will cause a bunch of build breakage and boot fails - nodes that are'nt there in k.org master will be deleted, hence will loose support https://github.com/nmenon/fix-k3-dt-u-boot - https://github.com/nmenon/fix-k3-dt-u-boot/commits/fix-k3-dts is a temporary hosting for the patches.
  • Then: Fix up breakages - nodes not in k.org gets descoped - I need help from various teams here - to help (without touching common files), build breakages as maybe present - best will be to split up one engineer per SoC to crowdsource the soln.
  • Then: We have to migrate over to the new dt-schema defined properties to get rid of u-boot-spl properties with bootph-* properties - This needs to happen in k.org first then backport dropping the u-boot-spl properties with corresponding upstream properties.
  • Then:
    • We introduce descoped nodes into k.org and sync k.org back to u-boot
    • We introduce new platforms into k.org and then sync k.org back to u-boot

In the meanwhile:

  • No .dtsi/.dts patches will be accepted by Tom.

Going Forward Steps:

Stage 2: Once this is all complete: SoC.dtsi:

  • SoC.dtsi file fixes will NOT be accepted by Tom.
  • SoC.dtsi modifications always comes in via k.org

Board support:

  • Board support dts should be provided "ASIS" from the last synced k.org tag.
  • No modification to Board support dts will be permitted, and just sync from k.org dts at formal tag will happen.

Timing:

  • v6.x-rc2 to v6.x kernel version ONLY. NOT linux-next code or anything in an intermediate commit.
  • u-boot sync with k.org dtsi/dts will occur ONLY at YYY.MM-rc1 point. never after.

Current status

https://github.com/nmenon/fix-k3-dt-u-boot/commits/fix-k3-dts

  • am62ax_evm_a53_defconfig -> Builds OK

  • am62ax_evm_r5_defconfig -> Builds OK

  • am62x_evm_a53_defconfig -> Builds OK

  • am62x_evm_r5_defconfig -> Builds OK

  • am64x_evm_a53_defconfig -> Builds OK

  • am64x_evm_r5_defconfig -> Builds OK

  • iot2050_pg1_defconfig -> Broken

  • iot2050_pg2_defconfig -> Broken

  • am65x_evm_a53_defconfig -> Builds OK

  • am65x_evm_r5_defconfig -> Builds OK

  • am65x_evm_r5_usbdfu_defconfig -> Builds OK

  • am65x_evm_r5_usbmsc_defconfig -> Builds OK

  • am65x_hs_evm_a53_defconfig -> Builds OK

  • am65x_hs_evm_r5_defconfig -> Builds OK

  • j7200_evm_a72_defconfig -> Broken (fixed build)

  • j7200_evm_r5_defconfig -> Broken (fixed build)

  • j7200_hs_evm_a72_defconfig -> Broken (fixed build)

  • j7200_hs_evm_r5_defconfig -> Broken (fixed build)

  • j721e_evm_a72_defconfig -> Broken (fixed build)

  • j721e_evm_r5_defconfig -> Broken (fixed build)

  • j721e_hs_evm_a72_defconfig -> Broken (fixed build)

  • j721e_hs_evm_r5_defconfig -> Broken (fixed build)

  • j721s2_evm_a72_defconfig -> Builds OK

  • j721s2_evm_r5_defconfig -> Builds OK

  • j721s2_hs_evm_a72_defconfig -> Builds OK

  • j721s2_hs_evm_r5_defconfig -> Builds OK

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment