<commit_before>From d8b13b931afd455e4319a1933574706aaa41658b Mon Sep 17 00:00:00 2001
From: <NAME> <<EMAIL>>
Date: Tue, 26 Jul 2016 20:20:27 +0200
Subject: [PATCH] Removed dts folder from device tree file name

This is due to the fact that the meta-fsl-arm layer does provide a
SD-card image class which do not put the dtb files in a separate
sub-folder

Signed-off-by: <NAME> <<EMAIL>>
---
 board/udoo/a62/mx6qd_a62.c | 9 ++++-----
 board/udoo/udoo_neo/neo.c  | 9 ++++-----
 board/udoo/udoo_qd/udoo.c  | 9 ++++-----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/board/udoo/a62/mx6qd_a62.c b/board/udoo/a62/mx6qd_a62.c
index ca264ab..fadbab4 100644
--- a/board/udoo/a62/mx6qd_a62.c
+++ b/board/udoo/a62/mx6qd_a62.c
@@ -592,18 +592,17 @@ int do_a62init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		}
 	}
 	
-	char* dir_part = "dts";
+	char fdt_file[100];
 	char* customdtb = getenv("use_custom_dtb");
+	sprintf(fdt_file, "%s%s.dtb", modelfdt, video_part);
 	if (customdtb) {
 		customdtb = trim(customdtb);
 		if (strcmp(customdtb, "true") == 0 || strcmp(customdtb, "yes") == 0 || strcmp(customdtb, "enabled") == 0) {
-			dir_part = "dts-overlay";
+			char* dir_part = "dts-overlay";
+			sprintf(fdt_file, "%s/%s%s.dtb", dir_part, modelfdt, video_part);
 		}
 	}
 	
-	char fdt_file[100];
-	sprintf(fdt_file, "%s/%s%s.dtb", dir_part, modelfdt, video_part);
-	
 	printf("Device Tree: %s\n", fdt_file);
 	setenv("fdt_file", fdt_file);
 	
diff --git a/board/udoo/udoo_neo/neo.c b/board/udoo/udoo_neo/neo.c
index 7e46a59..e929504 100644
--- a/board/udoo/udoo_neo/neo.c
+++ b/board/udoo/udoo_neo/neo.c
@@ -1117,18 +1117,17 @@ int do_udooinit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		}
 	}
 	
-	char* dir_part = "dts";
+	char fdt_file[100];
 	char* customdtb = getenv("use_custom_dtb");
+	sprintf(fdt_file, "%s%s%s.dtb", modelfdt, video_part, m4_part);
 	if (customdtb) {
 		customdtb = trim(customdtb);
 		if (strcmp(customdtb, "true") == 0 || strcmp(customdtb, "yes") == 0 || strcmp(customdtb, "enabled") == 0) {
-			dir_part = "dts-overlay";
+			char* dir_part = "dts-overlay";
+			sprintf(fdt_file, "%s/%s%s%s.dtb", dir_part, modelfdt, video_part, m4_part);
 		}
 	}
 	
-	char fdt_file[100];
-	sprintf(fdt_file, "%s/%s%s%s.dtb", dir_part, modelfdt, video_part, m4_part);
-	
 	printf("Device Tree: %s\n", fdt_file);
 	setenv("fdt_file", fdt_file);
 	
diff --git a/board/udoo/udoo_qd/udoo.c b/board/udoo/udoo_qd/udoo.c
index 1276e26..fd7c836 100644
--- a/board/udoo/udoo_qd/udoo.c
+++ b/board/udoo/udoo_qd/udoo.c
@@ -439,18 +439,17 @@ int do_udooinit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		}
 	}
 	
-	char* dir_part = "dts";
+	char fdt_file[100];
 	char* customdtb = getenv("use_custom_dtb");
+	sprintf(fdt_file, "%s%s.dtb", modelfdt, video_part);
 	if (customdtb) {
 		customdtb = trim(customdtb);
 		if (strcmp(customdtb, "true") == 0 || strcmp(customdtb, "yes") == 0 || strcmp(customdtb, "enabled") == 0) {
-			dir_part = "dts-overlay";
+			char* dir_part = "dts-overlay";
+			sprintf(fdt_file, "%s/%s%s.dtb", dir_part, modelfdt, m4_part);
 		}
 	}
 	
-	char fdt_file[100];
-	sprintf(fdt_file, "%s/%s%s.dtb", dir_part, modelfdt, video_part);
-	<commit_msg>Fixed UDOO Quad/Dual u-boot patch<commit_after>From d8b13b931afd455e4319a1933574706aaa41658b Mon Sep 17 00:00:00 2001
From: <NAME> <<EMAIL>>
Date: Tue, 26 Jul 2016 20:20:27 +0200
Subject: [PATCH] Removed dts folder from device tree file name

This is due to the fact that the meta-fsl-arm layer does provide a
SD-card image class which do not put the dtb files in a separate
sub-folder

Signed-off-by: <NAME> <<EMAIL>>
---
 board/udoo/a62/mx6qd_a62.c | 9 ++++-----
 board/udoo/udoo_neo/neo.c  | 9 ++++-----
 board/udoo/udoo_qd/udoo.c  | 9 ++++-----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/board/udoo/a62/mx6qd_a62.c b/board/udoo/a62/mx6qd_a62.c
index ca264ab..fadbab4 100644
--- a/board/udoo/a62/mx6qd_a62.c
+++ b/board/udoo/a62/mx6qd_a62.c
@@ -592,18 +592,17 @@ int do_a62init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		}
 	}
 	
-	char* dir_part = "dts";
+	char fdt_file[100];
 	char* customdtb = getenv("use_custom_dtb");
+	sprintf(fdt_file, "%s%s.dtb", modelfdt, video_part);
 	if (customdtb) {
 		customdtb = trim(customdtb);
 		if (strcmp(customdtb, "true") == 0 || strcmp(customdtb, "yes") == 0 || strcmp(customdtb, "enabled") == 0) {
-			dir_part = "dts-overlay";
+			char* dir_part = "dts-overlay";
+			sprintf(fdt_file, "%s/%s%s.dtb", dir_part, modelfdt, video_part);
 		}
 	}
 	
-	char fdt_file[100];
-	sprintf(fdt_file, "%s/%s%s.dtb", dir_part, modelfdt, video_part);
-	
 	printf("Device Tree: %s\n", fdt_file);
 	setenv("fdt_file", fdt_file);
 	
diff --git a/board/udoo/udoo_neo/neo.c b/board/udoo/udoo_neo/neo.c
index 7e46a59..e929504 100644
--- a/board/udoo/udoo_neo/neo.c
+++ b/board/udoo/udoo_neo/neo.c
@@ -1117,18 +1117,17 @@ int do_udooinit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		}
 	}
 	
-	char* dir_part = "dts";
+	char fdt_file[100];
 	char* customdtb = getenv("use_custom_dtb");
+	sprintf(fdt_file, "%s%s%s.dtb", modelfdt, video_part, m4_part);
 	if (customdtb) {
 		customdtb = trim(customdtb);
 		if (strcmp(customdtb, "true") == 0 || strcmp(customdtb, "yes") == 0 || strcmp(customdtb, "enabled") == 0) {
-			dir_part = "dts-overlay";
+			char* dir_part = "dts-overlay";
+			sprintf(fdt_file, "%s/%s%s%s.dtb", dir_part, modelfdt, video_part, m4_part);
 		}
 	}
 	
-	char fdt_file[100];
-	sprintf(fdt_file, "%s/%s%s%s.dtb", dir_part, modelfdt, video_part, m4_part);
-	
 	printf("Device Tree: %s\n", fdt_file);
 	setenv("fdt_file", fdt_file);
 	
diff --git a/board/udoo/udoo_qd/udoo.c b/board/udoo/udoo_qd/udoo.c
index 1276e26..fd7c836 100644
--- a/board/udoo/udoo_qd/udoo.c
+++ b/board/udoo/udoo_qd/udoo.c
@@ -439,18 +439,17 @@ int do_udooinit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		}
 	}
 	
-	char* dir_part = "dts";
+	char fdt_file[100];
 	char* customdtb = getenv("use_custom_dtb");
+	sprintf(fdt_file, "%s%s.dtb", modelfdt, video_part);
 	if (customdtb) {
 		customdtb = trim(customdtb);
 		if (strcmp(customdtb, "true") == 0 || strcmp(customdtb, "yes") == 0 || strcmp(customdtb, "enabled") == 0) {
-			dir_part = "dts-overlay";
+			char* dir_part = "dts-overlay";
+			sprintf(fdt_file, "%s/%s%s.dtb", dir_part, modelfdt, video_part);
 		}
 	}
 	
-	char fdt_file[100];
-	sprintf(fdt_file, "%s/%s%s.dtb", dir_part, modelfdt, video_part);
-	
{'fraction_non_alphanumeric': 0.18856878755199508, 'fraction_numerical': 0.060545370513018025, 'mean_word_length': 3.9368821292775666, 'pattern_counts': {'":': 0, '<': 15, '<?xml version=': 0, '>': 15, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '5111620', 'n_tokens_mistral': 3334, 'n_tokens_neox': 3004, 'n_words': 558}