rk3568 rt uboot init

hc

2023-11-06 9df731a176aab8e03b984b681b1bea01ccff6644

 u-boot/arch/arm/mach-rockchip/spl.c
..
..
@@ -19,6 +19,7 @@
19
19
 #ifdef CONFIG_ROCKCHIP_PRELOADER_ATAGS
20
20
 #include <asm/arch/rk_atags.h>
21
21
 #endif
22
+#include <asm/arch/pcie_ep_boot.h>
22
23
 #include <asm/arch/sdram.h>
23
24
 #include <asm/arch/boot_mode.h>
24
25
 #include <asm/arch-rockchip/sys_proto.h>
..
..
@@ -175,6 +176,9 @@
175
176
 	printascii("U-Boot SPL board init");
176
177
 #endif
177
178
 	gd->sys_start_tick = get_ticks();
179
+#ifdef CONFIG_SPL_PCIE_EP_SUPPORT
180
+	rockchip_pcie_ep_init();
181
+#endif
178
182
 #ifdef CONFIG_SPL_FRAMEWORK
179
183
 	ret = spl_early_init();
180
184
 	if (ret) {
..
..
@@ -197,6 +201,9 @@
197
201
 
198
202
 	arch_cpu_init();
199
203
 	rk_board_init_f();
204
+#ifdef CONFIG_SPL_RAM_DEVICE
205
+	rockchip_pcie_ep_get_firmware();
206
+#endif
200
207
 #if CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT)
201
208
 	back_to_bootrom(BROM_BOOT_NEXTSTAGE);
202
209
 #endif
..
..
@@ -368,7 +375,10 @@
368
375
 		spl->next_stage = SPL_NEXT_STAGE_KERNEL;
369
376
 		break;
370
377
 	default:
371
-		spl->next_stage = SPL_NEXT_STAGE_UBOOT;
378
+		if ((reg_boot_mode & REBOOT_FLAG) != REBOOT_FLAG)
379
+			spl->next_stage = SPL_NEXT_STAGE_KERNEL;
380
+		else
381
+			spl->next_stage = SPL_NEXT_STAGE_UBOOT;
372
382
 	}
373
383
 }
374
384
 #endif