[PATCH] board: rockchip: add Khadas Edge2 RK3588 board

Quentin Schulz quentin.schulz at cherry.de
Mon Nov 25 15:05:24 CET 2024


Hi Jacobe,

On 11/19/24 8:46 AM, Jacobe Zang wrote:
> [You don't often get email from jacobe.zang at wesion.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> 
> Khadas Edge2 is a Rockchip RK3588S based SBC (Single Board Computer)
> by Khadas.
> 
> There are tree variants depending on the DRAM size : 8G and 16G.
> 
> Specification:
> 
>      Rockchip RK3588S SoC
>      4x ARM Cortex-A76, 4x ARM Cortex-A55
>      8/16GB memory LPDDR4x
>      Mali G610MP4 GPU
>      3x MIPI CSI 4x lanes
>      2x MIPI-DSI DPHY 4x lanes
>      32/64GB eMMC
>      1x USB 2.0, 1x USB 3.0, 2x USB-Type-C
>      1x HDMI 2.1 output, 1x DP 1.4 output
>      USB PD over USB Type-C
> 
> Kernel commit:
> 04d552993522 ("arm64: dts: rockchip: Add Khadas edge2 board")
> 
> Signed-off-by: Jacobe Zang <jacobe.zang at wesion.com>
> ---
> Add support for Khadas Edge2
> ---
>   arch/arm/mach-rockchip/rk3588/Kconfig         |  23 +++
>   board/khadas/khadas-edge2-rk3588s/Kconfig     |  12 ++
>   board/khadas/khadas-edge2-rk3588s/MAINTAINERS |   6 +
>   configs/khadas-edge2-rk3588s_defconfig        | 215 ++++++++++++++++++++++++++
>   doc/board/rockchip/rockchip.rst               |   1 +
>   include/configs/khadas-edge2-rk3588s.h        |  15 ++
>   6 files changed, 272 insertions(+)
> 
> diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig
> index b5a0e624a53..7d817e7f1bd 100644
> --- a/arch/arm/mach-rockchip/rk3588/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3588/Kconfig
> @@ -74,6 +74,28 @@ config TARGET_JAGUAR_RK3588
>                - fan controller (AMC6821 emulation)
>              * 80-pin Mezzanine connector
> 
> +config TARGET_KHADAS_EDGE2_RK3588
> +       bool "Khadas Edge2 RK3588 board"
> +       select BOARD_LATE_INIT
> +       help
> +         Khadas Edge2 is a Rockchip RK3588S based SBC (Single Board Computer)
> +         by Khadas.
> +
> +         There are tree variants depending on the DRAM size : 8G and 16G.
> +
> +         Specification:
> +
> +         Rockchip RK3588S SoC
> +         4x ARM Cortex-A76, 4x ARM Cortex-A55
> +         8/16GB memory LPDDR4x
> +         Mali G610MP4 GPU
> +         3x MIPI CSI 4x lanes
> +         2x MIPI-DSI DPHY 4x lanes
> +         32/64GB eMMC
> +         1x USB 2.0, 1x USB 3.0, 2x USB-Type-C
> +         1x HDMI 2.1 output, 1x DP 1.4 output
> +         USB PD over USB Type-C
> +
>   config TARGET_NANOPCT6_RK3588
>          bool "FriendlyElec NanoPC-T6 RK3588 board"
>          select BOARD_LATE_INIT
> @@ -393,6 +415,7 @@ source "board/friendlyelec/nanopi-r6c-rk3588s/Kconfig"
>   source "board/friendlyelec/nanopi-r6s-rk3588s/Kconfig"
>   source "board/hardkernel/odroid_m2/Kconfig"
>   source "board/indiedroid/nova/Kconfig"
> +source "board/khadas/khadas-edge2-rk3588s/Kconfig"
>   source "board/pine64/quartzpro64-rk3588/Kconfig"
>   source "board/turing/turing-rk1-rk3588/Kconfig"
>   source "board/radxa/rock5a-rk3588s/Kconfig"
> diff --git a/board/khadas/khadas-edge2-rk3588s/Kconfig b/board/khadas/khadas-edge2-rk3588s/Kconfig
> new file mode 100644
> index 00000000000..dd7b6cd8054
> --- /dev/null
> +++ b/board/khadas/khadas-edge2-rk3588s/Kconfig
> @@ -0,0 +1,12 @@
> +if TARGET_KHADAS_EDGE2_RK3588
> +
> +config SYS_BOARD
> +       default "khadas-edge2-rk3588s"
> +
> +config SYS_VENDOR
> +       default "khadas"
> +
> +config SYS_CONFIG_NAME
> +       default "khadas-edge2-rk3588s"
> +
> +endif
> diff --git a/board/khadas/khadas-edge2-rk3588s/MAINTAINERS b/board/khadas/khadas-edge2-rk3588s/MAINTAINERS
> new file mode 100644
> index 00000000000..3f16923b0f2
> --- /dev/null
> +++ b/board/khadas/khadas-edge2-rk3588s/MAINTAINERS
> @@ -0,0 +1,6 @@
> +KHADAS-EDGE2-RK3588S
> +M:     Jacobe Zang <jacobe.zang at wesion.com>
> +S:     Maintained
> +F:     configs/khadas-edge2-rk3588s_defconfig
> +F:     include/configs/khadas-edge2-rk3588s.h
> +F:     dts/upstream/src/arm64/rockchip/rk3588s-khadas-edge2.dts
> \ No newline at end of file
> diff --git a/configs/khadas-edge2-rk3588s_defconfig b/configs/khadas-edge2-rk3588s_defconfig
> new file mode 100644
> index 00000000000..208c72ca425
> --- /dev/null
> +++ b/configs/khadas-edge2-rk3588s_defconfig
> @@ -0,0 +1,215 @@
> +CONFIG_ARM=y
> +CONFIG_SKIP_LOWLEVEL_INIT=y
> +CONFIG_COUNTER_FREQUENCY=24000000
> +CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-khadas-edge2"
> +CONFIG_SPL_GPIO_SUPPORT=y
> +CONFIG_SPL_LIBCOMMON_SUPPORT=y
> +CONFIG_SPL_LIBGENERIC_SUPPORT=y
> +CONFIG_SYS_MALLOC_F_LEN=0x80000
> +CONFIG_ROCKCHIP_RK3588=y
> +CONFIG_ROCKCHIP_FIT_IMAGE=y
> +CONFIG_SPL_SERIAL=y
> +CONFIG_TARGET_KHADAS_EDGE2_RK3588=y
> +CONFIG_DEBUG_UART_BASE=0xFEB50000
> +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_DEFAULT_FDT_FILE="rockchip/rk3588s-khadas-edge2.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_SEPARATE_BSS=y
> +CONFIG_SPL_MMC_WRITE=y
> +CONFIG_SPL_MTD_SUPPORT=y
> +CONFIG_SPL_ATF=y
> +CONFIG_SPL_AB=y
> +CONFIG_SYS_PROMPT="kedge2# "
> +CONFIG_AUTOBOOT_KEYED=y
> +CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot\n"
> +CONFIG_AUTOBOOT_STOP_STR=" "
> +CONFIG_CMD_BOOTZ=y
> +CONFIG_CMD_DTIMG=y
> +CONFIG_CMD_GPIO=y
> +CONFIG_CMD_GPT=y
> +CONFIG_CMD_I2C=y
> +CONFIG_CMD_MMC=y
> +CONFIG_SPI=y
> +CONFIG_SPL_SPI_SUPPORT=y
> +CONFIG_DM=y
> +CONFIG_DM_SPI=y
> +CONFIG_DM_MMC=y
> +# CONFIG_DM_SPI_FLASH=y
> +CONFIG_MMC=y
> +# CONFIG_MMC_SPI=y
> +CONFIG_CMD_SF=y
> +CONFIG_CMD_SPI=y
> +CONFIG_CMD_USB=y
> +CONFIG_CMD_USB_MASS_STORAGE=y
> +# CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_REGULATOR=y
> +CONFIG_CMD_TFTPPUT=y
> +CONFIG_CMD_TFTP_BOOTM=y
> +CONFIG_CMD_TFTP_FLASH=y
> +CONFIG_CMD_MTD_BLK=y
> +# CONFIG_SPL_DOS_PARTITION is not set
> +CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
> +CONFIG_SPL_OF_CONTROL=y
> +CONFIG_SPL_DTB_MINIMUM=y
> +CONFIG_OF_LIVE=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_OF_U_BOOT_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"

This config option doesn't exist upstream.

> +CONFIG_REGMAP=y
> +CONFIG_SPL_REGMAP=y
> +CONFIG_SYSCON=y
> +CONFIG_SPL_SYSCON=y
> +CONFIG_SARADC_ROCKCHIP_V2=y

This config option doesn't exist upstream.

> +CONFIG_CLK=y
> +CONFIG_SPL_CLK=y
> +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
> +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
> +CONFIG_FASTBOOT_BUF_ADDR=0xc00800
> +CONFIG_FASTBOOT_BUF_SIZE=0x07000000
> +CONFIG_FASTBOOT_FLASH=y
> +CONFIG_FASTBOOT_FLASH_MMC_DEV=0
> +CONFIG_ROCKCHIP_GPIO=y
> +CONFIG_ROCKCHIP_GPIO_V2=y

This config option doesn't exist upstream.

> +CONFIG_SYS_I2C_ROCKCHIP=y
> +CONFIG_I2C_MUX=y
> +CONFIG_DM_KEY=y
> +CONFIG_RK8XX_PWRKEY=y
> +CONFIG_ADC_KEY=y
> +CONFIG_MISC=y
> +CONFIG_SUPPORT_EMMC_RPMB=y
> +CONFIG_SPL_MISC=y
> +CONFIG_MISC_DECOMPRESS=y
> +CONFIG_SPL_MISC_DECOMPRESS=y
> +CONFIG_ROCKCHIP_OTP=y
> +CONFIG_ROCKCHIP_HW_DECOMPRESS=y
> +CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y
> +CONFIG_SPL_ROCKCHIP_SECURE_OTP=y
> +CONFIG_MMC_DW=y
> +CONFIG_MMC_DW_ROCKCHIP=y
> +CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_HS200_SUPPORT=y
> +CONFIG_MMC_HS400_SUPPORT=y
> +CONFIG_MMC_SDHCI_SDMA=y
> +CONFIG_MMC_SDHCI_ROCKCHIP=y
> +CONFIG_PHY_REALTEK=y
> +CONFIG_MTD=y
> +CONFIG_MTD_BLK=y
> +CONFIG_MTD_DEVICE=y
> +# CONFIG_NAND=y
> +# CONFIG_MTD_SPI_NAND=y
> +CONFIG_SPI_FLASH=y
> +CONFIG_SF_DEFAULT_SPEED=80000000
> +CONFIG_SPI_FLASH_EON=y
> +CONFIG_SPI_FLASH_GIGADEVICE=y
> +CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_SPI_FLASH_SST=y
> +CONFIG_SPI_FLASH_WINBOND=y
> +CONFIG_SPI_FLASH_XMC=y
> +CONFIG_SPI_FLASH_XTX=y
> +CONFIG_SPI_FLASH_MTD=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_ETH_PHY=y
> +CONFIG_DWC_ETH_QOS=y
> +CONFIG_DWC_ETH_QOS_ROCKCHIP=y
> +CONFIG_GMAC_ROCKCHIP=y
> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
> +CONFIG_PHY_ROCKCHIP_USBDP=y
> +CONFIG_PINCTRL=y
> +CONFIG_SPL_PINCTRL=y
> +CONFIG_DM_FUEL_GAUGE=y
> +CONFIG_POWER_FG_CW201X=y
> +CONFIG_POWER_FG_CW221X=y

The above options do not exist upstream.

etc..

Please generate a defconfig that is actually made for upstream and 
enables what's needed.

Cheers,
Quentin


More information about the U-Boot mailing list