debug lk

hc

2024-02-20 e636c8d336489bf3eed5878299e6cc045bbad077

 u-boot/arch/arm/mach-rockchip/kernel_dtb.c
old mode 100755new mode 100644
..
..
@@ -287,7 +287,7 @@
287
287
 	printf("Can't increase blob size: %s\n", fdt_strerror(ret));
288
288
 	return ret;
289
289
 }
290
-
290
+#if 0
291
291
 static int fdt_fixup_panel_init_sequence(void *fdt, int node,const struct display_fixup_data *data)
292
292
 {
293
293
    #if 0
..
..
@@ -345,6 +345,7 @@
345
345
 	printf("Can't increase blob size: %s\n", fdt_strerror(ret));
346
346
 	return ret;
347
347
 }
348
+#endif
348
349
 
349
350
 static int fdt_fixup_setprop_u32(void *fdt, int node, const char *name, u32 data)
350
351
 {
..
..
@@ -391,12 +392,14 @@
391
392
 static void fdt_fixup_panel_node(void *blob, int node, const char *name,
392
393
 				 const struct display_fixup_data *data)
393
394
 {
395
+/*
394
396
 	if (!strcmp(name, "dsi")) {
395
397
 		fdt_setprop_u32(blob, node, "dsi,flags", data->flags);
396
398
 		fdt_setprop_u32(blob, node, "dsi,format", data->format);
397
399
 		fdt_setprop_u32(blob, node, "dsi,lanes", data->lanes);
398
400
 		fdt_fixup_panel_init_sequence(blob, node,data);
399
401
 	}
402
+*/
400
403
 	fdt_fixup_setprop_u32(blob, node, "prepare-delay-ms", data->delay_prepare);
401
404
 	fdt_fixup_setprop_u32(blob, node, "enable-delay-ms", data->delay_enable);
402
405
 	fdt_fixup_setprop_u32(blob, node, "disable-delay-ms", data->delay_disable);
..
..
@@ -488,16 +491,16 @@
488
491
 static void fdt_fixup_display_route(void *blob, const struct display_fixup_data *data)
489
492
 {
490
493
 	if (data->type == PANEL_TYPE_DSI) {
491
-		fdt_fixup_display_sub_route(blob, "dsi", FDT_STATUS_OKAY, data);
494
+		fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_OKAY, data);
492
495
 		fdt_fixup_display_sub_route(blob, "edp", FDT_STATUS_DISABLED, data);
493
496
 		fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_DISABLED, data);
494
497
 	} else if (data->type == PANEL_TYPE_EDP) {
495
-		fdt_fixup_display_sub_route(blob, "dsi", FDT_STATUS_DISABLED, data);
498
+		fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_DISABLED, data);
496
499
 		fdt_fixup_display_sub_route(blob, "edp", FDT_STATUS_OKAY, data);
497
500
 		fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_DISABLED, data);
498
501
 	} else if (data->type == PANEL_TYPE_LVDS) {
499
502
 		fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_OKAY, data);
500
-	  fdt_fixup_display_sub_route(blob, "dsi", FDT_STATUS_DISABLED, data);
503
+	  	fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_DISABLED, data);
501
504
 		fdt_fixup_display_sub_route(blob, "edp", FDT_STATUS_DISABLED, data);
502
505
 	}
503
506
 }
..
..
@@ -812,12 +815,10 @@
812
815
 		return -ENODEV;
813
816
 	}
814
817
 
815
-	if (IS_ENABLED(CONFIG_EMBED_KERNEL_DTB_ALWAYS)) {
816
-		resource_init_list();
817
-		printf("Always embed kernel dtb\n");
818
-		goto dtb_embed;
819
-	}
820
-
818
+#ifdef CONFIG_EMBED_KERNEL_DTB_ALWAYS
819
+       	printf("Always embed kernel dtb\n");
820
+       	goto dtb_embed;
821
+#endif
821
822
 	ret = rockchip_read_dtb_file((void *)fdt_addr);
822
823
 	if (!ret) {
823
824
 		if (!dtb_check_ok((void *)fdt_addr, (void *)gd->fdt_blob)) {
..
..
@@ -828,7 +829,10 @@
828
829
 		}
829
830
 	}
830
831
 
832
+#ifdef CONFIG_EMBED_KERNEL_DTB
833
+#ifdef CONFIG_EMBED_KERNEL_DTB_ALWAYS
831
834
 dtb_embed:
835
+#endif
832
836
 	if (gd->fdt_blob_kern) {
833
837
 		if (!dtb_check_ok((void *)gd->fdt_blob_kern, (void *)gd->fdt_blob)) {
834
838
 			printf("Embedded kernel dtb mismatch this platform!\n");
..
..
@@ -847,7 +851,9 @@
847
851
 		memcpy((void *)fdt_addr, gd->fdt_blob_kern,
848
852
 		       fdt_totalsize(gd->fdt_blob_kern));
849
853
 		printf("DTB: %s\n", CONFIG_EMBED_KERNEL_DTB_PATH);
850
-	} else {
854
+	} else
855
+#endif
856
+	{
851
857
 		printf("Failed to get kernel dtb, ret=%d\n", ret);
852
858
 		return -ENOENT;
853
859
 	}