Message ID | 20240502185714.1045543-1-macroalpha82@gmail.com |
---|---|
State | Superseded |
Delegated to: | Kever Yang |
Headers | show |
Series | [V2] board: rockchip: Add Indiedroid Nova | expand |
Hi Chris, On 5/2/24 8:57 PM, Chris Morgan wrote: > From: Chris Morgan <macromorgan@hotmail.com> > > The Indiedroid Nova is a Rockchip RK3588S based SBC from Indiedroid. > > Specifications: > > Rockchip RK3588S SoC > 4x ARM Cortex-A76, 4x ARM Cortex-A55 > 4/8/16GB memory LPDDR4x > Mali G610MC4 GPU > Optional eMMC > 2x USB 2.0, 2x USB 3.0, 1x USB 3.0 C port with DP Alt > 1x MIPI-CSI Port (4-lane or 2x 2-lane) > 1x MIPI-DSI 4-lane connector > 1x Micro HDMI 2.1 output, 1x DP 1.4 output > Gigabit Ethernet > Realtek RTL8821CS WiFi > 4 pin debug UART connector > 40 pin GPIO header > Size: 85mm x 56mm (Raspberry Pi Form Factor) > > Kernel commit: > 3900160e164b ("arm64: dts: rockchip: Add Indiedroid Nova board") > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com> > --- > > Changes since V1: > - Refactored to use the upstream Linux device tree now that that is > an option. Lucky you, I still have to wait for a bump of the upstream dts repo "copy" to be able to use this for Tiger (will be in v6.9, so not too long to wait for anymore :) ). > - Added board to doc/board/rockchip/rockchip.rst. > > --- > arch/arm/mach-rockchip/rk3588/Kconfig | 10 ++++ > board/indiedroid/nova/Kconfig | 12 +++++ > board/indiedroid/nova/MAINTAINERS | 6 +++ > configs/nova-rk3588s_defconfig | 70 +++++++++++++++++++++++++++ > doc/board/rockchip/rockchip.rst | 1 + > include/configs/nova-rk3588s.h | 15 ++++++ > 6 files changed, 114 insertions(+) > create mode 100644 board/indiedroid/nova/Kconfig > create mode 100644 board/indiedroid/nova/MAINTAINERS > create mode 100644 configs/nova-rk3588s_defconfig > create mode 100644 include/configs/nova-rk3588s.h > > diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig > index 39049ab35a..820e979abb 100644 > --- a/arch/arm/mach-rockchip/rk3588/Kconfig > +++ b/arch/arm/mach-rockchip/rk3588/Kconfig > @@ -78,6 +78,15 @@ config TARGET_NANOPCT6_RK3588 > Power: 5.5*2.1mm DC Jack, 12VDC input > Dimensions: 110x80x1.6mm (without case) / 86x114.5x30mm (with case) > > +config TARGET_NOVA_RK3588 > + bool "Indiedroid Nova RK3588" > + select BOARD_LATE_INIT > + help > + Indiedroid Nova is a Rockchip RK3588s based SBC by Indiedroid. > + It comes in configurations from 4GB of RAM to 16GB of RAM, > + includes socket for eMMC storage, an SDMMC slot, and a 40-pin > + GPIO header for expansion. > + > config TARGET_RK3588_NEU6 > bool "Edgeble Neural Compute Module 6(Neu6) SoM" > select BOARD_LATE_INIT > @@ -223,6 +232,7 @@ config TEXT_BASE > > source "board/edgeble/neural-compute-module-6/Kconfig" > source "board/friendlyelec/nanopc-t6-rk3588/Kconfig" > +source "board/indiedroid/nova/Kconfig" > source "board/pine64/quartzpro64-rk3588/Kconfig" > source "board/turing/turing-rk1-rk3588/Kconfig" > source "board/radxa/rock5a-rk3588s/Kconfig" > diff --git a/board/indiedroid/nova/Kconfig b/board/indiedroid/nova/Kconfig > new file mode 100644 > index 0000000000..271d15a0ed > --- /dev/null > +++ b/board/indiedroid/nova/Kconfig > @@ -0,0 +1,12 @@ > +if TARGET_NOVA_RK3588 > + > +config SYS_BOARD > + default "nova-rk3588s" > + > +config SYS_VENDOR > + default "indiedroid" > + > +config SYS_CONFIG_NAME > + default "nova-rk3588s" > + > +endif > diff --git a/board/indiedroid/nova/MAINTAINERS b/board/indiedroid/nova/MAINTAINERS > new file mode 100644 > index 0000000000..9c56d01bf0 > --- /dev/null > +++ b/board/indiedroid/nova/MAINTAINERS > @@ -0,0 +1,6 @@ > +INDIEDROID-NOVA-RK3588 > +M: Chris Morgan <macromorgan@hotmail.com> > +S: Maintained > +F: board/indiedroid/nova > +F: include/configs/nova-rk3588s.h > +F: configs/indiedroid-nova-rk3588_defconfig Typo here, missing an s after rk3588 :) Looking good to me otherwise. Cheers, Quentin
On 2024/5/3 02:57, Chris Morgan wrote: > From: Chris Morgan <macromorgan@hotmail.com> > > The Indiedroid Nova is a Rockchip RK3588S based SBC from Indiedroid. > > Specifications: > > Rockchip RK3588S SoC > 4x ARM Cortex-A76, 4x ARM Cortex-A55 > 4/8/16GB memory LPDDR4x > Mali G610MC4 GPU > Optional eMMC > 2x USB 2.0, 2x USB 3.0, 1x USB 3.0 C port with DP Alt > 1x MIPI-CSI Port (4-lane or 2x 2-lane) > 1x MIPI-DSI 4-lane connector > 1x Micro HDMI 2.1 output, 1x DP 1.4 output > Gigabit Ethernet > Realtek RTL8821CS WiFi > 4 pin debug UART connector > 40 pin GPIO header > Size: 85mm x 56mm (Raspberry Pi Form Factor) > > Kernel commit: > 3900160e164b ("arm64: dts: rockchip: Add Indiedroid Nova board") > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com> > --- > > Changes since V1: > - Refactored to use the upstream Linux device tree now that that is > an option. > - Added board to doc/board/rockchip/rockchip.rst. > > --- > arch/arm/mach-rockchip/rk3588/Kconfig | 10 ++++ > board/indiedroid/nova/Kconfig | 12 +++++ > board/indiedroid/nova/MAINTAINERS | 6 +++ > configs/nova-rk3588s_defconfig | 70 +++++++++++++++++++++++++++ > doc/board/rockchip/rockchip.rst | 1 + > include/configs/nova-rk3588s.h | 15 ++++++ > 6 files changed, 114 insertions(+) > create mode 100644 board/indiedroid/nova/Kconfig > create mode 100644 board/indiedroid/nova/MAINTAINERS > create mode 100644 configs/nova-rk3588s_defconfig > create mode 100644 include/configs/nova-rk3588s.h > > diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig > index 39049ab35a..820e979abb 100644 > --- a/arch/arm/mach-rockchip/rk3588/Kconfig > +++ b/arch/arm/mach-rockchip/rk3588/Kconfig > @@ -78,6 +78,15 @@ config TARGET_NANOPCT6_RK3588 > Power: 5.5*2.1mm DC Jack, 12VDC input > Dimensions: 110x80x1.6mm (without case) / 86x114.5x30mm (with case) > > +config TARGET_NOVA_RK3588 > + bool "Indiedroid Nova RK3588" > + select BOARD_LATE_INIT > + help > + Indiedroid Nova is a Rockchip RK3588s based SBC by Indiedroid. > + It comes in configurations from 4GB of RAM to 16GB of RAM, > + includes socket for eMMC storage, an SDMMC slot, and a 40-pin > + GPIO header for expansion. > + > config TARGET_RK3588_NEU6 > bool "Edgeble Neural Compute Module 6(Neu6) SoM" > select BOARD_LATE_INIT > @@ -223,6 +232,7 @@ config TEXT_BASE > > source "board/edgeble/neural-compute-module-6/Kconfig" > source "board/friendlyelec/nanopc-t6-rk3588/Kconfig" > +source "board/indiedroid/nova/Kconfig" > source "board/pine64/quartzpro64-rk3588/Kconfig" > source "board/turing/turing-rk1-rk3588/Kconfig" > source "board/radxa/rock5a-rk3588s/Kconfig" > diff --git a/board/indiedroid/nova/Kconfig b/board/indiedroid/nova/Kconfig > new file mode 100644 > index 0000000000..271d15a0ed > --- /dev/null > +++ b/board/indiedroid/nova/Kconfig > @@ -0,0 +1,12 @@ > +if TARGET_NOVA_RK3588 > + > +config SYS_BOARD > + default "nova-rk3588s" > + > +config SYS_VENDOR > + default "indiedroid" > + > +config SYS_CONFIG_NAME > + default "nova-rk3588s" > + > +endif > diff --git a/board/indiedroid/nova/MAINTAINERS b/board/indiedroid/nova/MAINTAINERS > new file mode 100644 > index 0000000000..9c56d01bf0 > --- /dev/null > +++ b/board/indiedroid/nova/MAINTAINERS > @@ -0,0 +1,6 @@ > +INDIEDROID-NOVA-RK3588 > +M: Chris Morgan <macromorgan@hotmail.com> > +S: Maintained > +F: board/indiedroid/nova > +F: include/configs/nova-rk3588s.h > +F: configs/indiedroid-nova-rk3588_defconfig > diff --git a/configs/nova-rk3588s_defconfig b/configs/nova-rk3588s_defconfig > new file mode 100644 > index 0000000000..231831fb55 > --- /dev/null > +++ b/configs/nova-rk3588s_defconfig > @@ -0,0 +1,70 @@ > +CONFIG_ARM=y > +CONFIG_SKIP_LOWLEVEL_INIT=y > +CONFIG_COUNTER_FREQUENCY=24000000 > +CONFIG_ARCH_ROCKCHIP=y > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-indiedroid-nova" > +CONFIG_ROCKCHIP_RK3588=y > +CONFIG_SPL_SERIAL=y > +CONFIG_TARGET_NOVA_RK3588=y > +CONFIG_DEBUG_UART_BASE=0xFEB50000 > +CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SYS_LOAD_ADDR=0xc00800 > +CONFIG_PCI=y > +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_DEFAULT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb" > +# CONFIG_DISPLAY_CPUINFO is not set > +CONFIG_DISPLAY_BOARDINFO_LATE=y > +CONFIG_SPL_MAX_SIZE=0x40000 > +CONFIG_SPL_PAD_TO=0x7f8000 > +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_ATF=y > +CONFIG_CMD_GPIO=y > +CONFIG_CMD_GPT=y > +CONFIG_CMD_I2C=y > +CONFIG_CMD_MMC=y > +CONFIG_CMD_USB=y > +# CONFIG_CMD_SETEXPR is not set > +CONFIG_CMD_REGULATOR=y > +# CONFIG_SPL_DOS_PARTITION is not set > +CONFIG_SPL_OF_CONTROL=y > +CONFIG_OF_LIVE=y > +CONFIG_OF_UPSTREAM=y The OF_UPSTREAM already enabled for ROCKCHIP_RK3588, so no need here, please help to rebase on latest code. Thanks, - Kever > +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > +CONFIG_SPL_DM_SEQ_ALIAS=y > +CONFIG_SPL_REGMAP=y > +CONFIG_SPL_SYSCON=y > +CONFIG_SPL_CLK=y > +CONFIG_ROCKCHIP_GPIO=y > +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_PCIE_DW_ROCKCHIP=y > +CONFIG_PHY_ROCKCHIP_INNO_USB2=y > +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y > +CONFIG_PHY_ROCKCHIP_USBDP=y > +CONFIG_SPL_PINCTRL=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_USB=y > +CONFIG_USB_XHCI_HCD=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_GENERIC=y > +CONFIG_USB_OHCI_HCD=y > +CONFIG_USB_OHCI_GENERIC=y > +CONFIG_USB_DWC3=y > +CONFIG_USB_DWC3_GENERIC=y > +CONFIG_ERRNO_STR=y > diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst > index 9a726e9cde..593070e58b 100644 > --- a/doc/board/rockchip/rockchip.rst > +++ b/doc/board/rockchip/rockchip.rst > @@ -123,6 +123,7 @@ List of mainline supported Rockchip boards: > - Edgeble Neural Compute Module 6B SoM - Neu6b (neu6b-io-rk3588) > - FriendlyElec NanoPC-T6 (nanopc-t6-rk3588) > - Generic RK3588S/RK3588 (generic-rk3588) > + - Indiedroid Nova (nova-rk3588s) > - Pine64 QuartzPro64 (quartzpro64-rk3588) > - Radxa ROCK 5A (rock5a-rk3588s) > - Radxa ROCK 5B (rock5b-rk3588) > diff --git a/include/configs/nova-rk3588s.h b/include/configs/nova-rk3588s.h > new file mode 100644 > index 0000000000..0edd1ce888 > --- /dev/null > +++ b/include/configs/nova-rk3588s.h > @@ -0,0 +1,15 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (c) 2022 Collabora Ltd. > + */ > + > +#ifndef __NOVA_RK3588S_H > +#define __NOVA_RK3588S_H > + > +#define ROCKCHIP_DEVICE_SETTINGS \ > + "stdout=serial,vidconsole\0" \ > + "stderr=serial,vidconsole\0" > + > +#include <configs/rk3588_common.h> > + > +#endif /* __NOVA_RK3588S_H */
diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig index 39049ab35a..820e979abb 100644 --- a/arch/arm/mach-rockchip/rk3588/Kconfig +++ b/arch/arm/mach-rockchip/rk3588/Kconfig @@ -78,6 +78,15 @@ config TARGET_NANOPCT6_RK3588 Power: 5.5*2.1mm DC Jack, 12VDC input Dimensions: 110x80x1.6mm (without case) / 86x114.5x30mm (with case) +config TARGET_NOVA_RK3588 + bool "Indiedroid Nova RK3588" + select BOARD_LATE_INIT + help + Indiedroid Nova is a Rockchip RK3588s based SBC by Indiedroid. + It comes in configurations from 4GB of RAM to 16GB of RAM, + includes socket for eMMC storage, an SDMMC slot, and a 40-pin + GPIO header for expansion. + config TARGET_RK3588_NEU6 bool "Edgeble Neural Compute Module 6(Neu6) SoM" select BOARD_LATE_INIT @@ -223,6 +232,7 @@ config TEXT_BASE source "board/edgeble/neural-compute-module-6/Kconfig" source "board/friendlyelec/nanopc-t6-rk3588/Kconfig" +source "board/indiedroid/nova/Kconfig" source "board/pine64/quartzpro64-rk3588/Kconfig" source "board/turing/turing-rk1-rk3588/Kconfig" source "board/radxa/rock5a-rk3588s/Kconfig" diff --git a/board/indiedroid/nova/Kconfig b/board/indiedroid/nova/Kconfig new file mode 100644 index 0000000000..271d15a0ed --- /dev/null +++ b/board/indiedroid/nova/Kconfig @@ -0,0 +1,12 @@ +if TARGET_NOVA_RK3588 + +config SYS_BOARD + default "nova-rk3588s" + +config SYS_VENDOR + default "indiedroid" + +config SYS_CONFIG_NAME + default "nova-rk3588s" + +endif diff --git a/board/indiedroid/nova/MAINTAINERS b/board/indiedroid/nova/MAINTAINERS new file mode 100644 index 0000000000..9c56d01bf0 --- /dev/null +++ b/board/indiedroid/nova/MAINTAINERS @@ -0,0 +1,6 @@ +INDIEDROID-NOVA-RK3588 +M: Chris Morgan <macromorgan@hotmail.com> +S: Maintained +F: board/indiedroid/nova +F: include/configs/nova-rk3588s.h +F: configs/indiedroid-nova-rk3588_defconfig diff --git a/configs/nova-rk3588s_defconfig b/configs/nova-rk3588s_defconfig new file mode 100644 index 0000000000..231831fb55 --- /dev/null +++ b/configs/nova-rk3588s_defconfig @@ -0,0 +1,70 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_COUNTER_FREQUENCY=24000000 +CONFIG_ARCH_ROCKCHIP=y +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-indiedroid-nova" +CONFIG_ROCKCHIP_RK3588=y +CONFIG_SPL_SERIAL=y +CONFIG_TARGET_NOVA_RK3588=y +CONFIG_DEBUG_UART_BASE=0xFEB50000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SYS_LOAD_ADDR=0xc00800 +CONFIG_PCI=y +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_DEFAULT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_MAX_SIZE=0x40000 +CONFIG_SPL_PAD_TO=0x7f8000 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_ATF=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_REGULATOR=y +# CONFIG_SPL_DOS_PARTITION is not set +CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIVE=y +CONFIG_OF_UPSTREAM=y +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_SPL_REGMAP=y +CONFIG_SPL_SYSCON=y +CONFIG_SPL_CLK=y +CONFIG_ROCKCHIP_GPIO=y +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_PCIE_DW_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y +CONFIG_PHY_ROCKCHIP_USBDP=y +CONFIG_SPL_PINCTRL=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_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_GENERIC=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GENERIC=y +CONFIG_ERRNO_STR=y diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst index 9a726e9cde..593070e58b 100644 --- a/doc/board/rockchip/rockchip.rst +++ b/doc/board/rockchip/rockchip.rst @@ -123,6 +123,7 @@ List of mainline supported Rockchip boards: - Edgeble Neural Compute Module 6B SoM - Neu6b (neu6b-io-rk3588) - FriendlyElec NanoPC-T6 (nanopc-t6-rk3588) - Generic RK3588S/RK3588 (generic-rk3588) + - Indiedroid Nova (nova-rk3588s) - Pine64 QuartzPro64 (quartzpro64-rk3588) - Radxa ROCK 5A (rock5a-rk3588s) - Radxa ROCK 5B (rock5b-rk3588) diff --git a/include/configs/nova-rk3588s.h b/include/configs/nova-rk3588s.h new file mode 100644 index 0000000000..0edd1ce888 --- /dev/null +++ b/include/configs/nova-rk3588s.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2022 Collabora Ltd. + */ + +#ifndef __NOVA_RK3588S_H +#define __NOVA_RK3588S_H + +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + +#include <configs/rk3588_common.h> + +#endif /* __NOVA_RK3588S_H */