Hi Jonas, On Tue, 2023-10-10 at 22:23 +0000, Jonas Karlman wrote: > Enable support for PCIe SATA cards and the on-board SATA controller. > > This also revert use of CONFIG_PCI_INIT_R in order to speed up boot from > eMMC or SD-cards. Standard boot will initialize pci after faster boot > media have been enumerated. > > Signed-off-by: Jonas Karlman <jo...@kwiboo.se>
With this patch applied, things work perfectly and the boot falls back to booting from ethernet just fine. Thank you! Reviewed-by: Christopher Obbard <chris.obb...@collabora.com> Tested-by: Christopher Obbard <chris.obb...@collabora.com> > --- > Cc: Christopher Obbard <chris.obb...@collabora.com> > --- > configs/rock5b-rk3588_defconfig | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig > index 447913faccc4..ec22e70033a0 100644 > --- a/configs/rock5b-rk3588_defconfig > +++ b/configs/rock5b-rk3588_defconfig > @@ -26,6 +26,7 @@ CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0xc00800 > CONFIG_PCI=y > CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_FIT_SIGNATURE=y > @@ -35,7 +36,6 @@ CONFIG_OF_BOARD_SETUP=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-rock-5b.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_PCI_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > @@ -63,6 +63,8 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent > assigned-clocks assigne > CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_SPL_REGMAP=y > CONFIG_SPL_SYSCON=y > +CONFIG_AHCI_PCI=y > +CONFIG_DWC_AHCI=y > CONFIG_SPL_CLK=y > # CONFIG_USB_FUNCTION_FASTBOOT is not set > CONFIG_ROCKCHIP_GPIO=y > @@ -89,6 +91,8 @@ CONFIG_SPL_PINCTRL=y > CONFIG_REGULATOR_PWM=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_SPL_RAM=y > +CONFIG_SCSI=y > +CONFIG_DM_SCSI=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y