Skip to content

Commit 79a826d

Browse files
kdrag0nDhineshCool
authored andcommitted
arm64: dts: google: Convert DT overlays to full DTBs
DT overlays are a hassle to deal with when it comes to building and especially shipping. Part of the kernel residing on a separate partition is harder to manage, and it breaks convenient development commands such as "fastboot boot" and "fastboot flash boot". This is especially an issue for custom kernels, since users can end up in a broken state where the boot and dtbo images are incompatible. Qualcomm's LinuxLoader BootLib will actually use an appended DTB and ignore DTBOs if it has the correct board ID, so we can leverage that to use full DTBs instead. Only production device revisions are supported. DTBOs can still be built if desired with the CONFIG_BUILD_ARM64_DT_OVERLAY config option. Signed-off-by: Danny Lin <danny@kdrag0n.dev>
1 parent 863ccf3 commit 79a826d

3 files changed

Lines changed: 58 additions & 1 deletion

File tree

arch/arm64/boot/dts/google/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ sdm845-c1-evt.dtbo-base := ../qcom/sdm845-v2.1.dtb
3636
sdm845-c1-evt1.1.dtbo-base := ../qcom/sdm845-v2.1.dtb
3737
sdm845-c1-dvt.dtbo-base := ../qcom/sdm845-v2.1.dtb
3838
sdm845-c1-dvt1.1.dtbo-base := ../qcom/sdm845-v2.1.dtb
39-
39+
else
40+
dtb-$(CONFIG_BOARD_B1C1) += \
41+
sdm845-b1.dtb \
42+
sdm845-c1.dtb
4043
endif
4144
endif #CONFIG_BOARD_B1C1
4245

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
2+
*
3+
* This program is free software; you can redistribute it and/or modify
4+
* it under the terms of the GNU General Public License version 2 and
5+
* only version 2 as published by the Free Software Foundation.
6+
*
7+
* This program is distributed in the hope that it will be useful,
8+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
* GNU General Public License for more details.
11+
*/
12+
13+
/dts-v1/;
14+
15+
#include "../qcom/sdm845-v2.1.dtsi"
16+
#include "sdm845-b1-common-v2.1.dtsi"
17+
#include "sdm845-patherm.dtsi"
18+
#include "sdm845-usbctherm.dtsi"
19+
#include "sdm845-b1-usb-v3.dtsi"
20+
#include "sdm845-b1-audio-cal.dtsi"
21+
22+
/ {
23+
model = "Google Inc. MSM sdm845 B1 DVT1.1";
24+
compatible = "google,b1c1-sdm845", "qcom,sdm845";
25+
qcom,msm-id = <321 0x20001>;
26+
qcom,board-id = <0x00021505 0>;
27+
};
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
2+
*
3+
* This program is free software; you can redistribute it and/or modify
4+
* it under the terms of the GNU General Public License version 2 and
5+
* only version 2 as published by the Free Software Foundation.
6+
*
7+
* This program is distributed in the hope that it will be useful,
8+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
* GNU General Public License for more details.
11+
*/
12+
13+
/dts-v1/;
14+
15+
#include "../qcom/sdm845-v2.1.dtsi"
16+
#include "sdm845-b1-common-v2.1.dtsi"
17+
#include "sdm845-patherm.dtsi"
18+
#include "sdm845-usbctherm.dtsi"
19+
#include "sdm845-b1-usb-v3.dtsi"
20+
#include "sdm845-b1-audio-cal.dtsi"
21+
22+
/ {
23+
model = "Google Inc. MSM sdm845 C1 DVT1.1";
24+
compatible = "google,b1c1-sdm845", "qcom,sdm845";
25+
qcom,msm-id = <321 0x20001>;
26+
qcom,board-id = <0x00011505 0>;
27+
};

0 commit comments

Comments
 (0)