Skip to content

Commit 08b2c85

Browse files
committed
ODROID-COMMON: script: Change android boot sequence.
- On recovery and rawimage boot sequence of Andoird, each board have differnt device tree structures. So distinguished each sequence by build configs. Change-Id: Ie05a379062605573b412a22c77b4602ec363818d Signed-off-by: Luke go <sangch.go@gmail.com>
1 parent 2a4e31e commit 08b2c85

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

include/configs/odroid-g12-common.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,14 @@
198198
"androidboot.hardware=" CONFIG_DEVICE_PRODUCT " "\
199199
"recovery_part=recovery recovery_offset=0; "\
200200
"movi read dtbs 0 ${cramfsaddr}; " \
201-
"cramfsload ${dtb_mem_addr} meson64_" CONFIG_DEVICE_PRODUCT "_android.dtb;" \
202-
"if test ${variant} != c4; then " \
201+
"if test " CONFIG_DEVICE_PRODUCT " = odroidn2; then " \
202+
"cramfsload ${dtb_mem_addr} meson64_" CONFIG_DEVICE_PRODUCT "_android.dtb;" \
203203
"cramfsload ${loadaddr} odroid${variant}-opp.dtbo;" \
204204
"fdt addr ${dtb_mem_addr};" \
205205
"fdt resize 8192;" \
206206
"fdt apply ${loadaddr};" \
207+
"else " \
208+
"cramfsload ${dtb_mem_addr} meson64_odroid${variant}_android.dtb;" \
207209
"fi;" \
208210
"movi read recovery 0 ${loadaddr}; " \
209211
"booti ${loadaddr} - ${dtb_mem_addr}; " \
@@ -215,12 +217,14 @@
215217
"androidboot.selinux=permissive androidboot.firstboot=${firstboot} jtag=disable " \
216218
"androidboot.hardware=" CONFIG_DEVICE_PRODUCT "; " \
217219
"movi read dtbs 0 ${cramfsaddr}; " \
218-
"cramfsload ${dtb_mem_addr} meson64_" CONFIG_DEVICE_PRODUCT "_android.dtb;" \
219-
"if test ${variant} != c4; then " \
220+
"if test " CONFIG_DEVICE_PRODUCT " = odroidn2; then " \
221+
"cramfsload ${dtb_mem_addr} meson64_" CONFIG_DEVICE_PRODUCT "_android.dtb;" \
220222
"cramfsload ${loadaddr} odroid${variant}-opp.dtbo;" \
221223
"fdt addr ${dtb_mem_addr};" \
222224
"fdt resize 8192;" \
223225
"fdt apply ${loadaddr};" \
226+
"else " \
227+
"cramfsload ${dtb_mem_addr} meson64_odroid${variant}_android.dtb;" \
224228
"fi;" \
225229
"movi read boot 0 ${loadaddr}; " \
226230
"booti ${loadaddr} - ${dtb_mem_addr}; " \

0 commit comments

Comments
 (0)