[PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399

[Kever Yang]

Hi Mark,

This is not able to apply directly, this is the first time I met this error:

$ git-pw patch apply 1297197
Applying: rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399
error: sha1 information is lacking or useless 
(configs/firefly-rk3399_defconfig).
error: could not build fake ancestor
Patch failed at 0001 rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399


If I use apply this patch manually, these two patch also have conflict 
due to "CONFIG_BAUDRATE".


Thanks,

- Kever

On 2020/5/25 下午5:00, Mark Kettenis wrote:
> Enable CONFIG_PCI and CONFIG_NVME and related configs for the
> Firefly RK3399 board.
>
> Signed-off-by: Mark Kettenis <kettenis at openbsd.org>
> Reviewed-by: Simon Glass <sjg at chromium.org>
> ---
> Changes in v2:
> - Extend commit message
>
>   configs/firefly-rk3399_defconfig | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
> index 831a37d607..2f2a3edb72 100644
> --- a/configs/firefly-rk3399_defconfig
> +++ b/configs/firefly-rk3399_defconfig
> @@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
>   CONFIG_CMD_GPT=y
>   CONFIG_CMD_MMC=y
>   CONFIG_CMD_USB=y
> +CONFIG_CMD_PCI=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_TIME=y
>   CONFIG_SPL_OF_CONTROL=y
> @@ -38,10 +39,13 @@ CONFIG_SF_DEFAULT_SPEED=20000000
>   CONFIG_DM_ETH=y
>   CONFIG_ETH_DESIGNWARE=y
>   CONFIG_GMAC_ROCKCHIP=y
> +CONFIG_NVME=y
> +CONFIG_PCI=y
>   CONFIG_PMIC_RK8XX=y
>   CONFIG_REGULATOR_PWM=y
>   CONFIG_REGULATOR_RK8XX=y
>   CONFIG_PWM_ROCKCHIP=y
> +CONFIG_DM_RESET=y
>   CONFIG_BAUDRATE=115200
>   CONFIG_DEBUG_UART_SHIFT=2
>   CONFIG_SYSRESET=y