board: rockchip: Add Bananapi R2Pro Board
PATCH v3 1/1 board: rockchip: Add Bananapi R2Pro Board
From: Frank Wunderlich <[email protected]>
Add Bananapi R2 Pro board.
Till now evb dts could be used, but iodomain is different (evb has 1v8 on vccio2 and vccio4 which are 3v3 on r2pro) and with iodomain driver this can cause hardware fault.
Devicetree in mainline-Linux:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
---
v3:
- disable gmac0 as switch-driver is not yet ready to attach to the mac v2:
- drop switch-node for now as u-boot driver works differently to linux
--- arch/arm/dts/Makefile | 3 +- arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi | 23 + arch/arm/dts/rk3568-bpi-r2pro.dts | 549 ++++++++++++++++++++++ configs/bpi-r2pro-rk3568_defconfig | 101 ++++ 4 files changed, 675 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-bpi-r2pro.dts create mode 100644 configs/bpi-r2pro-rk3568_defconfig
arch/arm/dts/Makefile +2 -1
@@ -182,7 +182,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \ rk3568-nanopi-r5s.dtb \ rk3568-odroid-m1.dtb \ rk3568-radxa-e25.dtb \ - rk3568-rock-3a.dtb + rk3568-rock-3a.dtb \ + rk3568-bpi-r2pro.dtb dtb-$(CONFIG_ROCKCHIP_RK3588) += \ rk3588-edgeble-neu6a-io.dtb \
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2021 Rockchip Electronics Co., Ltd + */ + +#include "rk356x-u-boot.dtsi" + +/ { + chosen { + stdout-path = &uart2; + u-boot,spl-boot-order = "same-as-spl", &sdmmc0, &sdhci; + }; +}; + +&sdmmc0 { + status = "okay"; +}; + +&uart2 { + clock-frequency = <24000000>; + bootph-pre-ram; + status = "okay"; +};
arch/arm/dts/rk3568-bpi-r2pro.dts new file +549 -0
549 lines not on this page · raw message
configs/bpi-r2pro-rk3568_defconfig new file +101 -0
101 lines not on this page · raw message
Signature · 1 line
2.34.1
Hi,
just a friedly reminder. would be great if it can be merged in next uboot-version.
regards Frank
Quoted 32 lines
Gesendet: Sonntag, 20. August 2023 um 18:00 Uhr
Von: "Frank Wunderlich" <[email protected]>
An: [email protected]
Cc: "Frank Wunderlich" <[email protected]>, "Simon Glass" <[email protected]>, "Philipp Tomsich" <[email protected]>, "Kever Yang" <[email protected]>, "Marek Vasut" <[email protected]>, "Jonas Karlman" <[email protected]>
Betreff: [PATCH v3] board: rockchip: Add Bananapi R2Pro BoardFrom: Frank Wunderlich <[email protected]>
Add Bananapi R2 Pro board.
Till now evb dts could be used, but iodomain is different (evb has 1v8 on vccio2 and vccio4 which are 3v3 on r2pro) and with iodomain driver this can cause hardware fault.
Devicetree in mainline-Linux:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dtsSigned-off-by Frank Wunderlich <[email protected]>---
v3:
- disable gmac0 as switch-driver is not yet ready to attach to the mac v2:
- drop switch-node for now as u-boot driver works differently to linux--- arch/arm/dts/Makefile | 3 +- arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi | 23 + arch/arm/dts/rk3568-bpi-r2pro.dts | 549 ++++++++++++++++++++++ configs/bpi-r2pro-rk3568_defconfig | 101 ++++ 4 files changed, 675 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-bpi-r2pro.dts create mode 100644 configs/bpi-r2pro-rk3568_defconfig
Quoted 3 lines · Frank Wunderlich
Hi,
just a friedly reminder. would be great if it can be merged in next uboot-version.
+CC Tom
Quoted 19 lines
regards Frank
Quoted 16 lines
Gesendet: Sonntag, 20. August 2023 um 18:00 Uhr
Von: "Frank Wunderlich" <[email protected]>
An: [email protected]
Cc: "Frank Wunderlich" <[email protected]>, "Simon Glass" <[email protected]>, "Philipp Tomsich" <[email protected]>, "Kever Yang" <[email protected]>, "Marek Vasut" <[email protected]>, "Jonas Karlman" <[email protected]>
Betreff: [PATCH v3] board: rockchip: Add Bananapi R2Pro BoardFrom: Frank Wunderlich <[email protected]>
Add Bananapi R2 Pro board.
Till now evb dts could be used, but iodomain is different (evb has 1v8 on vccio2 and vccio4 which are 3v3 on r2pro) and with iodomain driver this can cause hardware fault.
Devicetree in mainline-Linux:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
What would be real helpful is a commit ID from which the DT was copied , so it can be easily updated in the future.
Am 16. September 2023 18:07:44 MESZ schrieb Marek Vasut <[email protected]>:
Quoted 20 lines · Frank Wunderlich
Quoted 3 lines
Hi,
just a friedly reminder. would be great if it can be merged in next uboot-version.
+CC Tom
Quoted 13 lines
regards Frank
Quoted 10 lines
Gesendet: Sonntag, 20. August 2023 um 18:00 Uhr
Von: "Frank Wunderlich" <[email protected]>
An: [email protected]
Cc: "Frank Wunderlich" <[email protected]>, "Simon Glass" <[email protected]>, "Philipp Tomsich" <[email protected]>, "Kever Yang" <[email protected]>, "Marek Vasut" <[email protected]>, "Jonas Karlman" <[email protected]>
Betreff: [PATCH v3] board: rockchip: Add Bananapi R2Pro BoardFrom: Frank Wunderlich <[email protected]>
Add Bananapi R2 Pro board.
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Till now evb dts could be used, but iodomain is different (evb has 1v8 on vccio2 and vccio4 which are 3v3 on r2pro) and with iodomain driver this can cause hardware fault.
Devicetree in mainline-Linux:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dtsWhat would be real helpful is a commit ID from which the DT was copied , so it can be easily updated in the future.
It is no plain copy...i removed parts not relevant for uboot now (from current linux version). E.g. switch driver is currently bundled in mtk ethernet driver and using different devicetree structure than linux dsa driver. We have to separate it before we can use it on r2pro. But this will take some time...also pcie(-phy) does not have a driver yet,so before adding dead code i dropped these parts for now.
regards Frank
Quoted 25 lines · Frank Wunderlich
Am 16. September 2023 18:07:44 MESZ schrieb Marek Vasut <[email protected]>:
Quoted 24 lines · Frank Wunderlich
Quoted 3 lines
Hi,
just a friedly reminder. would be great if it can be merged in next uboot-version.
+CC Tom
Quoted 17 lines
regards Frank
Quoted 14 lines
Gesendet: Sonntag, 20. August 2023 um 18:00 Uhr
Von: "Frank Wunderlich" <[email protected]>
An: [email protected]
Cc: "Frank Wunderlich" <[email protected]>, "Simon Glass" <[email protected]>, "Philipp Tomsich" <[email protected]>, "Kever Yang" <[email protected]>, "Marek Vasut" <[email protected]>, "Jonas Karlman" <[email protected]>
Betreff: [PATCH v3] board: rockchip: Add Bananapi R2Pro BoardFrom: Frank Wunderlich <[email protected]>
Add Bananapi R2 Pro board.
Till now evb dts could be used, but iodomain is different (evb has 1v8 on vccio2 and vccio4 which are 3v3 on r2pro) and with iodomain driver this can cause hardware fault.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
Devicetree in mainline-Linux:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dtsWhat would be real helpful is a commit ID from which the DT was copied , so it can be easily updated in the future.
It is no plain copy...i removed parts not relevant for uboot now (from current linux version).
Ouch, please don't do that. Instead, if you really do need to drop some nodes from U-Boot control DT, say board.dts, introduce new file called board-u-boot.dtsi and add '/delete-node/ &the_node_to_remove;' lines to remove nodes while DTC is processing the DT into .dtb .
This way, the imported board.dts from Linux can be later synchronized with newer version of Linux DT, and the U-Boot specific changes are in a separate file.
The U-Boot build system will first concatenate the files, i.e. cat board.dts board-u-boot.dtsi > temp.dts and then run DTC on the temp.dts , so whatever changes you do in the board-u-boot.dtsi will be processed after the original board.dts is processed by DTC (DTC processes the input DTS in order).
Quoted 1 line
E.g. switch driver is currently bundled in mtk ethernet driver and using different devicetree structure than linux dsa driver. We have to separate it before we can use it on r2pro. But this will take some time...also pcie(-phy) does not have a driver yet,so before adding dead code i dropped these parts for now.
See above, that should do the trick.
Quoted 25 lines · Frank Wunderlich
Am 16. September 2023 18:07:44 MESZ schrieb Marek Vasut <[email protected]>:
Quoted 24 lines · Frank Wunderlich
Quoted 3 lines
Hi,
just a friedly reminder. would be great if it can be merged in next uboot-version.
+CC Tom
Quoted 17 lines
regards Frank
Quoted 14 lines
Gesendet: Sonntag, 20. August 2023 um 18:00 Uhr
Von: "Frank Wunderlich" <[email protected]>
An: [email protected]
Cc: "Frank Wunderlich" <[email protected]>, "Simon Glass" <[email protected]>, "Philipp Tomsich" <[email protected]>, "Kever Yang" <[email protected]>, "Marek Vasut" <[email protected]>, "Jonas Karlman" <[email protected]>
Betreff: [PATCH v3] board: rockchip: Add Bananapi R2Pro BoardFrom: Frank Wunderlich <[email protected]>
Add Bananapi R2 Pro board.
Till now evb dts could be used, but iodomain is different (evb has 1v8 on vccio2 and vccio4 which are 3v3 on r2pro) and with iodomain driver this can cause hardware fault.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
Devicetree in mainline-Linux:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dtsWhat would be real helpful is a commit ID from which the DT was copied , so it can be easily updated in the future.
It is no plain copy...i removed parts not relevant for uboot now (from current linux version). E.g. switch driver is currently bundled in mtk ethernet driver and using different devicetree structure than linux dsa driver. We have to separate it before we can use it on r2pro. But this will take some time...also pcie(-phy) does not have a driver yet,so before adding dead code i dropped these parts for now.
pcie(-phy) should have a working driver for rk3568 as of v2023.10-rc2, and is extended to support PCIe bifurcation with the following series:
rockchip: rk3568: Fix use of PCIe bifurcation
https://patchwork.ozlabs.org/project/uboot/list/?series=366997&state=*
Regards,
Jonas
Quoted 2 lines
regards Frank
Hi Frank,
Quoted 48 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Add Bananapi R2 Pro board.
Till now evb dts could be used, but iodomain is different (evb has 1v8 on vccio2 and vccio4 which are 3v3 on r2pro) and with iodomain driver this can cause hardware fault.
Devicetree in mainline-Linux:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dtsSigned-off-by Frank Wunderlich <[email protected]>---
v3:
- disable gmac0 as switch-driver is not yet ready to attach to the mac v2:
- drop switch-node for now as u-boot driver works differently to linux--- arch/arm/dts/Makefile | 3 +- arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi | 23 + arch/arm/dts/rk3568-bpi-r2pro.dts | 549 ++++++++++++++++++++++ configs/bpi-r2pro-rk3568_defconfig | 101 ++++ 4 files changed, 675 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-bpi-r2pro.dts create mode 100644 configs/bpi-r2pro-rk3568_defconfigarch/arm/dts/Makefile +2
-1@@ -182,7 +182,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \ rk3568-nanopi-r5s.dtb \ rk3568-odroid-m1.dtb \ rk3568-radxa-e25.dtb \ - rk3568-rock-3a.dtb + rk3568-rock-3a.dtb \ + rk3568-bpi-r2pro.dtb dtb-$(CONFIG_ROCKCHIP_RK3588) += \ rk3588-edgeble-neu6a-io.dtb \arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +1
-0@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi line 11
Quoted 10 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +10
-0+/* + * (C) Copyright 2021 Rockchip Electronics Co., Ltd + */ + +#include "rk356x-u-boot.dtsi" + +/ { + chosen { + stdout-path = &uart2; + u-boot,spl-boot-order = "same-as-spl", &sdmmc0, &sdhci;
This is the default order in rk356x-u-boot.dtsi and can be dropped.
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi line 16
Quoted 5 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +5
-0+ }; +}; + +&sdmmc0 { + status = "okay";
sdmmc0 is already enabled in rk3568-bpi-r2pro.dts
arch/arm/dts/rk3568-bpi-r2pro.dts
Quoted 12 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +7
-0+}; + +&uart2 { + clock-frequency = <24000000>; + bootph-pre-ram; + status = "okay"; +};arch/arm/dts/rk3568-bpi-r2pro.dts new file +0
-0
Should be a 1:1 copy from kernel.
[...]
Quoted 50 lines
configs/bpi-r2pro-rk3568_defconfig new file +44
-0@@ -0,0 +1,101 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_COUNTER_FREQUENCY=24000000 +CONFIG_ARCH_ROCKCHIP=y +CONFIG_TEXT_BASE=0x00a00000 +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000 +CONFIG_DEFAULT_DEVICE_TREE="rk3568-bpi-r2pro" +CONFIG_ROCKCHIP_RK3568=y +CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y +CONFIG_SPL_SERIAL=y +CONFIG_SPL_STACK_R_ADDR=0x600000 +CONFIG_SPL_STACK=0x400000 +CONFIG_DEBUG_UART_BASE=0xFE660000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SYS_LOAD_ADDR=0xc00800 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_LEGACY_IMAGE_FORMAT=y +#CONFIG_OF_SYSTEM_SETUP=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-bpi-r2pro" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_MAX_SIZE=0x40000 +CONFIG_SPL_PAD_TO=0x7f8000 +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y +CONFIG_SPL_BSS_START_ADDR=0x4000000 +CONFIG_SPL_BSS_MAX_SIZE=0x4000 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_STACK_R=y +CONFIG_SPL_ATF=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=y
configs/bpi-r2pro-rk3568_defconfig line 54
Quoted 10 lines
configs/bpi-r2pro-rk3568_defconfig new file +10
-0+# CONFIG_SPL_DOS_PARTITION is not set +CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIVE=y +CONFIG_NET=n +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SPL_REGMAP=y +CONFIG_SPL_SYSCON=y +CONFIG_SPL_CLK=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_ROCKCHIP_GPIO_V2=y
This Kconfig option does not exits.
configs/bpi-r2pro-rk3568_defconfig line 64
Quoted 10 lines
configs/bpi-r2pro-rk3568_defconfig new file +10
-0+CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_RPMB=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_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y
Please drop CONFIG_ETH_DESIGNWARE and CONFIG_GMAC_ROCKCHIP.
The following series that add GMAC support for RK3568 and RK3588 will use DWC_ETH_QOS and DWC_ETH_QOS_ROCKCHIP Kconfig options.
rockchip: Add GMAC support for RK3568 and RK3588
https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/
Quoted 11 lines
configs/bpi-r2pro-rk3568_defconfig new file +11
-0+CONFIG_DM_PMIC=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_SPL_RAM=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYS_NS16550_MEM32=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_PSCI=y
configs/bpi-r2pro-rk3568_defconfig line 85
Quoted 10 lines
configs/bpi-r2pro-rk3568_defconfig new file +10
-0+CONFIG_ERRNO_STR=y +CONFIG_SYS_PROMPT="BPI-R2PRO> " +CONFIG_CMD_SYSBOOT=y +CONFIG_CMD_BOOTDEV=y +CONFIG_BOOTSTD_FULL=y +CONFIG_CMD_EFICONFIG=n +CONFIG_EFI_LOADER=n +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y
This should not be enabled for rk3568, USB_DWC3_GENERIC provide usb support.
configs/bpi-r2pro-rk3568_defconfig line 92
Quoted 7 lines
configs/bpi-r2pro-rk3568_defconfig new file +7
-0+CONFIG_USB_DWC3_GENERIC=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_GENERIC=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_DWC2=y
There should not be any need to enable this driver on rk3568.
configs/bpi-r2pro-rk3568_defconfig line 101
Quoted 9 lines
configs/bpi-r2pro-rk3568_defconfig new file +9
-0+CONFIG_USB_DWC3=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_CMD_USB=y +CONFIG_AHCI=y +CONFIG_DWC_AHCI=y +CONFIG_SCSI=y +CONFIG_DM_SCSI=y +CONFIG_CMD_SCSI=y
Please run moveconfig.py to clean up and re-order the defconfig.
Regards,
Jonas
Hi,
thank you for your suggestions
Quoted 78 lines
Gesendet: Sonntag, 17. September 2023 um 00:51 Uhr
Von: "Jonas Karlman" <[email protected]>
An: "Frank Wunderlich" <[email protected]>
Cc: "Frank Wunderlich" <[email protected]>, "Simon Glass" <[email protected]>, "Philipp Tomsich" <[email protected]>, "Kever Yang" <[email protected]>, "Marek Vasut" <[email protected]>, [email protected]
Betreff: Re: [PATCH v3] board: rockchip: Add Bananapi R2Pro BoardHi Frank,
Quoted 48 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Add Bananapi R2 Pro board.
Till now evb dts could be used, but iodomain is different (evb has 1v8 on vccio2 and vccio4 which are 3v3 on r2pro) and with iodomain driver this can cause hardware fault.
Devicetree in mainline-Linux:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dtsSigned-off-by Frank Wunderlich <[email protected]>---
v3:
- disable gmac0 as switch-driver is not yet ready to attach to the mac v2:
- drop switch-node for now as u-boot driver works differently to linux--- arch/arm/dts/Makefile | 3 +- arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi | 23 + arch/arm/dts/rk3568-bpi-r2pro.dts | 549 ++++++++++++++++++++++ configs/bpi-r2pro-rk3568_defconfig | 101 ++++ 4 files changed, 675 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-bpi-r2pro.dts create mode 100644 configs/bpi-r2pro-rk3568_defconfigarch/arm/dts/Makefile +2
-1@@ -182,7 +182,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \ rk3568-nanopi-r5s.dtb \ rk3568-odroid-m1.dtb \ rk3568-radxa-e25.dtb \ - rk3568-rock-3a.dtb + rk3568-rock-3a.dtb \ + rk3568-bpi-r2pro.dtb dtb-$(CONFIG_ROCKCHIP_RK3588) += \ rk3588-edgeble-neu6a-io.dtb \arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +1
-0@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi line 11
Quoted 10 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +10
-0+/* + * (C) Copyright 2021 Rockchip Electronics Co., Ltd + */ + +#include "rk356x-u-boot.dtsi" + +/ { + chosen { + stdout-path = &uart2; + u-boot,spl-boot-order = "same-as-spl", &sdmmc0, &sdhci;This is the default order in
rk356x-u-boot.dtsiand can be dropped.arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi line 16
Quoted 5 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +5
-0+ }; +}; + +&sdmmc0 { + status = "okay";sdmmc0 is already enabled in
rk3568-bpi-r2pro.dts
Quoted 7 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi line 23
Quoted 7 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +7
-0+}; + +&uart2 { + clock-frequency = <24000000>; + bootph-pre-ram; + status = "okay"; +};
then i have only the uart here...right? do you remember i missed the -uboot.dtsi in first try and board does not find mmc in spl.
do i really not need the first 2 nodes here?
Quoted 7 lines
arch/arm/dts/rk3568-bpi-r2pro.dts
Quoted 5 lines
arch/arm/dts/rk3568-bpi-r2pro.dts new file +0
-0Should be a 1:1 copy from kernel.
i try to do so, but this will result in many nodes not used in uboot like the switch i remove in the dtsi and graphics. thx for pointing to the pcie driver then i can let these nodes in.
Quoted 119 lines
[...]
Quoted 50 lines
configs/bpi-r2pro-rk3568_defconfig new file +44
-0@@ -0,0 +1,101 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_COUNTER_FREQUENCY=24000000 +CONFIG_ARCH_ROCKCHIP=y +CONFIG_TEXT_BASE=0x00a00000 +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000 +CONFIG_DEFAULT_DEVICE_TREE="rk3568-bpi-r2pro" +CONFIG_ROCKCHIP_RK3568=y +CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y +CONFIG_SPL_SERIAL=y +CONFIG_SPL_STACK_R_ADDR=0x600000 +CONFIG_SPL_STACK=0x400000 +CONFIG_DEBUG_UART_BASE=0xFE660000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SYS_LOAD_ADDR=0xc00800 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_LEGACY_IMAGE_FORMAT=y +#CONFIG_OF_SYSTEM_SETUP=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-bpi-r2pro" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_MAX_SIZE=0x40000 +CONFIG_SPL_PAD_TO=0x7f8000 +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y +CONFIG_SPL_BSS_START_ADDR=0x4000000 +CONFIG_SPL_BSS_MAX_SIZE=0x4000 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_STACK_R=y +CONFIG_SPL_ATF=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=yconfigs/bpi-r2pro-rk3568_defconfig line 54
Quoted 10 lines
configs/bpi-r2pro-rk3568_defconfig new file +10
-0+# CONFIG_SPL_DOS_PARTITION is not set +CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIVE=y +CONFIG_NET=n +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SPL_REGMAP=y +CONFIG_SPL_SYSCON=y +CONFIG_SPL_CLK=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_ROCKCHIP_GPIO_V2=yThis
Kconfigoption does not exits.configs/bpi-r2pro-rk3568_defconfig line 64
Quoted 10 lines
configs/bpi-r2pro-rk3568_defconfig new file +10
-0+CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_RPMB=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_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=yPlease drop
CONFIG_ETH_DESIGNWAREandCONFIG_GMAC_ROCKCHIP.The following series that add GMAC support for RK3568 and RK3588 will use
DWC_ETH_QOSandDWC_ETH_QOS_ROCKCHIPKconfigoptions.rockchip: Add GMAC support for RK3568 and RK3588
https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/Quoted 11 lines
configs/bpi-r2pro-rk3568_defconfig new file +11
-0+CONFIG_DM_PMIC=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_SPL_RAM=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYS_NS16550_MEM32=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_PSCI=yconfigs/bpi-r2pro-rk3568_defconfig line 85
Quoted 10 lines
configs/bpi-r2pro-rk3568_defconfig new file +10
-0+CONFIG_ERRNO_STR=y +CONFIG_SYS_PROMPT="BPI-R2PRO> " +CONFIG_CMD_SYSBOOT=y +CONFIG_CMD_BOOTDEV=y +CONFIG_BOOTSTD_FULL=y +CONFIG_CMD_EFICONFIG=n +CONFIG_EFI_LOADER=n +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=yThis should not be enabled for rk3568,
USB_DWC3_GENERICprovide usb support.configs/bpi-r2pro-rk3568_defconfig line 92
Quoted 7 lines
configs/bpi-r2pro-rk3568_defconfig new file +7
-0+CONFIG_USB_DWC3_GENERIC=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_GENERIC=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_DWC2=yThere should not be any need to enable this driver on rk3568.
Quoted 11 lines
configs/bpi-r2pro-rk3568_defconfig line 101
Quoted 9 lines
configs/bpi-r2pro-rk3568_defconfig new file +9
-0+CONFIG_USB_DWC3=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_CMD_USB=y +CONFIG_AHCI=y +CONFIG_DWC_AHCI=y +CONFIG_SCSI=y +CONFIG_DM_SCSI=y +CONFIG_CMD_SCSI=yPlease run
moveconfig.pyto clean up and re-order the defconfig.
can you give me an example how i can pass my defconfig with the script?
./tools/moveconfig.py configs/bpi-r2pro-rk3568_defconfig ./tools/moveconfig.py -d configs/bpi-r2pro-rk3568_defconfig
do not work here...have not found a way in the --help page...i guess i misunderstand the script
regards Frank
Quoted 2 lines
Regards,
Jonas
Quoted 92 lines · Frank Wunderlich
Hi,
thank you for your suggestions
Quoted 78 lines
Gesendet: Sonntag, 17. September 2023 um 00:51 Uhr
Von: "Jonas Karlman" <[email protected]>
An: "Frank Wunderlich" <[email protected]>
Cc: "Frank Wunderlich" <[email protected]>, "Simon Glass" <[email protected]>, "Philipp Tomsich" <[email protected]>, "Kever Yang" <[email protected]>, "Marek Vasut" <[email protected]>, [email protected]
Betreff: Re: [PATCH v3] board: rockchip: Add Bananapi R2Pro BoardHi Frank,
Quoted 48 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Add Bananapi R2 Pro board.
Till now evb dts could be used, but iodomain is different (evb has 1v8 on vccio2 and vccio4 which are 3v3 on r2pro) and with iodomain driver this can cause hardware fault.
Devicetree in mainline-Linux:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dtsSigned-off-by Frank Wunderlich <[email protected]>---
v3:
- disable gmac0 as switch-driver is not yet ready to attach to the mac v2:
- drop switch-node for now as u-boot driver works differently to linux--- arch/arm/dts/Makefile | 3 +- arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi | 23 + arch/arm/dts/rk3568-bpi-r2pro.dts | 549 ++++++++++++++++++++++ configs/bpi-r2pro-rk3568_defconfig | 101 ++++ 4 files changed, 675 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-bpi-r2pro.dts create mode 100644 configs/bpi-r2pro-rk3568_defconfigarch/arm/dts/Makefile +2
-1@@ -182,7 +182,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \ rk3568-nanopi-r5s.dtb \ rk3568-odroid-m1.dtb \ rk3568-radxa-e25.dtb \ - rk3568-rock-3a.dtb + rk3568-rock-3a.dtb \ + rk3568-bpi-r2pro.dtb dtb-$(CONFIG_ROCKCHIP_RK3588) += \ rk3588-edgeble-neu6a-io.dtb \arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +1
-0@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi line 11
Quoted 10 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +10
-0+/* + * (C) Copyright 2021 Rockchip Electronics Co., Ltd + */ + +#include "rk356x-u-boot.dtsi" + +/ { + chosen { + stdout-path = &uart2; + u-boot,spl-boot-order = "same-as-spl", &sdmmc0, &sdhci;This is the default order in
rk356x-u-boot.dtsiand can be dropped.arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi line 16
Quoted 5 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +5
-0+ }; +}; + +&sdmmc0 { + status = "okay";sdmmc0 is already enabled in
rk3568-bpi-r2pro.dtsQuoted 7 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi line 23
Quoted 7 lines
arch/arm/dts/rk3568-bpi-r2pro-u-boot.dtsi new file +7
-0+}; + +&uart2 { + clock-frequency = <24000000>; + bootph-pre-ram; + status = "okay"; +};then i have only the uart here...right? do you remember i missed the
-uboot.dtsiin first try and board does not find mmc in spl.
Quoted 1 line
do i really not need the first 2 nodes here?
The chosen node with stdout-path prop and uart2 node should probably be the only nodes left.
If you are having issues with mmc in SPL, I would first look at pinctrl, ensure pinctrl is enabled in SPL and that pinctrl-0 prop is defined for your sdmmc0 and sdhci node. OF_SPL_REMOVE_PROPS should also not list pinctrl nodes, look at defconfig for other rk356x boards, e.g. rock-3a-rk3568_defconfig should be a good candidate and one I test frequently.
And if that does not help and there is a regulator that is not enable by default you may need to enable gpio and regulator pinconf nodes and related Kconfig options for SPL.
See rk3566-quartz64-a-u-boot.dtsi where I had to enable gpio0, vcc3v3_sd and vcc_sd_h node and related Kconfig options to have working sd-card.
Quoted 11 lines
Quoted 8 lines
arch/arm/dts/rk3568-bpi-r2pro.dts
Quoted 6 lines
arch/arm/dts/rk3568-bpi-r2pro.dts new file +0
-0Should be a 1:1 copy from kernel.
i try to do so, but this will result in many nodes not used in uboot like the switch i remove in the dtsi and graphics. thx for pointing to the pcie driver then i can let these nodes in.
This file should be a full 1:1 copy, if you need to modify any node for U-Boot you should do such override in -u-boot.dtsi file. You can use /delete-property/ or /delete-node/ if you really need to remove something that cause issues for U-Boot, else leave the nodes even if they are not useful for U-Boot itself. Having full DT should make it possible to EFI boot generic aarch64 distro images, e.g. fedora etc.
Quoted 132 lines
Quoted 120 lines
[...]
Quoted 50 lines
configs/bpi-r2pro-rk3568_defconfig new file +44
-0@@ -0,0 +1,101 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_COUNTER_FREQUENCY=24000000 +CONFIG_ARCH_ROCKCHIP=y +CONFIG_TEXT_BASE=0x00a00000 +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000 +CONFIG_DEFAULT_DEVICE_TREE="rk3568-bpi-r2pro" +CONFIG_ROCKCHIP_RK3568=y +CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y +CONFIG_SPL_SERIAL=y +CONFIG_SPL_STACK_R_ADDR=0x600000 +CONFIG_SPL_STACK=0x400000 +CONFIG_DEBUG_UART_BASE=0xFE660000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SYS_LOAD_ADDR=0xc00800 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_LEGACY_IMAGE_FORMAT=y +#CONFIG_OF_SYSTEM_SETUP=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-bpi-r2pro" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_MAX_SIZE=0x40000 +CONFIG_SPL_PAD_TO=0x7f8000 +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y +CONFIG_SPL_BSS_START_ADDR=0x4000000 +CONFIG_SPL_BSS_MAX_SIZE=0x4000 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_STACK_R=y +CONFIG_SPL_ATF=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=yconfigs/bpi-r2pro-rk3568_defconfig line 54
Quoted 10 lines
configs/bpi-r2pro-rk3568_defconfig new file +10
-0+# CONFIG_SPL_DOS_PARTITION is not set +CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIVE=y +CONFIG_NET=n +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SPL_REGMAP=y +CONFIG_SPL_SYSCON=y +CONFIG_SPL_CLK=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_ROCKCHIP_GPIO_V2=yThis
Kconfigoption does not exits.configs/bpi-r2pro-rk3568_defconfig line 64
Quoted 10 lines
configs/bpi-r2pro-rk3568_defconfig new file +10
-0+CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_RPMB=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_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=yPlease drop
CONFIG_ETH_DESIGNWAREandCONFIG_GMAC_ROCKCHIP.The following series that add GMAC support for RK3568 and RK3588 will use
DWC_ETH_QOSandDWC_ETH_QOS_ROCKCHIPKconfigoptions.rockchip: Add GMAC support for RK3568 and RK3588
https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/Quoted 11 lines
configs/bpi-r2pro-rk3568_defconfig new file +11
-0+CONFIG_DM_PMIC=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_SPL_RAM=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYS_NS16550_MEM32=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_PSCI=yconfigs/bpi-r2pro-rk3568_defconfig line 85
Quoted 10 lines
configs/bpi-r2pro-rk3568_defconfig new file +10
-0+CONFIG_ERRNO_STR=y +CONFIG_SYS_PROMPT="BPI-R2PRO> " +CONFIG_CMD_SYSBOOT=y +CONFIG_CMD_BOOTDEV=y +CONFIG_BOOTSTD_FULL=y +CONFIG_CMD_EFICONFIG=n +CONFIG_EFI_LOADER=n +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=yThis should not be enabled for rk3568,
USB_DWC3_GENERICprovide usb support.configs/bpi-r2pro-rk3568_defconfig line 92
Quoted 7 lines
configs/bpi-r2pro-rk3568_defconfig new file +7
-0+CONFIG_USB_DWC3_GENERIC=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_GENERIC=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_DWC2=yThere should not be any need to enable this driver on rk3568.
Quoted 11 lines
configs/bpi-r2pro-rk3568_defconfig line 101
Quoted 9 lines
configs/bpi-r2pro-rk3568_defconfig new file +9
-0+CONFIG_USB_DWC3=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_CMD_USB=y +CONFIG_AHCI=y +CONFIG_DWC_AHCI=y +CONFIG_SCSI=y +CONFIG_DM_SCSI=y +CONFIG_CMD_SCSI=yPlease run
moveconfig.pyto clean up and re-order the defconfig.
Quoted 6 lines
can you give me an example how i can pass my defconfig with the script?
./tools/moveconfig.pyconfigs/bpi-r2pro-rk3568_defconfig./tools/moveconfig.py-d configs/bpi-r2pro-rk3568_defconfigdo not work here...have not found a way in the --help page...i guess i misunderstand the script
Probably much easier to use make savedefconfig instead of the moveconfig.py script.
Regards,
Jonas
Quoted 5 lines
regards Frank
Quoted 2 lines
Regards,
Jonas