From 08b2c859fb2bdac1050bea76fe4dc442f2f4041d Mon Sep 17 00:00:00 2001 From: Luke go Date: Tue, 20 Oct 2020 11:27:14 +0900 Subject: 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 --- include/configs/odroid-g12-common.h | 12 ++++++++---- 1 file 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}; " \ -- cgit v1.2.1