debug lk

hc

2024-02-20 e636c8d336489bf3eed5878299e6cc045bbad077

 u-boot/arch/arm/mach-rockchip/kernel_dtb.c
old mode 100755new mode 100644
..
..
@@ -815,12 +815,10 @@
815
815
 		return -ENODEV;
816
816
 	}
817
817
 
818
-	if (IS_ENABLED(CONFIG_EMBED_KERNEL_DTB_ALWAYS)) {
819
-		resource_init_list();
820
-		printf("Always embed kernel dtb\n");
821
-		goto dtb_embed;
822
-	}
823
-
818
+#ifdef CONFIG_EMBED_KERNEL_DTB_ALWAYS
819
+       	printf("Always embed kernel dtb\n");
820
+       	goto dtb_embed;
821
+#endif
824
822
 	ret = rockchip_read_dtb_file((void *)fdt_addr);
825
823
 	if (!ret) {
826
824
 		if (!dtb_check_ok((void *)fdt_addr, (void *)gd->fdt_blob)) {
..
..
@@ -831,7 +829,10 @@
831
829
 		}
832
830
 	}
833
831
 
832
+#ifdef CONFIG_EMBED_KERNEL_DTB
833
+#ifdef CONFIG_EMBED_KERNEL_DTB_ALWAYS
834
834
 dtb_embed:
835
+#endif
835
836
 	if (gd->fdt_blob_kern) {
836
837
 		if (!dtb_check_ok((void *)gd->fdt_blob_kern, (void *)gd->fdt_blob)) {
837
838
 			printf("Embedded kernel dtb mismatch this platform!\n");
..
..
@@ -850,7 +851,9 @@
850
851
 		memcpy((void *)fdt_addr, gd->fdt_blob_kern,
851
852
 		       fdt_totalsize(gd->fdt_blob_kern));
852
853
 		printf("DTB: %s\n", CONFIG_EMBED_KERNEL_DTB_PATH);
853
-	} else {
854
+	} else
855
+#endif
856
+	{
854
857
 		printf("Failed to get kernel dtb, ret=%d\n", ret);
855
858
 		return -ENOENT;
856
859
 	}