rockchip: Pinebook Pro: Fix emmc default configuration
PATCH 1/1 rockchip: Pinebook Pro: Fix emmc default configuration
If u-boot is installed on the internal emmc, then this will allow to boot without failure.
---
configs/pinebook-pro-rk3399_defconfig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
configs/pinebook-pro-rk3399_defconfig +10 -2
@@ -6,6 +6,7 @@ CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 +CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
@@ -18,6 +19,7 @@ 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_BOOTDELAY=3 CONFIG_USE_PREBOOT=y
@@ -57,17 +59,23 @@ CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_ROCKCHIP_EFUSE=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_SPL_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_SPL_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS400_ES_SUPPORT=y +CONFIG_SPL_MMC_HS400_ES_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y +CONFIG_SPL_MMC_HS400_SUPPORT=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_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_NVME_PCI=y -CONFIG_PCI=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_DM_PMIC_FAN53555=y
Signature · 1 line
2.39.2
Quoted 15 lines · Wolfgang Zarre
If u-boot is installed on the internal emmc, then this will allow to boot without failure.
Signed-off-by Wolfgang Zarre <[email protected]>---
configs/pinebook-pro-rk3399_defconfig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)configs/pinebook-pro-rk3399_defconfig +0
-0
configs/pinebook-pro-rk3399_defconfig CONFIG_TEXT_BASE=0x00200000 · line 9
Quoted 4 lines
configs/pinebook-pro-rk3399_defconfig +1
-0@@ -6,6 +6,7 @@ CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 +CONFIG_SF_DEFAULT_SPEED=20000000
Why move this?
configs/pinebook-pro-rk3399_defconfig CONFIG_DEBUG_UART_CLOCK=24000000 · line 22
Quoted 8 lines
configs/pinebook-pro-rk3399_defconfig +1
-0CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"@@ -18,6 +19,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x800800 +CONFIG_PCI=y
Or this?
Quoted 5 lines
configs/pinebook-pro-rk3399_defconfig +0
-0CONFIG_DEBUG_UART=y CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y@@ -57,17 +59,23 @@ CONFIG_LED=y CONFIG_LED_GPIO=y
configs/pinebook-pro-rk3399_defconfig CONFIG_LED=y · line 69
Quoted 10 lines
configs/pinebook-pro-rk3399_defconfig +8
-0CONFIG_MISC=y CONFIG_ROCKCHIP_EFUSE=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_SPL_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_SPL_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS400_ES_SUPPORT=y +CONFIG_SPL_MMC_HS400_ES_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y +CONFIG_SPL_MMC_HS400_SUPPORT=y
Can you provide more details why these fix it?
Quoted 17 lines
configs/pinebook-pro-rk3399_defconfig +0
-3CONFIG_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_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_NVME_PCI=y -CONFIG_PCI=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_DM_PMIC_FAN53555=y --2.39.2
Quoted 11 lines · Peter Robinson
Quoted 10 lines · Wolfgang Zarre
If u-boot is installed on the internal emmc, then this will allow to boot without failure.
Signed-off-by Wolfgang Zarre <[email protected]>---
configs/pinebook-pro-rk3399_defconfig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
Quoted 12 lines
configs/pinebook-pro-rk3399_defconfig CONFIG_TEXT_BASE=0x00200000 · line 9
Quoted 9 lines
configs/pinebook-pro-rk3399_defconfig +1
-0@@ -6,6 +6,7 @@ CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 +CONFIG_SF_DEFAULT_SPEED=20000000Why move this?
This was not intentional but a result of the procedure (on top of fe3a77cb157a6210d8036845f5f80ea67c183563):
make distclean
make pinebook-pro-rk3399_defconfig
make menuconfig
make savedefconfig
cp defconfig configs/pinebook-pro-rk3399_defconfig
Quoted 11 lines
configs/pinebook-pro-rk3399_defconfig CONFIG_DEBUG_UART_CLOCK=24000000 · line 22
Quoted 8 lines
configs/pinebook-pro-rk3399_defconfig +1
-0CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"@@ -18,6 +19,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x800800 +CONFIG_PCI=yOr this?
Same as above.
Quoted 9 lines
Quoted 9 lines
configs/pinebook-pro-rk3399_defconfig +2
-0CONFIG_DEBUG_UART=y CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y@@ -57,17 +59,23 @@ CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_ROCKCHIP_EFUSE=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_SPL_MMC_IO_VOLTAGE=y
Quoted 9 lines
configs/pinebook-pro-rk3399_defconfig CONFIG_LED=y · line 69
Quoted 6 lines
configs/pinebook-pro-rk3399_defconfig +6
-0+CONFIG_MMC_UHS_SUPPORT=y +CONFIG_SPL_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS400_ES_SUPPORT=y +CONFIG_SPL_MMC_HS400_ES_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y +CONFIG_SPL_MMC_HS400_SUPPORT=yCan you provide more details why these fix it?
Sure, if you install u-boot on the internal emmc without these configuration:
dd if=idbloader.img of=/dev/mmcblk2 seek=64 conv=notrunc
dd if=u-boot.itb of=/dev/mmcblk2 seek=16384 conv=notrunc
and the external microSD is removed and SPI not flashed, the you will find following output:
U-Boot TPL 2023.04-00622-g698c2bd364 (Apr 05 2023 - 09:02:13)lpddr4_set_rate: change freq to 400MHz 0, 1
Channel 0: LPDDR4, 400MHz
BW=32 Col=10 Bk=8 CS0 Row=15 CS1 Row=15 CS=2 Die BW=16 Size=2048MB Channel 1: LPDDR4, 400MHz
BW=32 Col=10 Bk=8 CS0 Row=15 CS1 Row=15 CS=2 Die BW=16 Size=2048MB 256B stridelpddr4_set_rate: change freq to 800MHz 1, 0
Trying to boot from BOOTROM
Returning to boot ROM...
U-Boot SPL 2023.04-00622-g698c2bd364 (Apr 05 2023 - 09:02:13 +0200) Trying to boot from MMC1mmc_load_image_raw_sector: mmc block read error
Trying to boot from MMC1
mmc fail to send stop cmdmmc_load_image_raw_sector: mmc block read error
Trying to boot from SPI
Trying to boot from MMC2
Card did not respond to voltage select! : -110
spl: mmc init failed with error: -95
SPL: failed to boot from all boot devices
### ERROR ### Please RESET the board ###
With the configuration above the pinebook pro boots as expected from the internal emmc.
I may also mention that I got my pinebook pro delivered with a SDINADF4-128GB iNAND 7232 emmc but standard seems to be (or was ?) a SDINBDA4-64G iNAND 7550 emmc, however, both are having a HS400 interface and enhanced strobe.
Quoted 17 lines
Quoted 17 lines
configs/pinebook-pro-rk3399_defconfig +0
-3CONFIG_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_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_NVME_PCI=y -CONFIG_PCI=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_DM_PMIC_FAN53555=y --2.39.2
Quoted 4 lines · Wolfgang Zarre
If u-boot is installed on the internal emmc, then this will allow to boot without failure.
Signed-off-by Wolfgang Zarre <[email protected]>
Thanks,
- Kever
Quoted 51 lines
---
configs/pinebook-pro-rk3399_defconfig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)configs/pinebook-pro-rk3399_defconfig +10
-2@@ -6,6 +6,7 @@ CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 +CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"@@ -18,6 +19,7 @@ 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_BOOTDELAY=3 CONFIG_USE_PREBOOT=y@@ -57,17 +59,23 @@ CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_ROCKCHIP_EFUSE=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_SPL_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_SPL_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS400_ES_SUPPORT=y +CONFIG_SPL_MMC_HS400_ES_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y +CONFIG_SPL_MMC_HS400_SUPPORT=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_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_NVME_PCI=y -CONFIG_PCI=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_DM_PMIC_FAN53555=y
Quoted 5 lines · Wolfgang Zarre
If u-boot is installed on the internal emmc, then this will allow to boot without failure.
Signed-off-by Wolfgang Zarre <[email protected]>Reviewed-by Kever Yang <[email protected]>
This is marked as accepted in patchwork, but I do not see it in git yet...
Is this planned to land in 2023.07(-rc5?)?
Thanks!
live well,
vagrant
Quoted 49 lines
configs/pinebook-pro-rk3399_defconfig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)configs/pinebook-pro-rk3399_defconfig +10
-2@@ -6,6 +6,7 @@ CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 +CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"@@ -18,6 +19,7 @@ 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_BOOTDELAY=3 CONFIG_USE_PREBOOT=y@@ -57,17 +59,23 @@ CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y CONFIG_ROCKCHIP_EFUSE=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_SPL_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_SPL_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS400_ES_SUPPORT=y +CONFIG_SPL_MMC_HS400_ES_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y +CONFIG_SPL_MMC_HS400_SUPPORT=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_SF_DEFAULT_SPEED=20000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_NVME_PCI=y -CONFIG_PCI=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_DM_PMIC_FAN53555=y