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.

Sign up for GitHub

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

Jump to bottom

dts: msm8974: hammerhead: fix msm-id overrides #284

Closed
wants to merge 1 commit into from
Closed

dts: msm8974: hammerhead: fix msm-id overrides #284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions dts/msm8974/msm8974-lge-hammerhead.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@

/ {
// This is used by the bootloader to find the correct DTB
qcom,msm-id = <0x7e 0x96 0x20002 0x2b>;
qcom,msm-id = <126 150 0x20002>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the part I'm mainly confused about. If I remember correctly the original bootloader on hammerhead wants to have this msm-id with 4 elements since the 0x2b at the end encodes the board revision. Are you saying that it's not actually necessary to boot lk2nd?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"To boot lk2nd from original bootloader", no.
The original bootloader also boots qcom,msm-id = <126 150 0x20002>;/qcom,msm-id = <0x7e 0x96 0x20002>;.

However, "to boot lk2nd from lk2nd", it's currently not possible yet, since it gets confused with the dtbs.
#285

"To boot downstream boot/recovery image from lk2nd", aa6713e is still required. And proper msm-id/board-id are also required to find proper dtbs.


hammerhead-d820 {
qcom,msm-id = <126 0x20002>;
qcom,board-id = <150 0x2b>;

model = "LG Google Nexus 5 D820";
compatible = "lge,hammerhead", "qcom,msm8974", "lk2nd,device";
lk2nd,match-cmdline = "* androidboot.hardware.sku=D820 *";
Expand All @@ -20,9 +23,8 @@
};

hammerhead-d821 {
// Currently unable to use a dedicated device tree because it won't
// load D821 after D820 loaded.
qcom,msm-id = <0x7e 0x96 0x20002 0x0b>;
qcom,msm-id = <126 0x20002>;
qcom,board-id = <150 0xb>;

model = "LG Google Nexus 5 D821";
compatible = "lge,hammerhead", "qcom,msm8974", "lk2nd,device";
Expand Down