[PATCH v2 3/3] board: rockchip: Add Hardkernel ODROID-M1S

Tue Oct 8 23:34:26 CEST 2024

On Tue, 8 Oct 2024 at 21:07, Jonas Karlman <jonas at kwiboo.se> wrote:
>
> The Hardkernel ODROID-M1S is a single-board computer based on Rockchip
> RK3566 SoC. It features e.g. 4/8 GB LPDDR4 RAM, 64 GB eMMC, SD-card,
> GbE LAN, HDMI 2.0, M.2 NVMe and USB 2.0/3.0.
>
> Features tested on a ODROID-M1S 8GB rev1.0 20230906:
> - SD-card boot
> - eMMC boot
> - Ethernet
> - PCIe/NVMe
> - USB gadget
> - USB host
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>

A couple of small queries below.
Reviewed-by: Peter Robinson <pbrobinson at gmail.com>

> ---
> v2: Fix clean apply on master branch
> ---
>  arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi |  3 +
>  arch/arm/mach-rockchip/rk3568/Kconfig      |  6 ++
>  board/hardkernel/odroid_m1s/Kconfig        | 12 +++
>  board/hardkernel/odroid_m1s/MAINTAINERS    |  6 ++
>  configs/odroid-m1s-rk3566_defconfig        | 93 ++++++++++++++++++++++
>  doc/board/rockchip/rockchip.rst            |  1 +
>  6 files changed, 121 insertions(+)
>  create mode 100644 arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi
>  create mode 100644 board/hardkernel/odroid_m1s/Kconfig
>  create mode 100644 board/hardkernel/odroid_m1s/MAINTAINERS
>  create mode 100644 configs/odroid-m1s-rk3566_defconfig
>
> diff --git a/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi b/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi
> new file mode 100644
> index 000000000000..6e8307e3bdf6
> --- /dev/null
> +++ b/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi
> @@ -0,0 +1,3 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +
> +#include "rk356x-u-boot.dtsi"
> diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
> index 899cf909fbb9..e646f714c929 100644
> --- a/arch/arm/mach-rockchip/rk3568/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3568/Kconfig
> @@ -22,6 +22,11 @@ config TARGET_ODROID_M1_RK3568
>         help
>           Hardkernel ODROID-M1 single board computer with a RK3568B2 SoC.
>
> +config TARGET_ODROID_M1S_RK3566
> +       bool "ODROID-M1S"
> +       help
> +         Hardkernel ODROID-M1S single board computer with a RK3566 SoC.
> +
>  config TARGET_POWKIDDY_X55_RK3566
>         bool "Powkiddy X55"
>         help
> @@ -62,6 +67,7 @@ config TEXT_BASE
>  source "board/rockchip/evb_rk3568/Kconfig"
>  source "board/anbernic/rgxx3_rk3566/Kconfig"
>  source "board/hardkernel/odroid_m1/Kconfig"
> +source "board/hardkernel/odroid_m1s/Kconfig"
>  source "board/pine64/quartz64_rk3566/Kconfig"
>  source "board/powkiddy/x55/Kconfig"
>  source "board/radxa/zero3-rk3566/Kconfig"
> diff --git a/board/hardkernel/odroid_m1s/Kconfig b/board/hardkernel/odroid_m1s/Kconfig
> new file mode 100644
> index 000000000000..5e0d2ca6d08b
> --- /dev/null
> +++ b/board/hardkernel/odroid_m1s/Kconfig
> @@ -0,0 +1,12 @@
> +if TARGET_ODROID_M1S_RK3566
> +
> +config SYS_BOARD
> +       default "odroid_m1s"
> +
> +config SYS_VENDOR
> +       default "hardkernel"
> +
> +config SYS_CONFIG_NAME
> +       default "odroid_m1"
> +
> +endif
> diff --git a/board/hardkernel/odroid_m1s/MAINTAINERS b/board/hardkernel/odroid_m1s/MAINTAINERS
> new file mode 100644
> index 000000000000..0c8d11249bff
> --- /dev/null
> +++ b/board/hardkernel/odroid_m1s/MAINTAINERS
> @@ -0,0 +1,6 @@
> +ODROID-M1S
> +M:     Jonas Karlman <jonas at kwiboo.se>
> +S:     Maintained
> +F:     board/hardkernel/odroid_m1s/
> +F:     configs/odroid-m1s-rk3566_defconfig
> +F:     arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi
> diff --git a/configs/odroid-m1s-rk3566_defconfig b/configs/odroid-m1s-rk3566_defconfig
> new file mode 100644
> index 000000000000..21f4fcb9d7be
> --- /dev/null
> +++ b/configs/odroid-m1s-rk3566_defconfig
> @@ -0,0 +1,93 @@
> +CONFIG_ARM=y
> +CONFIG_SKIP_LOWLEVEL_INIT=y
> +CONFIG_COUNTER_FREQUENCY=24000000
> +CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3566-odroid-m1s"
> +CONFIG_ROCKCHIP_RK3568=y
> +CONFIG_SPL_SERIAL=y
> +CONFIG_TARGET_ODROID_M1S_RK3566=y
> +CONFIG_DEBUG_UART_BASE=0xFE660000
> +CONFIG_DEBUG_UART_CLOCK=24000000
> +CONFIG_SYS_LOAD_ADDR=0xc00800
> +CONFIG_PCI=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_AHCI=y
I don't see a SATA connector on the board, is there an addon hat or
similar? Same query for the other AHCI/SCSI options further below.

> +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/rk3566-odroid-m1s.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_PCI=y
> +CONFIG_CMD_USB=y
> +CONFIG_CMD_ROCKUSB=y
> +CONFIG_CMD_USB_MASS_STORAGE=y
> +# CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_INI=y
> +CONFIG_CMD_PMIC=y
> +CONFIG_CMD_REGULATOR=y
> +CONFIG_CMD_CRAMFS=y
> +# CONFIG_SPL_DOS_PARTITION is not set
> +CONFIG_SPL_OF_CONTROL=y
> +CONFIG_OF_LIVE=y
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_SPL_DM_SEQ_ALIAS=y
> +CONFIG_SPL_REGMAP=y
> +CONFIG_SPL_SYSCON=y
> +CONFIG_AHCI_PCI=y
> +CONFIG_DWC_AHCI=y
> +CONFIG_SPL_CLK=y
> +# CONFIG_USB_FUNCTION_FASTBOOT is not set
> +CONFIG_ROCKCHIP_GPIO=y
> +CONFIG_SYS_I2C_ROCKCHIP=y
> +CONFIG_LED=y
> +CONFIG_LED_GPIO=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_PHY_REALTEK=y
> +CONFIG_DWC_ETH_QOS=y
> +CONFIG_DWC_ETH_QOS_ROCKCHIP=y
> +CONFIG_NVME_PCI=y
> +CONFIG_PCIE_DW_ROCKCHIP=y
> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
> +CONFIG_SPL_PINCTRL=y
> +CONFIG_DM_PMIC=y
> +CONFIG_PMIC_RK8XX=y
> +CONFIG_REGULATOR_RK8XX=y
> +CONFIG_SPL_RAM=y
> +CONFIG_SCSI=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_USB_GADGET=y
> +CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_ROCKUSB=y
> +CONFIG_FS_CRAMFS=y

What's cramfs used for?

> +CONFIG_ERRNO_STR=y
> diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst
> index a50e3d2b8f38..7b11a2e0a358 100644
> --- a/doc/board/rockchip/rockchip.rst
> +++ b/doc/board/rockchip/rockchip.rst
> @@ -98,6 +98,7 @@ List of mainline supported Rockchip boards:
>
>  * rk3566
>       - Anbernic RGxx3 (anbernic-rgxx3-rk3566)
> +     - Hardkernel ODROID-M1S (odroid-m1s-rk3566)
>       - Pine64 PineTab2 (pinetab2-rk3566)
>       - Pine64 Quartz64-A Board (quartz64-a-rk3566)
>       - Pine64 Quartz64-B Board (quartz64-b-rk3566)
> --
> 2.46.2
>