Drop forest of patches, and use the new unified tree by samueldr · Pull Request #238 · Tow-Boot/Tow-Boot

samueldr · 2023-06-26T01:19:05Z

This change set aims to make it easier to work and collaborate on the patches.

This makes use of the (Tow-Boot/U-Boot)[https://github.com/Tow-Boot/U-Boot] repo, where topic branches are created for releases.

https://github.com/Tow-Boot/U-Boot/branches/all?query=tow-boot%2F2022.07

A final strategy hasn't been decided for dealing with the actual branches, but the gist of it is once "ready", a "final" unified branch is pushed, which is an octopus merge of the whole set of changes. This merge is made using a tool, and should also be used when validating work before publishing things for U-Boot changes. Note that this is still a WIP and likely will change, TBD with other collaborators.

Though what is final is that we will be using a single source to represent the whole change set*.

One benefit that has already been shown, where some way too hacky changes were in use, and it instead was preferable to work things out in a better manner with discrete U-Boot config options. In other words, it keeps us more honest and in better working order, without giving us as much opportunities to lapse into bad hacks.

The code, short of some minor cleanups, mainly centered around surrounding hacks with CONFIG_TOW_BOOT* options, the code is basically identical. I have verified that by taking a snapshot (new git repo) of the source tarball produced by the current development tip, then this PR, for the same board (pine64-pinebookA64), and looking at the diff. This is "hard" to judge properly because now all the patches are included all the time, but the changes, other than new boards and new features (unused) are minor and trivial.

What was done

Build a full release (all boards)
Fixup the build so building stock U-Boot with the tooling works
Actually run on a representative subset of hardware
- Tested on pine64-pinebookA64 (representative of Allwinner)
- Fix PBP panel reset quirk patch I that broke
  - Re-work RK3399 wip patches out of Pinephone branch
- Re-test on PBP (SPI flash already tested successful, works for everything ~~except panel on reboot~~)

What needs to be done

Actually run on a representative subset of hardware
- Amlogic
- Raspberry Pi
- Pinephone Pro (testing both revised RK3399 changes, and the Phone UX)

Out of scope of this PR

Figuring out the collaboration strategy. Whichever it is, it will desugar down into a fetchFromGitHub to a repo, shared between all boards.

* This is almost true, we still do some patching down the line for some things, since it needs to happen for a U-Boot build made using our tooling too. Namely, adjusting SPL offset for SPI builds, and serial speed on rockchip. This should be assumed work to somehow prepare in a somewhat upstreamable fashion.

samueldr · 2023-06-26T01:36:46Z

modules/tow-boot/config.nix

+      TOW_BOOT_PREDICTABLE_BOOT_PREFER_EXTERNAL = yes;
+      TOW_BOOT_PREDICTABLE_BOOT_PREFER_INTERNAL = no;


Since this is a choice, just the PREFER_EXTERNAL = yes; should be enough, but having a no for the other ensures there's nothing wrong going on with the implementation. It's redundant, but gives assurance both won't be true at once.

samueldr · 2023-06-26T01:38:03Z

modules/tow-boot/config.nix

      CMD_CLS = yes;
      CMD_SETEXPR = yes;
-      CMD_PAUSE = yes;
+      CMD_PAUSE = lib.mkIf (!config.Tow-Boot.buildUBoot) yes;


CMD_PAUSE has been mainlined, so it will be possible to enable this outright when upgrading U-Boot.

samueldr · 2023-06-28T05:06:50Z

For anyone playing at home:

Making the unified tree broke the display reset workaround
The code is unchanged
The DT for rk3399 was synced
- Tow-Boot/U-Boot@6332471
The DT node names changed
- Tow-Boot/U-Boot@6332471#diff-c3bedab72d65b361172dbc07654eb3c8ac9fbda871fdc2ef9eb2f058af141fbfL1961
The workaround uses gpio_lookup_name
- Tow-Boot/U-Boot@cba7cea#diff-1d2e4da763e7572659b72185b8c8216ac91e572573d4915224c421bbce259e67R76
This, in turn, relies on the node name, which now is not differentiated.

This shows a correctness issue when syncing DTs with linux and that workaround. From a quick grep, no other gpio_lookup_name exist for rk3399. So we're safe keeping the sync in.

The solution is to change the workaround implementation.

This turns a regulator off and on again. This is not elegant. This also shows garbage in the display for a short while.

What we can do, instead, is force the regulator off during SPL. Since it's always-on, it will be turned on at boot. Note that it will be turned on just like from a cold start. So we can prod it the same way LEDs are prodded in SPL.

samueldr/u-boot@fc5bee9

A better(?) solution might be to have a "for U-Boot" tag on the regulator telling it that actually while it is always-on, SPL should turn it off, as a warm reset keeps the thing in a bad state. Or maybe it shouldn't be always-on?

With the upcoming change, there is no garbage on display, but the framebuffer was not cleared, so it shows the last render from the platform firmware (when resetting from the platform firmware). This would be an issue with the rk_edp driver not clearing the memory, and/or maybe the backlight should be turned on later so the display is actually reset first(?) is now cleared.

~~(Fix WIP, will be pushed to the unified tree soon, as it requires revamping the organization of the Pinephone Pro changes, RK3399 changes, and some minor cleanups in the Pinebook Pro changes.)~~

samueldr · 2023-06-28T21:09:11Z

Latest push updates the source ref; which in turn has the RK3399 history revisions, Pinebook Pro revisions, and framebuffer clearing.

https://github.com/Tow-Boot/U-Boot/compare/f9a5907338ddd9cd46a51781df5300b40c9a8127..66559169abb4558d5d4c60d98a719fdbce315614

samueldr · 2023-07-06T04:34:33Z

(Force-push synced with current development branch)

samueldr · 2023-07-07T23:02:05Z

CI is already paying dividends

https://github.com/Tow-Boot/Tow-Boot/actions/runs/5491031789/jobs/10007233414

- remove unused args for fetchpatch - dropped newline

We'll better support that use-case, since we're moving away from large set of patches to using a single unified tree.

Capitalize the name, and make make it obvious it's about the docs

Those will now live in a unified git tree.

Will now live in the unified source tree.

They will now live in the unified source tree.

This is required anyway with stock U-Boot or else our tooling will build it at the wrong location.

This was previously applied to any board. Let's opt-in.

This is when we use the *configuration* from Tow-Boot, e.g. environment position. This is useful to find out whether Tow-Boot is broken, or stock U-Boot is broken under specific configuration options.

Fixes Tow-Boot#239

By using the Modules system, we can introspect on the attrsets (or even add new values), and in turn this means we can use the attrsets for automatically building all the known versions! (upcoming!)

…ot hashes

samueldr · 2023-07-15T21:22:03Z

It wasn't entirely "tested" in full, like I wanted initially, but the reasoning to merge is two-fold:

I am already building up on top of this for the U-Boot update
Any platform-specific fixes requires work outside this repo anyway

Nothing here will require "fixing" other than the revision and hash once that is done.

Which leads to one question: how should that be managed for updates? I guess we'll add a pin in only when ready to publish a new version?

samueldr commented Jun 26, 2023

View reviewed changes

samueldr force-pushed the feature/drop-patches-use-repo branch from 67a9019 to 668ee76 Compare June 26, 2023 02:19

samueldr force-pushed the feature/drop-patches-use-repo branch from 668ee76 to dabb614 Compare June 28, 2023 21:03

samueldr added this to the 20YY.MM-007 milestone Jul 2, 2023

samueldr force-pushed the feature/drop-patches-use-repo branch from dabb614 to 5cb63ca Compare July 6, 2023 04:33

samueldr marked this pull request as ready for review July 6, 2023 04:48

samueldr added the 4. type: enhancement Accepted new feature label Jul 6, 2023

This was referenced Jul 6, 2023

u-boot 2022.10 created, forking off of u-boot 2022.07 #220

Closed

Configure GitHub Actions for building images #201

Merged

samueldr force-pushed the feature/drop-patches-use-repo branch from 5cb63ca to f5c9c27 Compare July 7, 2023 22:21

samueldr force-pushed the feature/drop-patches-use-repo branch from f5c9c27 to 30231db Compare July 8, 2023 01:43

samueldr added 14 commits July 7, 2023 21:50

Misc. cleanups

d9a897c

- remove unused args for fetchpatch - dropped newline

modules: Change semantics for building stock U-Boot

ab0df7b

We'll better support that use-case, since we're moving away from large set of patches to using a single unified tree.

doc: change output names

7e786d3

Capitalize the name, and make make it obvious it's about the docs

support/u-boot: Drop 2021.10 Tow-Boot patches

3ea2c2b

support/u-boot: Drop 2022.07 patches

08a5e73

Those will now live in a unified git tree.

tow-boot/phone-ux: Drop patch

4580d48

Will now live in the unified source tree.

hardware/rockchip: Drop patches

4ded3e1

They will now live in the unified source tree.

tow-boot/config: Use new predictable boot order options

019252e

libreComputer-rocRk3399Pc: Move patches to unified source tree

239df52

odroid-N2: Move patches to unified source tree

23f9c34

orangePi-zeroPlus2H5: Move patches to unified source tree

082cedf

pine64-pinebookPro: Move patches to unified source tree

f9d5484

pine64-rockpro64: Move patches to unified source tree

c3c5d29

radxa-RockPi4: Move patches to unified source tree

9c7d88a

samueldr added 18 commits July 7, 2023 21:50

radxa-zero2: Move patches to unified source tree

0a3ee1d

raspberryPi-aarch64: Move patches to unified source tree

688df61

uBoot-sandbox: Move patches to unified source tree

60ffe02

pine64-pinephoneA64: Move patches to unified source tree

afe4516

pine64-pinephonePro: Move patches to unified source tree

a8fa37b

tow-boot/builder: Patch out SPI offset for rockchip too

33b9cc0

This is required anyway with stock U-Boot or else our tooling will build it at the wrong location.

pine64-pinephonePro: Disable dlmode handling in SPL

2d9ddf5

This was previously applied to any board. Let's opt-in.

modules/u-boot: Init with patch required for stock build

1b080ac

This is when we use the *configuration* from Tow-Boot, e.g. environment position. This is useful to find out whether Tow-Boot is broken, or stock U-Boot is broken under specific configuration options.

raspberryPi-aarch64: Fix build with stock U-Boot

6e1fb93

libreComputer-amlS805xAc: Fix build with stock U-Boot

23c6c59

uBoot-sandbox: Fix build and usage

36d6110

hardware/rockchip: We can now poweroff on RK3399

ba5d68d

tow-boot/src: Make use of git repo instead of patches

64cc502

tow-boot/config: Fixes for building older stock U-Boot versions

f5a4ed1

tow-boot/config: Version gate VIDEO_LOGO

3c9ff73

default.nix: Don't propagate leftover input args

3731bcb

Fixes Tow-Boot#239

default.nix: Add a shortcut to src

8ebd0a7

tow-boot/options: Allow passing a path to src

7312396

samueldr force-pushed the feature/drop-patches-use-repo branch from 30231db to f28f24d Compare July 8, 2023 02:31

samueldr added 3 commits July 7, 2023 22:47

doc: Add src doc to the development guide

0b0c024

tow-boot/src: Make known hashes more self-descriptive

3c65dd7

By using the Modules system, we can introspect on the attrsets (or even add new values), and in turn this means we can use the attrsets for automatically building all the known versions! (upcoming!)

support: Add expression to build the sandbox for all known stock U-Bo…

4904f24

…ot hashes

samueldr force-pushed the feature/drop-patches-use-repo branch from f28f24d to 4904f24 Compare July 8, 2023 02:47

samueldr merged commit e192ddb into Tow-Boot:development Jul 15, 2023

samueldr deleted the feature/drop-patches-use-repo branch July 15, 2023 21:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Drop forest of patches, and use the new unified tree#238

Drop forest of patches, and use the new unified tree#238
samueldr merged 35 commits intoTow-Boot:developmentfrom
samueldr:feature/drop-patches-use-repo

samueldr commented Jun 26, 2023 •

edited

Loading

Uh oh!

samueldr Jun 26, 2023

Uh oh!

samueldr Jun 26, 2023 •

edited

Loading

Uh oh!

samueldr commented Jun 28, 2023 •

edited

Loading

Uh oh!

samueldr commented Jun 28, 2023 •

edited

Loading

Uh oh!

samueldr commented Jul 6, 2023

Uh oh!

samueldr commented Jul 7, 2023

Uh oh!

samueldr commented Jul 15, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

1 participant

		TOW_BOOT_PREDICTABLE_BOOT_PREFER_EXTERNAL = yes;
		TOW_BOOT_PREDICTABLE_BOOT_PREFER_INTERNAL = no;

Uh oh!

Conversation

samueldr commented Jun 26, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What was done

What needs to be done

Out of scope of this PR

Uh oh!

samueldr Jun 26, 2023

Choose a reason for hiding this comment

Uh oh!

samueldr Jun 26, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

samueldr commented Jun 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

samueldr commented Jun 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

samueldr commented Jul 6, 2023

Uh oh!

samueldr commented Jul 7, 2023

Uh oh!

samueldr commented Jul 15, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

1 participant

samueldr commented Jun 26, 2023 •

edited

Loading

samueldr Jun 26, 2023 •

edited

Loading

samueldr commented Jun 28, 2023 •

edited

Loading

samueldr commented Jun 28, 2023 •

edited

Loading