rk3568 rt uboot init

hc

2023-11-06 9df731a176aab8e03b984b681b1bea01ccff6644

 u-boot/drivers/core/root.c
..
..
@@ -224,12 +224,8 @@
224
224
 
225
225
 	for (np = node_parent->child; np; np = np->sibling) {
226
226
 		if (pre_reloc_only &&
227
-#ifdef CONFIG_USING_KERNEL_DTB
228
-		    (!of_find_property(np, "u-boot,dm-pre-reloc", NULL) &&
229
-		     !of_find_property(np, "u-boot,dm-spl", NULL)))
230
-#else
231
-		     !of_find_property(np, "u-boot,dm-pre-reloc", NULL))
232
-#endif
227
+		   (!of_find_property(np, "u-boot,dm-pre-reloc", NULL) &&
228
+		    !of_find_property(np, "u-boot,dm-spl", NULL)))
233
229
 			continue;
234
230
 		if (!of_device_is_available(np)) {
235
231
 			pr_debug("   - ignoring disabled device\n");
..
..
@@ -272,7 +268,6 @@
272
268
 			    int offset, bool pre_reloc_only)
273
269
 {
274
270
 	int ret = 0, err;
275
-	const char *name;
276
271
 
277
272
 	for (offset = fdt_first_subnode(blob, offset);
278
273
 	     offset > 0;
..
..
@@ -291,11 +286,15 @@
291
286
 			      ret);
292
287
 		}
293
288
 
289
+#if CONFIG_IS_ENABLED(SCMI_FIRMWARE)
290
+		const char *name;
291
+
294
292
 		/* There is no compatible in "/firmware", bind it by default. */
295
293
 		name = fdt_get_name(blob, offset, NULL);
296
294
 		if (name && !strcmp(name, "firmware"))
297
295
 			ret = device_bind_driver_to_node(parent, "firmware",
298
296
 					name, offset_to_ofnode(offset), NULL);
297
+#endif
299
298
 	}
300
299
 
301
300
 	if (ret)