| Message ID | 20240331202921.262323-29-jonas@kwiboo.se |
|---|---|
| State | Changes Requested |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3399: Sync DT with linux v6.8 and update defconfigs | expand |
Hello Jonas, Please see my comments below. On 2024-03-31 22:28, Jonas Karlman wrote: > Sync rk3399-rock-pi-4 related device tree from linux v6.8. > > Add SPI flash related options to support booting from SPI flash. > > Add AHCI=y, SCSI_AHCI=y, AHCI_PCI=y and SCSI=y to support PCIe SATA > boot. As we know, these boards have no standard connectors for PCI Express expansion cards, which makes me wonder how many users actually use M.2 PCI Express modules with SATA controllers on them with these boards, and need support for them in U-Boot? I mean, it can't hurt, but frankly, I'm not 100% sure about it. > Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. > > Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. > > Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. > > Remove SPL_TINY_MEMSET=y to use full memset in SPL. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Otherwise, looking good to me. Reviewed-by: Dragan Simic <dsimic@manjaro.org> > --- > arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 12 ++++++++++ > arch/arm/dts/rk3399-rock-4c-plus.dts | 1 + > arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 12 ++++++++++ > arch/arm/dts/rk3399-rock-pi-4.dtsi | 4 +++- > arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 7 ++++++ > arch/arm/dts/rk3399-rock-pi-4c.dts | 10 ++++++++ > configs/rock-4c-plus-rk3399_defconfig | 24 +++++++++++++++----- > configs/rock-4se-rk3399_defconfig | 23 +++++++++++++++++-- > configs/rock-pi-4-rk3399_defconfig | 8 +++++++ > configs/rock-pi-4c-rk3399_defconfig | 24 ++++++++++++++++++-- > 10 files changed, 114 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > index 9785b97b9eea..b5ee644a83dd 100644 > --- a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > @@ -11,3 +11,15 @@ > &pcfg_pull_up_8ma { > bootph-pre-ram; > }; > + > +&spi1 { > + status = "okay"; > + > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <10000000>; > + }; > +}; > diff --git a/arch/arm/dts/rk3399-rock-4c-plus.dts > b/arch/arm/dts/rk3399-rock-4c-plus.dts > index 8bfd5f88d1ef..7baf9d1b22fd 100644 > --- a/arch/arm/dts/rk3399-rock-4c-plus.dts > +++ b/arch/arm/dts/rk3399-rock-4c-plus.dts > @@ -15,6 +15,7 @@ > compatible = "radxa,rock-4c-plus", "rockchip,rk3399"; > > aliases { > + ethernet0 = &gmac; > mmc0 = &sdhci; > mmc1 = &sdmmc; > }; > diff --git a/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi > b/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi > index 85ee5770add0..2213d0093052 100644 > --- a/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi > @@ -4,3 +4,15 @@ > */ > > #include "rk3399-rock-pi-4-u-boot.dtsi" > + > +&spi1 { > + status = "okay"; > + > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <10000000>; > + }; > +}; > diff --git a/arch/arm/dts/rk3399-rock-pi-4.dtsi > b/arch/arm/dts/rk3399-rock-pi-4.dtsi > index b1b7f4ffb1d4..281a12180703 100644 > --- a/arch/arm/dts/rk3399-rock-pi-4.dtsi > +++ b/arch/arm/dts/rk3399-rock-pi-4.dtsi > @@ -12,6 +12,7 @@ > > / { > aliases { > + ethernet0 = &gmac; > mmc0 = &sdhci; > mmc1 = &sdmmc; > }; > @@ -44,7 +45,7 @@ > sdio_pwrseq: sdio-pwrseq { > compatible = "mmc-pwrseq-simple"; > clocks = <&rk808 1>; > - clock-names = "ext_clock"; > + clock-names = "lpo"; > pinctrl-names = "default"; > pinctrl-0 = <&wifi_enable_h>; > reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; > @@ -492,6 +493,7 @@ > > &i2s0 { > pinctrl-0 = <&i2s0_2ch_bus>; > + pinctrl-1 = <&i2s0_2ch_bus_bclk_off>; > rockchip,capture-channels = <2>; > rockchip,playback-channels = <2>; > status = "okay"; > diff --git a/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > b/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > index 85ee5770add0..38385621deb1 100644 > --- a/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > @@ -4,3 +4,10 @@ > */ > > #include "rk3399-rock-pi-4-u-boot.dtsi" > + > +&spi1 { > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + }; > +}; > diff --git a/arch/arm/dts/rk3399-rock-pi-4c.dts > b/arch/arm/dts/rk3399-rock-pi-4c.dts > index d32efab74e94..de2ebe4cb4f3 100644 > --- a/arch/arm/dts/rk3399-rock-pi-4c.dts > +++ b/arch/arm/dts/rk3399-rock-pi-4c.dts > @@ -43,6 +43,16 @@ > hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; > }; > > +&spi1 { > + status = "okay"; > + > + flash@0 { > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <10000000>; > + }; > +}; > + > &uart0 { > status = "okay"; > > diff --git a/configs/rock-4c-plus-rk3399_defconfig > b/configs/rock-4c-plus-rk3399_defconfig > index 2024defb2bf0..e97fde17acc2 100644 > --- a/configs/rock-4c-plus-rk3399_defconfig > +++ b/configs/rock-4c-plus-rk3399_defconfig > @@ -3,22 +3,27 @@ CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_NR_DRAM_BANKS=1 > +CONFIG_SF_DEFAULT_SPEED=10000000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-4c-plus" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3399=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > CONFIG_TARGET_ROCKPI4_RK3399=y > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > -CONFIG_PCI=y > CONFIG_DEBUG_UART=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-4c-plus.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_MAX_SIZE=0x2e000 > +CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 > CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > @@ -26,7 +31,6 @@ CONFIG_CMD_NVEDIT_EFI=y > CONFIG_CMD_DFU=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > -CONFIG_CMD_PCI=y > CONFIG_CMD_USB=y > CONFIG_CMD_ROCKUSB=y > CONFIG_CMD_USB_MASS_STORAGE=y > @@ -40,23 +44,32 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_ROCKCHIP_IODOMAIN=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=1 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_NVME_PCI=y > CONFIG_PHY_ROCKCHIP_INNO_USB2=y > CONFIG_PHY_ROCKCHIP_TYPEC=y > CONFIG_PMIC_RK8XX=y > -CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SPI=y > CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > @@ -77,7 +90,6 @@ CONFIG_VIDEO=y > CONFIG_DISPLAY=y > CONFIG_VIDEO_ROCKCHIP=y > CONFIG_DISPLAY_ROCKCHIP_HDMI=y > -CONFIG_SPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > CONFIG_EFI_CAPSULE_ON_DISK=y > CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y > diff --git a/configs/rock-4se-rk3399_defconfig > b/configs/rock-4se-rk3399_defconfig > index 9b2303fdf792..13f5f84b9836 100644 > --- a/configs/rock-4se-rk3399_defconfig > +++ b/configs/rock-4se-rk3399_defconfig > @@ -3,22 +3,29 @@ CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_NR_DRAM_BANKS=1 > +CONFIG_SF_DEFAULT_SPEED=10000000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-4se" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3399=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > CONFIG_TARGET_ROCKPI4_RK3399=y > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_PCI=y > CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-4se.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_MAX_SIZE=0x2e000 > +CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_NVEDIT_EFI=y > @@ -36,14 +43,25 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent > assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_ROCKCHIP_IODOMAIN=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=1 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_NVME_PCI=y > @@ -54,9 +72,11 @@ CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SPI=y > CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > @@ -77,7 +97,6 @@ CONFIG_VIDEO=y > CONFIG_DISPLAY=y > CONFIG_VIDEO_ROCKCHIP=y > CONFIG_DISPLAY_ROCKCHIP_HDMI=y > -CONFIG_SPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > CONFIG_EFI_CAPSULE_ON_DISK=y > CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y > diff --git a/configs/rock-pi-4-rk3399_defconfig > b/configs/rock-pi-4-rk3399_defconfig > index e5a2bba8e7ff..d474d91053c1 100644 > --- a/configs/rock-pi-4-rk3399_defconfig > +++ b/configs/rock-pi-4-rk3399_defconfig > @@ -17,6 +17,7 @@ CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_PCI=y > CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > @@ -43,6 +44,8 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent > assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > @@ -54,8 +57,12 @@ CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > CONFIG_SF_DEFAULT_BUS=1 > CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > CONFIG_SPI_FLASH_WINBOND=y > CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_NVME_PCI=y > @@ -66,6 +73,7 @@ CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > diff --git a/configs/rock-pi-4c-rk3399_defconfig > b/configs/rock-pi-4c-rk3399_defconfig > index 4a9d1c531c10..50c6755246f2 100644 > --- a/configs/rock-pi-4c-rk3399_defconfig > +++ b/configs/rock-pi-4c-rk3399_defconfig > @@ -3,22 +3,29 @@ CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_NR_DRAM_BANKS=1 > +CONFIG_SF_DEFAULT_SPEED=10000000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4c" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3399=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > CONFIG_TARGET_ROCKPI4_RK3399=y > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_PCI=y > CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4c.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_MAX_SIZE=0x2e000 > +CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 > CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > @@ -37,13 +44,25 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent > assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_ROCKCHIP_IODOMAIN=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=1 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_NVME_PCI=y > @@ -54,9 +73,11 @@ CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SPI=y > CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > @@ -77,7 +98,6 @@ CONFIG_VIDEO=y > CONFIG_DISPLAY=y > CONFIG_VIDEO_ROCKCHIP=y > CONFIG_DISPLAY_ROCKCHIP_HDMI=y > -CONFIG_SPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > CONFIG_EFI_CAPSULE_ON_DISK=y > CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
Hi Dragan, On 2024-04-01 00:53, Dragan Simic wrote: > Hello Jonas, > > Please see my comments below. > > On 2024-03-31 22:28, Jonas Karlman wrote: >> Sync rk3399-rock-pi-4 related device tree from linux v6.8. >> >> Add SPI flash related options to support booting from SPI flash. >> >> Add AHCI=y, SCSI_AHCI=y, AHCI_PCI=y and SCSI=y to support PCIe SATA >> boot. > > As we know, these boards have no standard connectors for PCI Express > expansion cards, which makes me wonder how many users actually use M.2 > PCI Express modules with SATA controllers on them with these boards, > and need support for them in U-Boot? > > I mean, it can't hurt, but frankly, I'm not 100% sure about it. With the M.2 Extension Board [1] and a M.2 to PCIe X4 adapter it is very easy to convert the M.2 slot into a standard PCIe X4 slot and use it with a PCIe SATA card. At least that is how I have tested and used this. I do think there will be many users of PCIe AHCI/SATA, but with this series I try to get all boards to have same feature set as long as there is some way to use a feature. [1] https://radxa.com/products/accessories/m2-extension-board > >> Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. >> >> Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. >> >> Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. >> >> Remove SPL_TINY_MEMSET=y to use full memset in SPL. >> >> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> > > Otherwise, looking good to me. > > Reviewed-by: Dragan Simic <dsimic@manjaro.org> Thanks! Regards, Jonas > >> --- >> arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 12 ++++++++++ >> arch/arm/dts/rk3399-rock-4c-plus.dts | 1 + >> arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 12 ++++++++++ >> arch/arm/dts/rk3399-rock-pi-4.dtsi | 4 +++- >> arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 7 ++++++ >> arch/arm/dts/rk3399-rock-pi-4c.dts | 10 ++++++++ >> configs/rock-4c-plus-rk3399_defconfig | 24 +++++++++++++++----- >> configs/rock-4se-rk3399_defconfig | 23 +++++++++++++++++-- >> configs/rock-pi-4-rk3399_defconfig | 8 +++++++ >> configs/rock-pi-4c-rk3399_defconfig | 24 ++++++++++++++++++-- >> 10 files changed, 114 insertions(+), 11 deletions(-) >> [snip]
On 2024-04-01 01:14, Jonas Karlman wrote: > On 2024-04-01 00:53, Dragan Simic wrote: >> Please see my comments below. >> >> On 2024-03-31 22:28, Jonas Karlman wrote: >>> Sync rk3399-rock-pi-4 related device tree from linux v6.8. >>> >>> Add SPI flash related options to support booting from SPI flash. >>> >>> Add AHCI=y, SCSI_AHCI=y, AHCI_PCI=y and SCSI=y to support PCIe SATA >>> boot. >> >> As we know, these boards have no standard connectors for PCI Express >> expansion cards, which makes me wonder how many users actually use M.2 >> PCI Express modules with SATA controllers on them with these boards, >> and need support for them in U-Boot? >> >> I mean, it can't hurt, but frankly, I'm not 100% sure about it. > > With the M.2 Extension Board [1] and a M.2 to PCIe X4 adapter it is > very > easy to convert the M.2 slot into a standard PCIe X4 slot and use it > with a PCIe SATA card. At least that is how I have tested and used > this. I was aware of the M.2 extension board sold by Radxa, but frankly, using it together with another adapter (M.2 to standard PCIe x4 slot) is a cumbersome setup. The whole thing becomes at least three times the size of the SBC, with cables and a dangling PCIe card. :) I had in mind an M.2 module with a PCIe SATA controller. [2] Something like that, used together with the M.2 extension board, would actually make a rather neat setup. [2] https://www.reddit.com/r/selfhosted/comments/s0bf1d/m2_sata_expansion_anyone_use_something_like_this/ > I do think there will be many users of PCIe AHCI/SATA, but with this > series I try to get all boards to have same feature set as long as > there > is some way to use a feature. I guess it can't hurt in the end. > [1] https://radxa.com/products/accessories/m2-extension-board > >>> Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. >>> >>> Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. >>> >>> Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. >>> >>> Remove SPL_TINY_MEMSET=y to use full memset in SPL. >>> >>> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> >> >> Otherwise, looking good to me. >> >> Reviewed-by: Dragan Simic <dsimic@manjaro.org> > > Thanks! > > Regards, > Jonas > >>> --- >>> arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 12 ++++++++++ >>> arch/arm/dts/rk3399-rock-4c-plus.dts | 1 + >>> arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 12 ++++++++++ >>> arch/arm/dts/rk3399-rock-pi-4.dtsi | 4 +++- >>> arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 7 ++++++ >>> arch/arm/dts/rk3399-rock-pi-4c.dts | 10 ++++++++ >>> configs/rock-4c-plus-rk3399_defconfig | 24 >>> +++++++++++++++----- >>> configs/rock-4se-rk3399_defconfig | 23 >>> +++++++++++++++++-- >>> configs/rock-pi-4-rk3399_defconfig | 8 +++++++ >>> configs/rock-pi-4c-rk3399_defconfig | 24 >>> ++++++++++++++++++-- >>> 10 files changed, 114 insertions(+), 11 deletions(-) >>> > [snip]
On 2024-04-01 01:30, Dragan Simic wrote: > On 2024-04-01 01:14, Jonas Karlman wrote: >> On 2024-04-01 00:53, Dragan Simic wrote: >>> Please see my comments below. >>> >>> On 2024-03-31 22:28, Jonas Karlman wrote: >>>> Sync rk3399-rock-pi-4 related device tree from linux v6.8. >>>> >>>> Add SPI flash related options to support booting from SPI flash. >>>> >>>> Add AHCI=y, SCSI_AHCI=y, AHCI_PCI=y and SCSI=y to support PCIe SATA >>>> boot. >>> >>> As we know, these boards have no standard connectors for PCI Express >>> expansion cards, which makes me wonder how many users actually use M.2 >>> PCI Express modules with SATA controllers on them with these boards, >>> and need support for them in U-Boot? >>> >>> I mean, it can't hurt, but frankly, I'm not 100% sure about it. >> >> With the M.2 Extension Board [1] and a M.2 to PCIe X4 adapter it is >> very >> easy to convert the M.2 slot into a standard PCIe X4 slot and use it >> with a PCIe SATA card. At least that is how I have tested and used >> this. > > I was aware of the M.2 extension board sold by Radxa, but frankly, > using it together with another adapter (M.2 to standard PCIe x4 slot) > is a cumbersome setup. The whole thing becomes at least three times > the size of the SBC, with cables and a dangling PCIe card. :) I know, it is not ideal, but works for my testing and development proposes :-) > > I had in mind an M.2 module with a PCIe SATA controller. [2] Something > like that, used together with the M.2 extension board, would actually > make a rather neat setup. I guess the Radxa Penta SATA HAT [3] is most likely use case for having PCIe AHCI enabled. [3] https://radxa.com/products/accessories/penta-sata-hat/ Regards, Jonas > > [2] > https://www.reddit.com/r/selfhosted/comments/s0bf1d/m2_sata_expansion_anyone_use_something_like_this/ > >> I do think there will be many users of PCIe AHCI/SATA, but with this >> series I try to get all boards to have same feature set as long as >> there >> is some way to use a feature. > > I guess it can't hurt in the end. > >> [1] https://radxa.com/products/accessories/m2-extension-board >> >>>> Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. >>>> >>>> Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. >>>> >>>> Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. >>>> >>>> Remove SPL_TINY_MEMSET=y to use full memset in SPL. >>>> >>>> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> >>> >>> Otherwise, looking good to me. >>> >>> Reviewed-by: Dragan Simic <dsimic@manjaro.org> >> >> Thanks! >> >> Regards, >> Jonas >> >>>> --- >>>> arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 12 ++++++++++ >>>> arch/arm/dts/rk3399-rock-4c-plus.dts | 1 + >>>> arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 12 ++++++++++ >>>> arch/arm/dts/rk3399-rock-pi-4.dtsi | 4 +++- >>>> arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 7 ++++++ >>>> arch/arm/dts/rk3399-rock-pi-4c.dts | 10 ++++++++ >>>> configs/rock-4c-plus-rk3399_defconfig | 24 >>>> +++++++++++++++----- >>>> configs/rock-4se-rk3399_defconfig | 23 >>>> +++++++++++++++++-- >>>> configs/rock-pi-4-rk3399_defconfig | 8 +++++++ >>>> configs/rock-pi-4c-rk3399_defconfig | 24 >>>> ++++++++++++++++++-- >>>> 10 files changed, 114 insertions(+), 11 deletions(-) >>>> >> [snip]
On 2024-04-01 01:41, Jonas Karlman wrote: > On 2024-04-01 01:30, Dragan Simic wrote: >> On 2024-04-01 01:14, Jonas Karlman wrote: >>> On 2024-04-01 00:53, Dragan Simic wrote: >>>> Please see my comments below. >>>> >>>> On 2024-03-31 22:28, Jonas Karlman wrote: >>>>> Sync rk3399-rock-pi-4 related device tree from linux v6.8. >>>>> >>>>> Add SPI flash related options to support booting from SPI flash. >>>>> >>>>> Add AHCI=y, SCSI_AHCI=y, AHCI_PCI=y and SCSI=y to support PCIe SATA >>>>> boot. >>>> >>>> As we know, these boards have no standard connectors for PCI Express >>>> expansion cards, which makes me wonder how many users actually use >>>> M.2 >>>> PCI Express modules with SATA controllers on them with these boards, >>>> and need support for them in U-Boot? >>>> >>>> I mean, it can't hurt, but frankly, I'm not 100% sure about it. >>> >>> With the M.2 Extension Board [1] and a M.2 to PCIe X4 adapter it is >>> very >>> easy to convert the M.2 slot into a standard PCIe X4 slot and use it >>> with a PCIe SATA card. At least that is how I have tested and used >>> this. >> >> I was aware of the M.2 extension board sold by Radxa, but frankly, >> using it together with another adapter (M.2 to standard PCIe x4 slot) >> is a cumbersome setup. The whole thing becomes at least three times >> the size of the SBC, with cables and a dangling PCIe card. :) > > I know, it is not ideal, but works for my testing and development > proposes :-) > >> I had in mind an M.2 module with a PCIe SATA controller. [2] >> Something >> like that, used together with the M.2 extension board, would actually >> make a rather neat setup. > > I guess the Radxa Penta SATA HAT [3] is most likely use case for having > PCIe AHCI enabled. Ah, thanks for reminding me about this hat! I saw it once or twice, but I somehow forgot about it. Yes, that's very nice, and surely a use case for having AHCI support enabled. > [3] https://radxa.com/products/accessories/penta-sata-hat/ > > Regards, > Jonas > >> >> [2] >> https://www.reddit.com/r/selfhosted/comments/s0bf1d/m2_sata_expansion_anyone_use_something_like_this/ >> >>> I do think there will be many users of PCIe AHCI/SATA, but with this >>> series I try to get all boards to have same feature set as long as >>> there >>> is some way to use a feature. >> >> I guess it can't hurt in the end. >> >>> [1] https://radxa.com/products/accessories/m2-extension-board >>> >>>>> Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. >>>>> >>>>> Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. >>>>> >>>>> Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. >>>>> >>>>> Remove SPL_TINY_MEMSET=y to use full memset in SPL. >>>>> >>>>> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> >>>> >>>> Otherwise, looking good to me. >>>> >>>> Reviewed-by: Dragan Simic <dsimic@manjaro.org> >>> >>> Thanks! >>> >>> Regards, >>> Jonas >>> >>>>> --- >>>>> arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 12 ++++++++++ >>>>> arch/arm/dts/rk3399-rock-4c-plus.dts | 1 + >>>>> arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 12 ++++++++++ >>>>> arch/arm/dts/rk3399-rock-pi-4.dtsi | 4 +++- >>>>> arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 7 ++++++ >>>>> arch/arm/dts/rk3399-rock-pi-4c.dts | 10 ++++++++ >>>>> configs/rock-4c-plus-rk3399_defconfig | 24 >>>>> +++++++++++++++----- >>>>> configs/rock-4se-rk3399_defconfig | 23 >>>>> +++++++++++++++++-- >>>>> configs/rock-pi-4-rk3399_defconfig | 8 +++++++ >>>>> configs/rock-pi-4c-rk3399_defconfig | 24 >>>>> ++++++++++++++++++-- >>>>> 10 files changed, 114 insertions(+), 11 deletions(-) >>>>> >>> [snip]
Hi Jonas, On Sun, 2024-03-31 at 20:28 +0000, Jonas Karlman wrote: > Sync rk3399-rock-pi-4 related device tree from linux v6.8. > > Add SPI flash related options to support booting from SPI flash. > > Add AHCI=y, SCSI_AHCI=y, AHCI_PCI=y and SCSI=y to support PCIe SATA boot. > > Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. > > Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. > > Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. > > Remove SPL_TINY_MEMSET=y to use full memset in SPL. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Thank you for taking care of this. Reviewed-by: Christopher Obbard <chris.obbard@collabora.com> > --- > arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 12 ++++++++++ > arch/arm/dts/rk3399-rock-4c-plus.dts | 1 + > arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 12 ++++++++++ > arch/arm/dts/rk3399-rock-pi-4.dtsi | 4 +++- > arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 7 ++++++ > arch/arm/dts/rk3399-rock-pi-4c.dts | 10 ++++++++ > configs/rock-4c-plus-rk3399_defconfig | 24 +++++++++++++++----- > configs/rock-4se-rk3399_defconfig | 23 +++++++++++++++++-- > configs/rock-pi-4-rk3399_defconfig | 8 +++++++ > configs/rock-pi-4c-rk3399_defconfig | 24 ++++++++++++++++++-- > 10 files changed, 114 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > index 9785b97b9eea..b5ee644a83dd 100644 > --- a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > @@ -11,3 +11,15 @@ > &pcfg_pull_up_8ma { > bootph-pre-ram; > }; > + > +&spi1 { > + status = "okay"; > + > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <10000000>; > + }; > +}; > diff --git a/arch/arm/dts/rk3399-rock-4c-plus.dts b/arch/arm/dts/rk3399- > rock-4c-plus.dts > index 8bfd5f88d1ef..7baf9d1b22fd 100644 > --- a/arch/arm/dts/rk3399-rock-4c-plus.dts > +++ b/arch/arm/dts/rk3399-rock-4c-plus.dts > @@ -15,6 +15,7 @@ > compatible = "radxa,rock-4c-plus", "rockchip,rk3399"; > > aliases { > + ethernet0 = &gmac; > mmc0 = &sdhci; > mmc1 = &sdmmc; > }; > diff --git a/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi b/arch/arm/dts/rk3399- > rock-4se-u-boot.dtsi > index 85ee5770add0..2213d0093052 100644 > --- a/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi > @@ -4,3 +4,15 @@ > */ > > #include "rk3399-rock-pi-4-u-boot.dtsi" > + > +&spi1 { > + status = "okay"; > + > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <10000000>; > + }; > +}; > diff --git a/arch/arm/dts/rk3399-rock-pi-4.dtsi b/arch/arm/dts/rk3399-rock- > pi-4.dtsi > index b1b7f4ffb1d4..281a12180703 100644 > --- a/arch/arm/dts/rk3399-rock-pi-4.dtsi > +++ b/arch/arm/dts/rk3399-rock-pi-4.dtsi > @@ -12,6 +12,7 @@ > > / { > aliases { > + ethernet0 = &gmac; > mmc0 = &sdhci; > mmc1 = &sdmmc; > }; > @@ -44,7 +45,7 @@ > sdio_pwrseq: sdio-pwrseq { > compatible = "mmc-pwrseq-simple"; > clocks = <&rk808 1>; > - clock-names = "ext_clock"; > + clock-names = "lpo"; > pinctrl-names = "default"; > pinctrl-0 = <&wifi_enable_h>; > reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; > @@ -492,6 +493,7 @@ > > &i2s0 { > pinctrl-0 = <&i2s0_2ch_bus>; > + pinctrl-1 = <&i2s0_2ch_bus_bclk_off>; > rockchip,capture-channels = <2>; > rockchip,playback-channels = <2>; > status = "okay"; > diff --git a/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > b/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > index 85ee5770add0..38385621deb1 100644 > --- a/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > @@ -4,3 +4,10 @@ > */ > > #include "rk3399-rock-pi-4-u-boot.dtsi" > + > +&spi1 { > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + }; > +}; > diff --git a/arch/arm/dts/rk3399-rock-pi-4c.dts b/arch/arm/dts/rk3399-rock- > pi-4c.dts > index d32efab74e94..de2ebe4cb4f3 100644 > --- a/arch/arm/dts/rk3399-rock-pi-4c.dts > +++ b/arch/arm/dts/rk3399-rock-pi-4c.dts > @@ -43,6 +43,16 @@ > hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; > }; > > +&spi1 { > + status = "okay"; > + > + flash@0 { > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <10000000>; > + }; > +}; > + > &uart0 { > status = "okay"; > > diff --git a/configs/rock-4c-plus-rk3399_defconfig b/configs/rock-4c-plus- > rk3399_defconfig > index 2024defb2bf0..e97fde17acc2 100644 > --- a/configs/rock-4c-plus-rk3399_defconfig > +++ b/configs/rock-4c-plus-rk3399_defconfig > @@ -3,22 +3,27 @@ CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_NR_DRAM_BANKS=1 > +CONFIG_SF_DEFAULT_SPEED=10000000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-4c-plus" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3399=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > CONFIG_TARGET_ROCKPI4_RK3399=y > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > -CONFIG_PCI=y > CONFIG_DEBUG_UART=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-4c-plus.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_MAX_SIZE=0x2e000 > +CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 > CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > @@ -26,7 +31,6 @@ CONFIG_CMD_NVEDIT_EFI=y > CONFIG_CMD_DFU=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > -CONFIG_CMD_PCI=y > CONFIG_CMD_USB=y > CONFIG_CMD_ROCKUSB=y > CONFIG_CMD_USB_MASS_STORAGE=y > @@ -40,23 +44,32 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_ROCKCHIP_IODOMAIN=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=1 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_NVME_PCI=y > CONFIG_PHY_ROCKCHIP_INNO_USB2=y > CONFIG_PHY_ROCKCHIP_TYPEC=y > CONFIG_PMIC_RK8XX=y > -CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SPI=y > CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > @@ -77,7 +90,6 @@ CONFIG_VIDEO=y > CONFIG_DISPLAY=y > CONFIG_VIDEO_ROCKCHIP=y > CONFIG_DISPLAY_ROCKCHIP_HDMI=y > -CONFIG_SPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > CONFIG_EFI_CAPSULE_ON_DISK=y > CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y > diff --git a/configs/rock-4se-rk3399_defconfig b/configs/rock-4se- > rk3399_defconfig > index 9b2303fdf792..13f5f84b9836 100644 > --- a/configs/rock-4se-rk3399_defconfig > +++ b/configs/rock-4se-rk3399_defconfig > @@ -3,22 +3,29 @@ CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_NR_DRAM_BANKS=1 > +CONFIG_SF_DEFAULT_SPEED=10000000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-4se" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3399=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > CONFIG_TARGET_ROCKPI4_RK3399=y > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_PCI=y > CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-4se.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_MAX_SIZE=0x2e000 > +CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_NVEDIT_EFI=y > @@ -36,14 +43,25 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks > assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_ROCKCHIP_IODOMAIN=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=1 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_NVME_PCI=y > @@ -54,9 +72,11 @@ CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SPI=y > CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > @@ -77,7 +97,6 @@ CONFIG_VIDEO=y > CONFIG_DISPLAY=y > CONFIG_VIDEO_ROCKCHIP=y > CONFIG_DISPLAY_ROCKCHIP_HDMI=y > -CONFIG_SPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > CONFIG_EFI_CAPSULE_ON_DISK=y > CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y > diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4- > rk3399_defconfig > index e5a2bba8e7ff..d474d91053c1 100644 > --- a/configs/rock-pi-4-rk3399_defconfig > +++ b/configs/rock-pi-4-rk3399_defconfig > @@ -17,6 +17,7 @@ CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_PCI=y > CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > @@ -43,6 +44,8 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks > assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > @@ -54,8 +57,12 @@ CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > CONFIG_SF_DEFAULT_BUS=1 > CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > CONFIG_SPI_FLASH_WINBOND=y > CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_NVME_PCI=y > @@ -66,6 +73,7 @@ CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c- > rk3399_defconfig > index 4a9d1c531c10..50c6755246f2 100644 > --- a/configs/rock-pi-4c-rk3399_defconfig > +++ b/configs/rock-pi-4c-rk3399_defconfig > @@ -3,22 +3,29 @@ CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_NR_DRAM_BANKS=1 > +CONFIG_SF_DEFAULT_SPEED=10000000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4c" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3399=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > CONFIG_TARGET_ROCKPI4_RK3399=y > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_PCI=y > CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4c.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_MAX_SIZE=0x2e000 > +CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 > CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > @@ -37,13 +44,25 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks > assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_ROCKCHIP_IODOMAIN=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=1 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_NVME_PCI=y > @@ -54,9 +73,11 @@ CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SPI=y > CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > @@ -77,7 +98,6 @@ CONFIG_VIDEO=y > CONFIG_DISPLAY=y > CONFIG_VIDEO_ROCKCHIP=y > CONFIG_DISPLAY_ROCKCHIP_HDMI=y > -CONFIG_SPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > CONFIG_EFI_CAPSULE_ON_DISK=y > CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
On 2024/4/1 04:28, Jonas Karlman wrote: > Sync rk3399-rock-pi-4 related device tree from linux v6.8. > > Add SPI flash related options to support booting from SPI flash. > > Add AHCI=y, SCSI_AHCI=y, AHCI_PCI=y and SCSI=y to support PCIe SATA boot. > > Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. > > Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. > > Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. > > Remove SPL_TINY_MEMSET=y to use full memset in SPL. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 12 ++++++++++ > arch/arm/dts/rk3399-rock-4c-plus.dts | 1 + > arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 12 ++++++++++ > arch/arm/dts/rk3399-rock-pi-4.dtsi | 4 +++- > arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 7 ++++++ > arch/arm/dts/rk3399-rock-pi-4c.dts | 10 ++++++++ > configs/rock-4c-plus-rk3399_defconfig | 24 +++++++++++++++----- > configs/rock-4se-rk3399_defconfig | 23 +++++++++++++++++-- > configs/rock-pi-4-rk3399_defconfig | 8 +++++++ > configs/rock-pi-4c-rk3399_defconfig | 24 ++++++++++++++++++-- > 10 files changed, 114 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > index 9785b97b9eea..b5ee644a83dd 100644 > --- a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi > @@ -11,3 +11,15 @@ > &pcfg_pull_up_8ma { > bootph-pre-ram; > }; > + > +&spi1 { > + status = "okay"; > + > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <10000000>; > + }; > +}; > diff --git a/arch/arm/dts/rk3399-rock-4c-plus.dts b/arch/arm/dts/rk3399-rock-4c-plus.dts > index 8bfd5f88d1ef..7baf9d1b22fd 100644 > --- a/arch/arm/dts/rk3399-rock-4c-plus.dts > +++ b/arch/arm/dts/rk3399-rock-4c-plus.dts > @@ -15,6 +15,7 @@ > compatible = "radxa,rock-4c-plus", "rockchip,rk3399"; > > aliases { > + ethernet0 = &gmac; > mmc0 = &sdhci; > mmc1 = &sdmmc; > }; > diff --git a/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi b/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi > index 85ee5770add0..2213d0093052 100644 > --- a/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi > @@ -4,3 +4,15 @@ > */ > > #include "rk3399-rock-pi-4-u-boot.dtsi" > + > +&spi1 { > + status = "okay"; > + > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <10000000>; > + }; > +}; > diff --git a/arch/arm/dts/rk3399-rock-pi-4.dtsi b/arch/arm/dts/rk3399-rock-pi-4.dtsi > index b1b7f4ffb1d4..281a12180703 100644 > --- a/arch/arm/dts/rk3399-rock-pi-4.dtsi > +++ b/arch/arm/dts/rk3399-rock-pi-4.dtsi > @@ -12,6 +12,7 @@ > > / { > aliases { > + ethernet0 = &gmac; > mmc0 = &sdhci; > mmc1 = &sdmmc; > }; > @@ -44,7 +45,7 @@ > sdio_pwrseq: sdio-pwrseq { > compatible = "mmc-pwrseq-simple"; > clocks = <&rk808 1>; > - clock-names = "ext_clock"; > + clock-names = "lpo"; > pinctrl-names = "default"; > pinctrl-0 = <&wifi_enable_h>; > reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; > @@ -492,6 +493,7 @@ > > &i2s0 { > pinctrl-0 = <&i2s0_2ch_bus>; > + pinctrl-1 = <&i2s0_2ch_bus_bclk_off>; > rockchip,capture-channels = <2>; > rockchip,playback-channels = <2>; > status = "okay"; > diff --git a/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > index 85ee5770add0..38385621deb1 100644 > --- a/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi > @@ -4,3 +4,10 @@ > */ > > #include "rk3399-rock-pi-4-u-boot.dtsi" > + > +&spi1 { > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + }; > +}; > diff --git a/arch/arm/dts/rk3399-rock-pi-4c.dts b/arch/arm/dts/rk3399-rock-pi-4c.dts > index d32efab74e94..de2ebe4cb4f3 100644 > --- a/arch/arm/dts/rk3399-rock-pi-4c.dts > +++ b/arch/arm/dts/rk3399-rock-pi-4c.dts > @@ -43,6 +43,16 @@ > hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; > }; > > +&spi1 { > + status = "okay"; > + > + flash@0 { > + compatible = "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <10000000>; > + }; > +}; > + > &uart0 { > status = "okay"; > > diff --git a/configs/rock-4c-plus-rk3399_defconfig b/configs/rock-4c-plus-rk3399_defconfig > index 2024defb2bf0..e97fde17acc2 100644 > --- a/configs/rock-4c-plus-rk3399_defconfig > +++ b/configs/rock-4c-plus-rk3399_defconfig > @@ -3,22 +3,27 @@ CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_NR_DRAM_BANKS=1 > +CONFIG_SF_DEFAULT_SPEED=10000000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-4c-plus" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3399=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > CONFIG_TARGET_ROCKPI4_RK3399=y > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > -CONFIG_PCI=y > CONFIG_DEBUG_UART=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-4c-plus.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_MAX_SIZE=0x2e000 > +CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 > CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > @@ -26,7 +31,6 @@ CONFIG_CMD_NVEDIT_EFI=y > CONFIG_CMD_DFU=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > -CONFIG_CMD_PCI=y > CONFIG_CMD_USB=y > CONFIG_CMD_ROCKUSB=y > CONFIG_CMD_USB_MASS_STORAGE=y > @@ -40,23 +44,32 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_ROCKCHIP_IODOMAIN=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=1 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_NVME_PCI=y > CONFIG_PHY_ROCKCHIP_INNO_USB2=y > CONFIG_PHY_ROCKCHIP_TYPEC=y > CONFIG_PMIC_RK8XX=y > -CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SPI=y > CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > @@ -77,7 +90,6 @@ CONFIG_VIDEO=y > CONFIG_DISPLAY=y > CONFIG_VIDEO_ROCKCHIP=y > CONFIG_DISPLAY_ROCKCHIP_HDMI=y > -CONFIG_SPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > CONFIG_EFI_CAPSULE_ON_DISK=y > CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y > diff --git a/configs/rock-4se-rk3399_defconfig b/configs/rock-4se-rk3399_defconfig > index 9b2303fdf792..13f5f84b9836 100644 > --- a/configs/rock-4se-rk3399_defconfig > +++ b/configs/rock-4se-rk3399_defconfig > @@ -3,22 +3,29 @@ CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_NR_DRAM_BANKS=1 > +CONFIG_SF_DEFAULT_SPEED=10000000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-4se" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3399=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > CONFIG_TARGET_ROCKPI4_RK3399=y > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_PCI=y > CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-4se.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_MAX_SIZE=0x2e000 > +CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_NVEDIT_EFI=y > @@ -36,14 +43,25 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_ROCKCHIP_IODOMAIN=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=1 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_NVME_PCI=y > @@ -54,9 +72,11 @@ CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SPI=y > CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > @@ -77,7 +97,6 @@ CONFIG_VIDEO=y > CONFIG_DISPLAY=y > CONFIG_VIDEO_ROCKCHIP=y > CONFIG_DISPLAY_ROCKCHIP_HDMI=y > -CONFIG_SPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > CONFIG_EFI_CAPSULE_ON_DISK=y > CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y > diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig > index e5a2bba8e7ff..d474d91053c1 100644 > --- a/configs/rock-pi-4-rk3399_defconfig > +++ b/configs/rock-pi-4-rk3399_defconfig > @@ -17,6 +17,7 @@ CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_PCI=y > CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > @@ -43,6 +44,8 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > @@ -54,8 +57,12 @@ CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > CONFIG_SF_DEFAULT_BUS=1 > CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > CONFIG_SPI_FLASH_WINBOND=y > CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_NVME_PCI=y > @@ -66,6 +73,7 @@ CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig > index 4a9d1c531c10..50c6755246f2 100644 > --- a/configs/rock-pi-4c-rk3399_defconfig > +++ b/configs/rock-pi-4c-rk3399_defconfig > @@ -3,22 +3,29 @@ CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_NR_DRAM_BANKS=1 > +CONFIG_SF_DEFAULT_SPEED=10000000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4c" > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3399=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > CONFIG_TARGET_ROCKPI4_RK3399=y > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_PCI=y > CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4c.dtb" > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_MAX_SIZE=0x2e000 > +CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 > CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > @@ -37,13 +44,25 @@ CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > CONFIG_DFU_MMC=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_ROCKCHIP_IODOMAIN=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_SDMA=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=1 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_NVME_PCI=y > @@ -54,9 +73,11 @@ CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM_ROCKCHIP_LPDDR4=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SPI=y > CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > @@ -77,7 +98,6 @@ CONFIG_VIDEO=y > CONFIG_DISPLAY=y > CONFIG_VIDEO_ROCKCHIP=y > CONFIG_DISPLAY_ROCKCHIP_HDMI=y > -CONFIG_SPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > CONFIG_EFI_CAPSULE_ON_DISK=y > CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
diff --git a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi index 9785b97b9eea..b5ee644a83dd 100644 --- a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi @@ -11,3 +11,15 @@ &pcfg_pull_up_8ma { bootph-pre-ram; }; + +&spi1 { + status = "okay"; + + flash@0 { + bootph-pre-ram; + bootph-some-ram; + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; diff --git a/arch/arm/dts/rk3399-rock-4c-plus.dts b/arch/arm/dts/rk3399-rock-4c-plus.dts index 8bfd5f88d1ef..7baf9d1b22fd 100644 --- a/arch/arm/dts/rk3399-rock-4c-plus.dts +++ b/arch/arm/dts/rk3399-rock-4c-plus.dts @@ -15,6 +15,7 @@ compatible = "radxa,rock-4c-plus", "rockchip,rk3399"; aliases { + ethernet0 = &gmac; mmc0 = &sdhci; mmc1 = &sdmmc; }; diff --git a/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi b/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi index 85ee5770add0..2213d0093052 100644 --- a/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi @@ -4,3 +4,15 @@ */ #include "rk3399-rock-pi-4-u-boot.dtsi" + +&spi1 { + status = "okay"; + + flash@0 { + bootph-pre-ram; + bootph-some-ram; + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; diff --git a/arch/arm/dts/rk3399-rock-pi-4.dtsi b/arch/arm/dts/rk3399-rock-pi-4.dtsi index b1b7f4ffb1d4..281a12180703 100644 --- a/arch/arm/dts/rk3399-rock-pi-4.dtsi +++ b/arch/arm/dts/rk3399-rock-pi-4.dtsi @@ -12,6 +12,7 @@ / { aliases { + ethernet0 = &gmac; mmc0 = &sdhci; mmc1 = &sdmmc; }; @@ -44,7 +45,7 @@ sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk808 1>; - clock-names = "ext_clock"; + clock-names = "lpo"; pinctrl-names = "default"; pinctrl-0 = <&wifi_enable_h>; reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; @@ -492,6 +493,7 @@ &i2s0 { pinctrl-0 = <&i2s0_2ch_bus>; + pinctrl-1 = <&i2s0_2ch_bus_bclk_off>; rockchip,capture-channels = <2>; rockchip,playback-channels = <2>; status = "okay"; diff --git a/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi index 85ee5770add0..38385621deb1 100644 --- a/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi @@ -4,3 +4,10 @@ */ #include "rk3399-rock-pi-4-u-boot.dtsi" + +&spi1 { + flash@0 { + bootph-pre-ram; + bootph-some-ram; + }; +}; diff --git a/arch/arm/dts/rk3399-rock-pi-4c.dts b/arch/arm/dts/rk3399-rock-pi-4c.dts index d32efab74e94..de2ebe4cb4f3 100644 --- a/arch/arm/dts/rk3399-rock-pi-4c.dts +++ b/arch/arm/dts/rk3399-rock-pi-4c.dts @@ -43,6 +43,16 @@ hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; }; +&spi1 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + &uart0 { status = "okay"; diff --git a/configs/rock-4c-plus-rk3399_defconfig b/configs/rock-4c-plus-rk3399_defconfig index 2024defb2bf0..e97fde17acc2 100644 --- a/configs/rock-4c-plus-rk3399_defconfig +++ b/configs/rock-4c-plus-rk3399_defconfig @@ -3,22 +3,27 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-4c-plus" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3399=y +CONFIG_ROCKCHIP_SPI_IMAGE=y CONFIG_TARGET_ROCKPI4_RK3399=y CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x800800 -CONFIG_PCI=y CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-4c-plus.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y -CONFIG_SPL_MAX_SIZE=0x2e000 +CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_TPL=y CONFIG_CMD_BOOTZ=y @@ -26,7 +31,6 @@ CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_DFU=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y -CONFIG_CMD_PCI=y CONFIG_CMD_USB=y CONFIG_CMD_ROCKUSB=y CONFIG_CMD_USB_MASS_STORAGE=y @@ -40,23 +44,32 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DFU_MMC=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=1 +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_XTX=y +CONFIG_PHY_REALTEK=y +CONFIG_DM_ETH_PHY=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y -CONFIG_NVME_PCI=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_PMIC_RK8XX=y -CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM_ROCKCHIP_LPDDR4=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550_MEM32=y +CONFIG_ROCKCHIP_SPI=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y @@ -77,7 +90,6 @@ CONFIG_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_ROCKCHIP=y CONFIG_DISPLAY_ROCKCHIP_HDMI=y -CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y CONFIG_EFI_CAPSULE_ON_DISK=y CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/rock-4se-rk3399_defconfig b/configs/rock-4se-rk3399_defconfig index 9b2303fdf792..13f5f84b9836 100644 --- a/configs/rock-4se-rk3399_defconfig +++ b/configs/rock-4se-rk3399_defconfig @@ -3,22 +3,29 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-4se" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3399=y +CONFIG_ROCKCHIP_SPI_IMAGE=y CONFIG_TARGET_ROCKPI4_RK3399=y CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_PCI=y CONFIG_DEBUG_UART=y +CONFIG_AHCI=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-4se.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y -CONFIG_SPL_MAX_SIZE=0x2e000 +CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 CONFIG_TPL=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NVEDIT_EFI=y @@ -36,14 +43,25 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y CONFIG_DFU_MMC=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=1 +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_XTX=y +CONFIG_PHY_REALTEK=y +CONFIG_DM_ETH_PHY=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_NVME_PCI=y @@ -54,9 +72,11 @@ CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM_ROCKCHIP_LPDDR4=y +CONFIG_SCSI=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550_MEM32=y +CONFIG_ROCKCHIP_SPI=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y @@ -77,7 +97,6 @@ CONFIG_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_ROCKCHIP=y CONFIG_DISPLAY_ROCKCHIP_HDMI=y -CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y CONFIG_EFI_CAPSULE_ON_DISK=y CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig index e5a2bba8e7ff..d474d91053c1 100644 --- a/configs/rock-pi-4-rk3399_defconfig +++ b/configs/rock-pi-4-rk3399_defconfig @@ -17,6 +17,7 @@ CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_PCI=y CONFIG_DEBUG_UART=y +CONFIG_AHCI=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y @@ -43,6 +44,8 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y CONFIG_DFU_MMC=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y @@ -54,8 +57,12 @@ CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_ROCKCHIP=y CONFIG_SF_DEFAULT_BUS=1 CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_XTX=y +CONFIG_PHY_REALTEK=y +CONFIG_DM_ETH_PHY=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_NVME_PCI=y @@ -66,6 +73,7 @@ CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM_ROCKCHIP_LPDDR4=y +CONFIG_SCSI=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550_MEM32=y diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig index 4a9d1c531c10..50c6755246f2 100644 --- a/configs/rock-pi-4c-rk3399_defconfig +++ b/configs/rock-pi-4c-rk3399_defconfig @@ -3,22 +3,29 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_SF_DEFAULT_SPEED=10000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4c" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3399=y +CONFIG_ROCKCHIP_SPI_IMAGE=y CONFIG_TARGET_ROCKPI4_RK3399=y CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_PCI=y CONFIG_DEBUG_UART=y +CONFIG_AHCI=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4c.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y -CONFIG_SPL_MAX_SIZE=0x2e000 +CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_TPL=y CONFIG_CMD_BOOTZ=y @@ -37,13 +44,25 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y CONFIG_DFU_MMC=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=1 +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_XTX=y +CONFIG_PHY_REALTEK=y +CONFIG_DM_ETH_PHY=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_NVME_PCI=y @@ -54,9 +73,11 @@ CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM_ROCKCHIP_LPDDR4=y +CONFIG_SCSI=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550_MEM32=y +CONFIG_ROCKCHIP_SPI=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y @@ -77,7 +98,6 @@ CONFIG_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_ROCKCHIP=y CONFIG_DISPLAY_ROCKCHIP_HDMI=y -CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y CONFIG_EFI_CAPSULE_ON_DISK=y CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
Sync rk3399-rock-pi-4 related device tree from linux v6.8. Add SPI flash related options to support booting from SPI flash. Add AHCI=y, SCSI_AHCI=y, AHCI_PCI=y and SCSI=y to support PCIe SATA boot. Change to SPL_MAX_SIZE=0x40000, SPL can be up to 256 KiB. Add ROCKCHIP_IODOMAIN=y to configure io-domain voltage. Add PHY_REALTEK=y and DM_ETH_PHY=y to support ethernet PHY. Remove SPL_TINY_MEMSET=y to use full memset in SPL. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 12 ++++++++++ arch/arm/dts/rk3399-rock-4c-plus.dts | 1 + arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 12 ++++++++++ arch/arm/dts/rk3399-rock-pi-4.dtsi | 4 +++- arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 7 ++++++ arch/arm/dts/rk3399-rock-pi-4c.dts | 10 ++++++++ configs/rock-4c-plus-rk3399_defconfig | 24 +++++++++++++++----- configs/rock-4se-rk3399_defconfig | 23 +++++++++++++++++-- configs/rock-pi-4-rk3399_defconfig | 8 +++++++ configs/rock-pi-4c-rk3399_defconfig | 24 ++++++++++++++++++-- 10 files changed, 114 insertions(+), 11 deletions(-)