From 9df731a176aab8e03b984b681b1bea01ccff6644 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Mon, 06 Nov 2023 07:23:06 +0000 Subject: [PATCH] rk3568 rt uboot init --- u-boot/arch/arm/mach-rockchip/spl.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/u-boot/arch/arm/mach-rockchip/spl.c b/u-boot/arch/arm/mach-rockchip/spl.c index 6ee6933..0bf425c 100644 --- a/u-boot/arch/arm/mach-rockchip/spl.c +++ b/u-boot/arch/arm/mach-rockchip/spl.c @@ -19,6 +19,7 @@ #ifdef CONFIG_ROCKCHIP_PRELOADER_ATAGS #include <asm/arch/rk_atags.h> #endif +#include <asm/arch/pcie_ep_boot.h> #include <asm/arch/sdram.h> #include <asm/arch/boot_mode.h> #include <asm/arch-rockchip/sys_proto.h> @@ -175,6 +176,9 @@ printascii("U-Boot SPL board init"); #endif gd->sys_start_tick = get_ticks(); +#ifdef CONFIG_SPL_PCIE_EP_SUPPORT + rockchip_pcie_ep_init(); +#endif #ifdef CONFIG_SPL_FRAMEWORK ret = spl_early_init(); if (ret) { @@ -197,6 +201,9 @@ arch_cpu_init(); rk_board_init_f(); +#ifdef CONFIG_SPL_RAM_DEVICE + rockchip_pcie_ep_get_firmware(); +#endif #if CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT) back_to_bootrom(BROM_BOOT_NEXTSTAGE); #endif @@ -368,7 +375,10 @@ spl->next_stage = SPL_NEXT_STAGE_KERNEL; break; default: - spl->next_stage = SPL_NEXT_STAGE_UBOOT; + if ((reg_boot_mode & REBOOT_FLAG) != REBOOT_FLAG) + spl->next_stage = SPL_NEXT_STAGE_KERNEL; + else + spl->next_stage = SPL_NEXT_STAGE_UBOOT; } } #endif -- Gitblit v1.6.2