From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Wed, 3 Feb 2021 14:36:14 +0000 (+0100)
Subject: board: amlogic: odroid: adjust runtime detection for Tizen
X-Git-Tag: accepted/tizen/unified/20231106.171643~155
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9418b6baca98d0ec0ace5574519e0e0016f15fdf;p=platform%2Fkernel%2Fu-boot.git

board: amlogic: odroid: adjust runtime detection for Tizen

Adjust file paths of board runtime detection for specific Tizen usage.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---

diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c
index 2135457edd..fab06ef787 100644
--- a/board/amlogic/odroid-n2/odroid-n2.c
+++ b/board/amlogic/odroid-n2/odroid-n2.c
@@ -48,7 +48,7 @@ static struct meson_odroid_boards {
 	/* OdroidN2 rev 2019,2,7 */
 	{ MESON_SOC_ID_G12B, 330 * 4, 350 * 4, "n2" },
 	/* OdroidN2plus rev 2019,11,20 */
-	{ MESON_SOC_ID_G12B, 410 * 4, 430 * 4, "n2-plus" },
+	{ MESON_SOC_ID_G12B, 410 * 4, 430 * 4, "n2_plus" },
 	/* OdroidC4 rev 2020,01,29 */
 	{ MESON_SOC_ID_SM1,   80 * 4, 100 * 4, "c4" },
 	/* OdroidHC4 rev 2019,12,10 */
@@ -63,8 +63,11 @@ static void odroid_set_fdtfile(char *soc, char *variant)
 {
 	char s[128];
 
-	snprintf(s, sizeof(s), "amlogic/meson-%s-odroid-%s.dtb", soc, variant);
+	snprintf(s, sizeof(s), "meson64_odroid%s.dtb", variant);
 	env_set("fdtfile", s);
+
+	snprintf(s, sizeof(s), "meson-%s-odroid-%s.dtb", soc, variant);
+	env_set("fdtfile2", s);
 }
 
 static int odroid_detect_variant(void)
diff --git a/include/samsung/tizen_amlogic.h b/include/samsung/tizen_amlogic.h
index 2bedcb3de3..9f1eb9ad0a 100644
--- a/include/samsung/tizen_amlogic.h
+++ b/include/samsung/tizen_amlogic.h
@@ -21,11 +21,15 @@
 #define DFU_ALT_SYSTEM				\
 	"Image.gz fat -1 1;"			\
 	"meson64_odroidn2.dtb fat -1 1;"	\
+	"meson64_odroidn2_plus.dtb fat -1 1;"	\
 	"meson64_odroidc4.dtb fat -1 1;"	\
+	"meson64_odroidhc4.dtb fat -1 1;"	\
 	"kvim3_linux.dtb fat -1 1;"		\
 	"kvim3l_linux.dtb fat -1 1;"		\
 	"meson-g12b-odroid-n2.dtb fat -1 1;"	\
+	"meson-g12b-odroid-n2_plus.dtb fat -1 1;" \
 	"meson-sm1-odroid-c4.dtb fat -1 1;"	\
+	"meson-sm1-odroid-hc4.dtb fat -1 1;"	\
 	"meson-g12b-a311d-khadas-vim3.dtb fat -1 1;" \
 	"meson-sm1-khadas-vim3l.dtb fat -1 1;"	\
 	"boot.scr.uimg fat -1 1;"		\