summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke go <sangch.go@gmail.com>2020-10-20 05:27:14 +0300
committerLuke go <sangch.go@gmail.com>2020-10-20 05:30:38 +0300
commit08b2c859fb2bdac1050bea76fe4dc442f2f4041d (patch)
treee8f310b4cfddd3e6fd12ec0501e82d4bb42479f7
parent2a4e31e3fde9bced8a150d338aa397a0362df191 (diff)
downloadu-boot-08b2c859fb2bdac1050bea76fe4dc442f2f4041d.tar.xz
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>
-rw-r--r--include/configs/odroid-g12-common.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/include/configs/odroid-g12-common.h b/include/configs/odroid-g12-common.h
index b53d390c96..7daf932df8 100644
--- a/include/configs/odroid-g12-common.h
+++ b/include/configs/odroid-g12-common.h
@@ -198,12 +198,14 @@
"androidboot.hardware=" CONFIG_DEVICE_PRODUCT " "\
"recovery_part=recovery recovery_offset=0; "\
"movi read dtbs 0 ${cramfsaddr}; " \
- "cramfsload ${dtb_mem_addr} meson64_" CONFIG_DEVICE_PRODUCT "_android.dtb;" \
- "if test ${variant} != c4; then " \
+ "if test " CONFIG_DEVICE_PRODUCT " = odroidn2; then " \
+ "cramfsload ${dtb_mem_addr} meson64_" CONFIG_DEVICE_PRODUCT "_android.dtb;" \
"cramfsload ${loadaddr} odroid${variant}-opp.dtbo;" \
"fdt addr ${dtb_mem_addr};" \
"fdt resize 8192;" \
"fdt apply ${loadaddr};" \
+ "else " \
+ "cramfsload ${dtb_mem_addr} meson64_odroid${variant}_android.dtb;" \
"fi;" \
"movi read recovery 0 ${loadaddr}; " \
"booti ${loadaddr} - ${dtb_mem_addr}; " \
@@ -215,12 +217,14 @@
"androidboot.selinux=permissive androidboot.firstboot=${firstboot} jtag=disable " \
"androidboot.hardware=" CONFIG_DEVICE_PRODUCT "; " \
"movi read dtbs 0 ${cramfsaddr}; " \
- "cramfsload ${dtb_mem_addr} meson64_" CONFIG_DEVICE_PRODUCT "_android.dtb;" \
- "if test ${variant} != c4; then " \
+ "if test " CONFIG_DEVICE_PRODUCT " = odroidn2; then " \
+ "cramfsload ${dtb_mem_addr} meson64_" CONFIG_DEVICE_PRODUCT "_android.dtb;" \
"cramfsload ${loadaddr} odroid${variant}-opp.dtbo;" \
"fdt addr ${dtb_mem_addr};" \
"fdt resize 8192;" \
"fdt apply ${loadaddr};" \
+ "else " \
+ "cramfsload ${dtb_mem_addr} meson64_odroid${variant}_android.dtb;" \
"fi;" \
"movi read boot 0 ${loadaddr}; " \
"booti ${loadaddr} - ${dtb_mem_addr}; " \