* [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399
@ 2020-05-25 9:00 Mark Kettenis
2020-05-25 9:00 ` [PATCH v2 2/2] rockchip: Enable PCIe and NVMe on ROCKPro64 Mark Kettenis
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Mark Kettenis @ 2020-05-25 9:00 UTC (permalink / raw)
To: u-boot
Enable CONFIG_PCI and CONFIG_NVME and related configs for the
Firefly RK3399 board.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Simon Glass <sjg@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
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 2/2] rockchip: Enable PCIe and NVMe on ROCKPro64
2020-05-25 9:00 [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399 Mark Kettenis
@ 2020-05-25 9:00 ` Mark Kettenis
2020-05-28 18:42 ` Kurt Miller
2020-06-01 1:01 ` Kever Yang
2020-06-01 1:01 ` [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399 Kever Yang
2020-06-01 1:15 ` Kever Yang
2 siblings, 2 replies; 7+ messages in thread
From: Mark Kettenis @ 2020-05-25 9:00 UTC (permalink / raw)
To: u-boot
Enable CONFIG_PCI and CONFIG_NVME and related configs for the
ROCKPro64 board.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
---
Changes in v2:
- Extend commit message
configs/rockpro64-rk3399_defconfig | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
index 95037a191d..b472167283 100644
--- a/configs/rockpro64-rk3399_defconfig
+++ b/configs/rockpro64-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_SPI_FLASH_GIGADEVICE=y
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_RAM_RK3399_LPDDR4=y
CONFIG_BAUDRATE=115200
CONFIG_DEBUG_UART_SHIFT=2
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] rockchip: Enable PCIe and NVMe on ROCKPro64
2020-05-25 9:00 ` [PATCH v2 2/2] rockchip: Enable PCIe and NVMe on ROCKPro64 Mark Kettenis
@ 2020-05-28 18:42 ` Kurt Miller
2020-06-01 1:01 ` Kever Yang
1 sibling, 0 replies; 7+ messages in thread
From: Kurt Miller @ 2020-05-28 18:42 UTC (permalink / raw)
To: u-boot
On Mon, 2020-05-25 at 11:00 +0200, Mark Kettenis wrote:
> Enable CONFIG_PCI and CONFIG_NVME and related configs for the
> ROCKPro64 board.
>
> Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Tested by: Kurt Miller <kurt@intricatesoftware.com>
Model: Pine64 RockPro64 v2.1
=> pci
Scanning PCI devices on bus 0
BusDevFun??VendorId???DeviceId???Device Class???????Sub-Class
_____________________________________________________________
00.00.00???0x1d87?????0x0100?????Bridge device???????????0x04
=> pci 1
Scanning PCI devices on bus 1
BusDevFun??VendorId???DeviceId???Device Class???????Sub-Class
_____________________________________________________________
01.00.00???0x1b4b?????0x9128?????Mass storage controller 0x06
> ---
> Changes in v2:
> - Extend commit message
>
> ?configs/rockpro64-rk3399_defconfig | 4 ++++
> ?1 file changed, 4 insertions(+)
>
> diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
> index 95037a191d..b472167283 100644
> --- a/configs/rockpro64-rk3399_defconfig
> +++ b/configs/rockpro64-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_SPI_FLASH_GIGADEVICE=y
> ?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_RAM_RK3399_LPDDR4=y
> ?CONFIG_BAUDRATE=115200
> ?CONFIG_DEBUG_UART_SHIFT=2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] rockchip: Enable PCIe and NVMe on ROCKPro64
2020-05-25 9:00 ` [PATCH v2 2/2] rockchip: Enable PCIe and NVMe on ROCKPro64 Mark Kettenis
2020-05-28 18:42 ` Kurt Miller
@ 2020-06-01 1:01 ` Kever Yang
1 sibling, 0 replies; 7+ messages in thread
From: Kever Yang @ 2020-06-01 1:01 UTC (permalink / raw)
To: u-boot
On 2020/5/25 ??5:00, Mark Kettenis wrote:
> Enable CONFIG_PCI and CONFIG_NVME and related configs for the
> ROCKPro64 board.
>
> Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399
2020-05-25 9:00 [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399 Mark Kettenis
2020-05-25 9:00 ` [PATCH v2 2/2] rockchip: Enable PCIe and NVMe on ROCKPro64 Mark Kettenis
@ 2020-06-01 1:01 ` Kever Yang
2020-06-01 1:15 ` Kever Yang
2 siblings, 0 replies; 7+ messages in thread
From: Kever Yang @ 2020-06-01 1:01 UTC (permalink / raw)
To: u-boot
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@openbsd.org>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399
2020-05-25 9:00 [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399 Mark Kettenis
2020-05-25 9:00 ` [PATCH v2 2/2] rockchip: Enable PCIe and NVMe on ROCKPro64 Mark Kettenis
2020-06-01 1:01 ` [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399 Kever Yang
@ 2020-06-01 1:15 ` Kever Yang
2020-06-07 12:06 ` Mark Kettenis
2 siblings, 1 reply; 7+ messages in thread
From: Kever Yang @ 2020-06-01 1:15 UTC (permalink / raw)
To: u-boot
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@openbsd.org>
> Reviewed-by: Simon Glass <sjg@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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399
2020-06-01 1:15 ` Kever Yang
@ 2020-06-07 12:06 ` Mark Kettenis
0 siblings, 0 replies; 7+ messages in thread
From: Mark Kettenis @ 2020-06-07 12:06 UTC (permalink / raw)
To: u-boot
> From: Kever Yang <kever.yang@rock-chips.com>
> Date: Mon, 1 Jun 2020 09:15:17 +0800
>
> 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".
Sorry, I generated these patches from a branch that has
CONFIG_BAUDRATE set to a more manageable 115200. Will send a clean v3
in a moment.
>
> 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@openbsd.org>
> > Reviewed-by: Simon Glass <sjg@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
>
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-06-07 12:06 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-25 9:00 [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399 Mark Kettenis
2020-05-25 9:00 ` [PATCH v2 2/2] rockchip: Enable PCIe and NVMe on ROCKPro64 Mark Kettenis
2020-05-28 18:42 ` Kurt Miller
2020-06-01 1:01 ` Kever Yang
2020-06-01 1:01 ` [PATCH v2 1/2] rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399 Kever Yang
2020-06-01 1:15 ` Kever Yang
2020-06-07 12:06 ` Mark Kettenis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox