From fabf3ae948d5bdd77568aa08802cfe81f7be7f6a Mon Sep 17 00:00:00 2001
From: Guillaume La Roque <glaroque@baylibre.com>
Date: Wed, 8 Nov 2023 14:51:25 +0100
Subject: [PATCH] configs: am62px: add android support

Add Android bootflow support for AM62PX SoC.

Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
---
 board/ti/am62px/am62px.env          | 4 ++++
 include/configs/am62px_evm.h        | 5 +++++
 include/configs/am62x_evm_android.h | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/board/ti/am62px/am62px.env b/board/ti/am62px/am62px.env
index 0674f7e616..9ed3ef5f71 100644
--- a/board/ti/am62px/am62px.env
+++ b/board/ti/am62px/am62px.env
@@ -21,3 +21,7 @@ mmcdev=1
 bootpart=1:2
 bootdir=/boot
 rd_spec=-
+
+#if CONFIG_CMD_ABOOTIMG
+#include <environment/ti/mmc_android.env>
+#endif
diff --git a/include/configs/am62px_evm.h b/include/configs/am62px_evm.h
index f00354f3b1..9a95253888 100644
--- a/include/configs/am62px_evm.h
+++ b/include/configs/am62px_evm.h
@@ -14,4 +14,9 @@
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>
 
+/* include Android related settings */
+#if CONFIG_CMD_ABOOTIMG
+#include <configs/am62x_evm_android.h>
+#endif
+
 #endif /* __CONFIG_AM62PX_EVM_H */
diff --git a/include/configs/am62x_evm_android.h b/include/configs/am62x_evm_android.h
index 88c780619d..91921ed35f 100644
--- a/include/configs/am62x_evm_android.h
+++ b/include/configs/am62x_evm_android.h
@@ -80,6 +80,9 @@
 	"elif test $board_name =  am62x_beagleplay; then " \
 		"echo \"  Reading DTB for am62x_beagleplay...\"; " \
 		"setenv dtb_index 2;" \
+	"elif test $board_name =  am62px; then " \
+		"echo \"  Reading DTB for am62px...\"; " \
+		"setenv dtb_index 3;" \
 	"else " \
 		"echo Error: Android boot is not supported for $board_name; " \
 		"exit; " \