Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PinePhone: Switch u-boot to pine64-org fork #199

Open
wants to merge 3 commits into
base: master
from

Conversation

@TilCreator
Copy link

@TilCreator TilCreator commented Sep 18, 2020

Fixes (only the comment) #186 (comment)

I'm not seeing thru what is going on with the u-boot stuff for the Pinephone and it's possible that this pr is not helping in the long run. But I tested it wil my Pinephone (3G ram editon) and it worked, so it's at least a workaround for everyone having that problem rn.

@samueldr
Copy link
Member

@samueldr samueldr commented Sep 18, 2020

Note (for other contributors) that the minimal crust support patch was basically the branch we are now using, but without the non-pinephone commits.

The main reason was to allow us to follow another U-Boot release if we wanted to, but for now it seems to cause more hardships than to follow the "vendor"'s U-Boot tree.

@TilCreator
Copy link
Author

@TilCreator TilCreator commented Sep 18, 2020

One thing I noticed while testing was that usb-c otg isn't working. Was that working with the previous u-boot (on non 3g ram PinePhones obviouly)?

Copy link
Member

@samueldr samueldr left a comment

Hi!

Looks mostly good!

Minimal changes are needed to respect the way we do things with packaging stuff.

@TilCreator TilCreator requested a review from samueldr Sep 18, 2020
@TilCreator
Copy link
Author

@TilCreator TilCreator commented Sep 18, 2020

Coming back to me noticing that usb-c otg isn't working, holding vol up/down while booting also doesn't start the rescue mode (the buttons are correctly recognized by X).

Where would be the best place to put such issues?

@samueldr
Copy link
Member

@samueldr samueldr commented Sep 29, 2020

Issues are best put in the issue tracker!

J-Kirch added a commit to J-Kirch/mobile-nixos that referenced this pull request Oct 6, 2020
Merge tilcreator/master fix for pinephone 1.2 with 3GB RAM, see pr NixOS#199
@TilCreator
Copy link
Author

@TilCreator TilCreator commented Nov 11, 2020

It still says "Changes requested", is there something I'm missing, because I can't find any change requests?

@ardumont
Copy link

@ardumont ardumont commented Nov 11, 2020

It still says "Changes requested", is there something I'm missing, because I can't find any change requests?

I don't know about the current main feature you are modifying.

But in general, you should probably (git) rebase your development branch onto master.
Instead of merging back upstream master into your branch.
So the git history is more clear and linear (that eases the work on repos maintainer when they are ready to merge your contributions).

I mention this as I noticed you did the same on another PR (the one about doc updates).

My 2 cents.

@TilCreator
Copy link
Author

@TilCreator TilCreator commented Nov 11, 2020

Sry, I'm not new to git, but new to working with forks and Githubs docs [0] apparently are not the most helpful with that...

[0] https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/syncing-a-fork

@ardumont
Copy link

@ardumont ardumont commented Nov 11, 2020

Sry, I'm not new to git, but new to working with forks and Githubs docs [0]
apparently are not the most helpful with that...

heh, no need to be sorry ;) just mentioning might be helpful stuff along the
way.

I'd say something like this should be enough:

# "upstream" being the remote origin connected to the mobile-nixos origin
# (change to what you actually use), that will replay your commit on top of the
# latest master commit.
git rebase upstream/master master
# as your commit have changed, that will forcibly write your update on your
# fork, incidentally update this PR. As a result, you should now only see 2
# commits in the #commit tabs instead of the 3 you had since you merged
git push origin master --force

On a more contextual note to your diff content, i've tried it out. Although I
still don't have everything ok (I still see nothing on screen).

It definitely seemed to have passed one step beyond u-boot (it was stuck to red
led with upstream master). Instead of having the led stuck to red, it passed to
something yellow-ish/green-ish (i can't really distinguish the color
there ¯_(ツ)_/¯) [1]

[1] I don't have better feedback than the led currently as i'm waiting for
other tools to debug (in-transit).

Cheers,

@ardumont
Copy link

@ardumont ardumont commented Nov 13, 2020

Note: phone is pine64-pinephone community edition (manjaro), the 3GB variant.

It definitely seemed to have passed one step beyond u-boot (it was stuck to red
led with upstream master). Instead of having the led stuck to red, it passed to
something yellow-ish/green-ish (i can't really distinguish the color
there ¯_(ツ)_/¯) [1]

It works! [0]

My issue seemed unrelated to mobile-nixos [1]. With my uart/jack adapter, I saw
the fsck step failing and did as suggested there [2].

After that, the phone finally booted for the first time with the manjaro
distribution (default).

Now for mobile-nixos, I re-did my previous workouts, one at a time based on the
getting started/pinephone documentations [3] to no avail... This time i had
feedback [4]

Turns out using this patch [5] makes that pinephone boot (a full-disk
image). I even had the mobile-nixos logo appear \m/

Cheers,

[0] Well it boots :D

...
<<< Welcome to NixOS 21.03.git.56a2391 (aarch64) - ttyS0 >>>

[1] The first time i plugged the battery to charge it, somehow it booted alone
(without any sdcard to it). But I only saw 3 lines of stuff on screen which
looked like a linux booting. I did not have time to read or anything, the fonts
was tiny and the screen went black almost immediately. So my guess is that
somehow the battery was empty and it screwed things a bit on the main eMMC
storage...

[2] fsck -y /dev/mmcblk2p2

[3] https://mobile.nixos.org/devices/pine64-pinephone.html
https://hydra.nixos.org/build/128689952#tabs-buildinputs

[4]

...
Loading Environment from FAT... *** Warning - bad CRC, using default environment
...
# and then fallbacks to boot the manjaro distribution

[5]

mobile_nixos_commit=b0fe081426046ac88a5820155415299539227923
nixpkgs_commit=24c9b05ac53e422f1af81a156f1fd58499eb27fb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.