rk3568 rt uboot init

hc

2023-11-06 9df731a176aab8e03b984b681b1bea01ccff6644

 u-boot/arch/arm/mach-rockchip/boot_rkimg.c
..
..
@@ -19,6 +19,8 @@
19
19
 #include <key.h>
20
20
 #include <mmc.h>
21
21
 #include <malloc.h>
22
+#include <mp_boot.h>
23
+#include <mtd_blk.h>
22
24
 #include <nvme.h>
23
25
 #include <scsi.h>
24
26
 #include <stdlib.h>
..
..
@@ -91,6 +93,10 @@
91
93
 
92
94
 	if (done)
93
95
 		return;
96
+
97
+#ifdef CONFIG_MP_BOOT
98
+	mpb_post(0);
99
+#endif
94
100
 
95
101
 	/* configuration */
96
102
 	if (!param_parse_assign_bootdev(&devtype, &devnum)) {
..
..
@@ -269,6 +275,9 @@
269
275
 
270
276
 	printf("PartType: %s\n", part_get_type(dev_desc));
271
277
 
278
+#ifdef CONFIG_MTD_BLK
279
+	mtd_blk_map_partitions(dev_desc);
280
+#endif
272
281
 	return dev_desc;
273
282
 }
274
283
 
..
..
@@ -512,7 +521,7 @@
512
521
 	LOCATE_END,
513
522
 };
514
523
 
515
-static int rkimg_traverse_read_dtb(void *fdt, int where)
524
+static int dtb_scan(void *fdt, int where)
516
525
 {
517
526
 	if (where == LOCATE_DISTRO) {
518
527
 #ifdef CONFIG_ROCKCHIP_EARLY_DISTRO_DTB
..
..
@@ -557,19 +566,13 @@
557
566
 	int locate, ret;
558
567
 	int size;
559
568
 
560
-	/* init resource list */
561
-#ifdef CONFIG_ROCKCHIP_RESOURCE_IMAGE
562
-	resource_traverse_init_list();
563
-#endif
564
-
565
-	/* traverse location */
566
569
 	for (locate = 0; locate < LOCATE_END; locate++) {
567
-		ret = rkimg_traverse_read_dtb(fdt, locate);
570
+		ret = dtb_scan(fdt, locate);
568
571
 		if (!ret)
569
572
 			break;
570
573
 	}
571
574
 	if (ret) {
572
-		printf("No find valid DTB, ret=%d\n", ret);
575
+		printf("No valid DTB, ret=%d\n", ret);
573
576
 		return ret;
574
577
 	}
575
578
 
..
..
@@ -608,7 +611,7 @@
608
611
 		offset = hdr->page_size + ALIGN(hdr->kernel_size, hdr->page_size) +
609
612
 			ALIGN(hdr->ramdisk_size, hdr->page_size);
610
613
 #ifdef CONFIG_ROCKCHIP_RESOURCE_IMAGE
611
-		ret = resource_create_ram_list(dev_desc, (void *)hdr + offset);
614
+		ret = resource_setup_ram_list(dev_desc, (void *)hdr + offset);
612
615
 		if (ret)
613
616
 			return ret;
614
617
 
..
..
@@ -650,9 +653,9 @@
650
653
 		if (!dev_desc)
651
654
 			return -ENODEV;
652
655
 
653
-		ret = resource_create_ram_list(dev_desc, (void *)data);
656
+		ret = resource_setup_ram_list(dev_desc, (void *)data);
654
657
 		if (ret) {
655
-			printf("resource_create_ram_list fail, ret=%d\n", ret);
658
+			printf("resource_setup_ram_list fail, ret=%d\n", ret);
656
659
 			return ret;
657
660
 		}
658
661