From patchwork Thu Jun 13 17:01:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 45079 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18520C27C6E for ; Thu, 13 Jun 2024 17:02:05 +0000 (UTC) Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by mx.groups.io with SMTP id smtpd.web11.14070.1718298122087303810 for ; Thu, 13 Jun 2024 10:02:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=c3fS8XYN; spf=pass (domain: gmail.com, ip: 209.85.222.174, mailfrom: twoerner@gmail.com) Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-7955ddc6516so75792685a.1 for ; Thu, 13 Jun 2024 10:02:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718298120; x=1718902920; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=d9jRO2fDl0X7O41t4oNP83kDFkFkgMzW/2FyNnDNV0w=; b=c3fS8XYNEdgpyNSKU17k/Q9efzkvxHdsexve0RVghYEry2lydIlp67wZbFShb7xkD1 IegJvKNeE1tTlZyXj7lKQ/DLSX+2FQGv3OWxPylf7RoGBpkS/ydaaYdqrCyyJqAOrlC0 0b6BY1jLNeAPiCYGTSIWr5URQVgYC5uyFo7wbIpdCbYrAOnxRLhVFokPUGA5qx9EaHMo mybP16yh9vrLWDJXTb4KTSu81JLwzMYGN07qFWLmaz5mP5cyq7+AMuWdsIJy8Hxo5Bed oqFNMHoqxw/aXA9zltTD2ytIQbp2rCPSGvc/uAbgEUpEaIFlOaFqw0PSfM5samw6KHr6 qCCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718298120; x=1718902920; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=d9jRO2fDl0X7O41t4oNP83kDFkFkgMzW/2FyNnDNV0w=; b=IhMXwS16tVHvzohL7Siof1FUdA9/yH0ngh9KGDqqtcZ5cEDQdcywzJ7mOgn0MAM2Pi pgEkm6NNBK9Pq9SNxL61NjhCo5edNKh5Vy+PT3iNmyjA6hyc+ItornaFFANhP8IcDWov X3kwGf2ZxL0m8qttHH+mM0zMX1M2d5kFyhE5HgqhihHL161wwOH4AyoxzEXRdffjyNmy mKnmyfCkfBIU/VS/eOJJGN/FlP1ufbguNaQ98sTTSUPpwYX+3rHbZf8zHZUgc3X6nqU4 FO2sdMsmFKGr9F+K5WqGovIaAI3QmX8RLjuNN++udQQZmhSv9c6NcNnsrMFP1mqq5lY+ eM3A== X-Gm-Message-State: AOJu0Yx1RR1QVjOrKaV90R7dI/Temab3NN6x2Jtpkrt+yYW04hIr+w+9 ZYrolHAnY7WABBzHWCKIrpt4X7mliwKfIW/leR80H+K5pJGnfikQ4LS71Q== X-Google-Smtp-Source: AGHT+IFTyCmWJnuDI6TLk1HTZAXKtZhyVwbM1xnb4MpUHkfgEYptKST3QdhoEKlbe2f86IkHU1C4tw== X-Received: by 2002:ad4:4e68:0:b0:6b0:8fab:d8db with SMTP id 6a1803df08f44-6b2afcb1a1amr1574336d6.27.1718298119669; Thu, 13 Jun 2024 10:01:59 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b2a5c18209sm8588676d6.42.2024.06.13.10.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 10:01:58 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][PATCH v3 1/4] rockchip-rkbin: bump SRCREV Date: Thu, 13 Jun 2024 13:01:51 -0400 Message-ID: <20240613170154.6441-1-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 13 Jun 2024 17:02:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/324 Update to a newer release. rk3568: - update DDR init from version 1.18 → 1.21 rk3588/s: - the name of the DDR init changed due to upstream adjusting the frequency of the LPDDR5 to 2400MHz to "improve stability" [1] - reference an exact version instead of using an '*' - update DDR init from version 1.12 → 1.16 Boot tested on: - rock-3a - rock-5a - rock-5b Link [1]: https://github.com/rockchip-linux/rkbin/commit/f02d10e468d8c783c45137d230ff33d42ca670b4 Reviewed-by: Quentin Schulz Tested-by: Quentin Schulz #RK3588 Jaguar, manual U-Boot compilation Signed-off-by: Trevor Woerner --- v3 changes: - greatly improve the commit message v2 changes: - added - break out the SRCREV bump and make it applicable to all builds/boards --- recipes-bsp/rkbin/rockchip-rkbin_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb index 7929c6ac3a10..f9724ddd5cd5 100644 --- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb +++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb @@ -3,7 +3,7 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62" SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" -SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23" +SRCREV = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0" PROVIDES += "trusted-firmware-a" PROVIDES += "optee-os" @@ -42,7 +42,7 @@ do_deploy:rk3568() { # Prebuilt OPTEE-OS install -m 644 ${S}/bin/rk35/rk3568_bl32_v*.bin ${DEPLOYDIR}/tee-rk3568.bin # Prebuilt U-Boot TPL (DDR init) - install -m 644 ${S}/bin/rk35/rk3568_ddr_1560MHz_v1.18.bin ${DEPLOYDIR}/ddr-rk3568.bin + install -m 644 ${S}/bin/rk35/rk3568_ddr_1560MHz_v1.21.bin ${DEPLOYDIR}/ddr-rk3568.bin } do_deploy:rk3588s() { @@ -51,7 +51,7 @@ do_deploy:rk3588s() { # Prebuilt OPTEE-OS install -m 644 ${S}/bin/rk35/rk3588_bl32_v*.bin ${DEPLOYDIR}/tee-rk3588.bin # Prebuilt U-Boot TPL (DDR init) - install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v*.bin ${DEPLOYDIR}/ddr-rk3588.bin + install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin ${DEPLOYDIR}/ddr-rk3588.bin } do_deploy() { From patchwork Thu Jun 13 17:01:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 45078 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15B72C41513 for ; Thu, 13 Jun 2024 17:02:05 +0000 (UTC) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by mx.groups.io with SMTP id smtpd.web10.13880.1718298123474176046 for ; Thu, 13 Jun 2024 10:02:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=d82OYQOT; spf=pass (domain: gmail.com, ip: 209.85.160.176, mailfrom: twoerner@gmail.com) Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-43fdbe0f072so6960941cf.3 for ; Thu, 13 Jun 2024 10:02:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718298122; x=1718902922; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Cy52W59C1H2T0wy9nUbeNRTCHcONmkHdGq7FoSfUuQA=; b=d82OYQOTD0s8+0jogMo+XfLoev80apNPHIOgF8CPn1Rf4xnUrH0BA1Q4+FfiPpgGoy POlkbZD5hD3/byd528KJXqMJZvDUEC2Stm0C6kp/fZj7pf4unS9RoJlTvGwfUr6isJfx jzekOYXOh3XSZJSEnUUDrMi7rh0/1iwXEZJ0kXBMEl0DPnaWsnVe4b3h06aWIuaHqSkt n3OA5PIusoQKDU+u2CUb90y+RqO8iCJN4qQ/hSZW9/NO7kdLI5o2cW6NAh5R3wZbDnas 9VnqZNY4ARz1YDInrnI4lcgOdTzmljp0rCufSE4mUjhOV2SHImqGfXr+D3x6cfIhHaY/ BLow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718298122; x=1718902922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cy52W59C1H2T0wy9nUbeNRTCHcONmkHdGq7FoSfUuQA=; b=NoJWc7OZRYxEr/BP7/0KccZSLWsDwhrU8plKXnowvodqJGAdWD9+DYLv0ccdaQNkKW 2COlkguH4l+3H+BF83RvO1HbWMgA4dxwUxjI+1XkrDShdQsKAnlGxcgmmP59Xe1V8uym 3YATY7Rll/TP+umRKydPbSn8zvOgHUJ4oaDh2r+ECbYBLCOa22/rzlntaRDF0gOluULS JY0dWpLZf1chfqgpyJmy306amxxgHALS6ei6zofLhQwjNOjBuFNu9MaDgvgsG3K/XUpX xJvEF1mj0V+U4pv9bBIb2JmKKyYa87UUf1KWRbXV4czfT4mqkPXlBWLpLq5B1MjzvG1G 4uOg== X-Gm-Message-State: AOJu0YyBH/99cV9Y85Ynx1bXw3U4flkRobHpiEVCZDsD4IHwSgWJTnqI qlobfvWiKvDwZ/uPtkurchUUg5JhMcDW0XdRBZUt/8cDRQ3A9NQIlTq+xg== X-Google-Smtp-Source: AGHT+IFfJ8vaHxu3BbUj00xUiqNd2CbvdCHo2zMfdGlMccoeHoxq7Q+MDAGOJFcu65M5cMS0M71LmA== X-Received: by 2002:ac8:7dcd:0:b0:441:5994:fd41 with SMTP id d75a77b69052e-442168c0974mr1769171cf.35.1718298120792; Thu, 13 Jun 2024 10:02:00 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b2a5c18209sm8588676d6.42.2024.06.13.10.01.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 10:02:00 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v3 2/4] radxa-zero-3e: add Date: Thu, 13 Jun 2024 13:01:52 -0400 Message-ID: <20240613170154.6441-2-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240613170154.6441-1-twoerner@gmail.com> References: <20240613170154.6441-1-twoerner@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 13 Jun 2024 17:02:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/325 The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. http://radxa.com/products/zeros/zero3e/ tech specs: - Rockchip RK3566 (4x Arm Cortex-A55 @ 1.6GHz) - Arm Mali-G52-2EE (OpenGL ES 1.1/2.0/3.0/3.1/3.2, Vulkan 1.1, OpenCL 2.0) - LPDDR4 RAM (1/2/3/8 GB) - µSD - GbE - 1x USB 2.0 Type C OTG, 1x USB 3.0 Type C Host - 1x µHDMI (1080p @ 60fps) - 1x MIPI CSI camera port - colour-coded 40-pin GPIO (uart, spi, i2c, pcm/i2s, pwm, gpio) - 72mm x 30mm NOTE: currently support for this board requires a U-Boot fork for the bootloader, and linux-next for the kernel. Support will probably come in linux kernel 6.11-ish, at which point U-Boot will then use that kernel's device tree which means U-Boot support will come after the release of whichever kernel includes support for this board. Signed-off-by: Trevor Woerner --- v3 changes: - remove sha256sum from u-boot bbappend - linux-torvalds-next: - fix COMPATIBLE_MACHINE - add comment on SRCREV indicating the tag name v2 changes: - copy the rk3568-based bl31/bl32 pieces to have rk3566-based names so the rest of the infrastructure works without tweaks - uncomment/implement the "remove-non-rockchip-arch" kernel scc - order/sort items - cleanup/fixup the linux-torvalds-next kernel recipe: - sort oe items based on the style guide - remove vestigial bits - use a commit id instead of a tag name - update license string - add DEFAULT_PREFERENCE=-1 - add COMPATIBLE_MACHINE --- README | 1 + conf/machine/include/rk3566.inc | 21 +++++++++++++++++ conf/machine/radxa-zero-3e.conf | 12 ++++++++++ recipes-bsp/rkbin/rockchip-rkbin_git.bb | 12 ++++++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++++ .../linux/linux-torvalds-next_git.bb | 23 +++++++++++++++++++ 6 files changed, 73 insertions(+) create mode 100644 conf/machine/include/rk3566.inc create mode 100644 conf/machine/radxa-zero-3e.conf create mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb diff --git a/README b/README index b21e92360dcc..a9a040a4308d 100644 --- a/README +++ b/README @@ -40,6 +40,7 @@ Status of supported boards: orangepi-5-plus rock-3a rock-4c-plus + radxa-zero-3e builds: marsboard-rk3066 radxarock diff --git a/conf/machine/include/rk3566.inc b/conf/machine/include/rk3566.inc new file mode 100644 index 000000000000..586d68806df6 --- /dev/null +++ b/conf/machine/include/rk3566.inc @@ -0,0 +1,21 @@ +SOC_FAMILY = "rk3566" + +DEFAULTTUNE ?= "cortexa55" + +ROCKCHIP_CLOSED_TPL ?= "1" + +require conf/machine/include/soc-family.inc +require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc +require conf/machine/include/rockchip-wic.inc + +KBUILD_DEFCONFIG ?= "defconfig" +KERNEL_FEATURES:append:rk3566 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" +KERNEL_CLASSES = "kernel-fitimage" +KERNEL_IMAGETYPE ?= "fitImage" + +PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin" +PREFERRED_PROVIDER_optee-os = "rockchip-rkbin" + +UBOOT_SUFFIX ?= "itb" +UBOOT_ENTRYPOINT ?= "0x06000000" diff --git a/conf/machine/radxa-zero-3e.conf b/conf/machine/radxa-zero-3e.conf new file mode 100644 index 000000000000..3a39d6c12a1f --- /dev/null +++ b/conf/machine/radxa-zero-3e.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: Radxa Zero 3E +#@DESCRIPTION: The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. +#http://radxa.com/products/zeros/zero3e/ + +require conf/machine/include/rk3566.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3e.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig" diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb index f9724ddd5cd5..1b71414e27ca 100644 --- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb +++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb @@ -14,6 +14,7 @@ S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE:rk3308 = "rk3308" +COMPATIBLE_MACHINE:rk3566 = "rk3566" COMPATIBLE_MACHINE:rk3568 = "rk3568" COMPATIBLE_MACHINE:rk3588s = "rk3588s" @@ -36,6 +37,17 @@ do_deploy:rk3308() { install -m 644 ${S}/bin/rk33/rk3308_ddr_589MHz_uart?_m0_v*.bin ${DEPLOYDIR}/ddr-rk3308.bin } +# NOTE: the following are not typos +# the rk3566 uses the same bl31/2 as the rk3568 +do_deploy:rk3566() { + # Prebuilt TF-A + install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3566.elf + # Prebuilt OPTEE-OS + install -m 644 ${S}/bin/rk35/rk3568_bl32_v*.bin ${DEPLOYDIR}/tee-rk3566.bin + # Prebuilt U-Boot TPL (DDR init) + install -m 644 ${S}/bin/rk35/rk3566_ddr_1056MHz_v1.21.bin ${DEPLOYDIR}/ddr-rk3566.bin +} + do_deploy:rk3568() { # Prebuilt TF-A install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3568.elf diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 1f5f63459627..e1ee17ef6905 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -2,6 +2,10 @@ require u-boot-rockchip.inc FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:radxa-zero-3e = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo" +SRCREV:radxa-zero-3e = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +SRCREV:radxa-zero-3e:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" + SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg" SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a" diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb new file mode 100644 index 000000000000..a932f5397771 --- /dev/null +++ b/recipes-kernel/linux/linux-torvalds-next_git.bb @@ -0,0 +1,23 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:" + +DESCRIPTION = "Linux Kernel" +SECTION = "kernel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +DEFAULT_PREFERENCE = "-1" +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:radxa-zero-3e = "radxa-zero-3e" + +LINUX_VERSION = "6.10-rc3" +PV = "${LINUX_VERSION}+git${SRCPV}" +SRC_URI = " \ + git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master \ + file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \ + " +# this is tag 'next-20240611' +SRCREV = "a957267fa7e9159d3d2ee1421359ebf228570c68" + +inherit kernel +inherit kernel-yocto +require recipes-kernel/linux/linux-yocto.inc From patchwork Thu Jun 13 17:01:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 45080 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C39AC27C78 for ; Thu, 13 Jun 2024 17:02:05 +0000 (UTC) Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by mx.groups.io with SMTP id smtpd.web11.14072.1718298124012289721 for ; Thu, 13 Jun 2024 10:02:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ImStFFsu; spf=pass (domain: gmail.com, ip: 209.85.219.51, mailfrom: twoerner@gmail.com) Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-6b06b78e716so8302976d6.3 for ; Thu, 13 Jun 2024 10:02:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718298122; x=1718902922; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IN3Q5taSNJkkorRCCA/ZAwcDJXpTTaNlv9Ih6jtOkfY=; b=ImStFFsu9giKFDnF4ytMY+DGQ93NgLoX46wkEEfwo7V0EGHisRdyhsS5Vxi/ANngSp iITIiX2nGvq/gYzepxRVmpqaqGP5Wa9niTg6JNIU4G1kWk+S2Q43RxrsBziE7fFolY9R LwEktO8dANgkO03F1NAO//GoDYtcbBKlFcU+8FYLYe4TR+Kg6ZeEvAf1p48GgzxXt9hy mcQls5Hyo7K4MltocuGzgoEZ/88vGd2Cu26TWg2/jjO7jPuYr5sYz9Wt8VNeJfAjza7h f/vjkP60FTQIZ0ceSgx6UhEH3eOwi4IIcJ+HRomin5ireL5vF2mTVzKZGf7hzpiEQcJz xkwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718298122; x=1718902922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IN3Q5taSNJkkorRCCA/ZAwcDJXpTTaNlv9Ih6jtOkfY=; b=mj8ergyiiwCdU6u2nJ8awlLoC0BW7I5TPbbq5beyddL/01B6A0FGlwbIswMldAKDLp /FQFwsE9BuN9UuOXPjveBKmaC38ihcTeKUAZK8YQ+iQSj9TkAVrLXrJuS5cOQfjRm1il dvtLR47arQVl7cx0i6aFfC4c438zzehmKLNc+0yeCuACWod3Lvl25ZsV4tz8ne99dszU tI0wtfIAkmEnZl7KoISGM/vX96x/DjmknAisvYhpEPtRnrBFbBv8wkktT9Qs4T0YAEsx rv3NGmhDpxJvz/yj3t+muIDQalGuXyLAhqxtx0nIwqGCP/l6n5K6bsgmhD6yE9fdJVOv DKew== X-Gm-Message-State: AOJu0YyLmSkAofo7sBro/0ji9h2pEs6rmOzrkE/0JnGMyR23DMyzj65S 2jS9AV+jj0XdzuiSbQyJhsBiby5fp53QM7nG0m3fPKPYpRycHZ8aM+Apvg== X-Google-Smtp-Source: AGHT+IHpY2/+d78GhtfvWSmvHyZ/IHH9i6VGZBGdzkR9kpLT+uyVHSXqGcFfEpXv8smDLeY9LPfT3Q== X-Received: by 2002:ad4:4f8f:0:b0:6b0:7d9a:79f1 with SMTP id 6a1803df08f44-6b2afd6158bmr1295686d6.42.1718298121967; Thu, 13 Jun 2024 10:02:01 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b2a5c18209sm8588676d6.42.2024.06.13.10.02.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 10:02:01 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v3 3/4] radxa-zero-3w: add Date: Thu, 13 Jun 2024 13:01:53 -0400 Message-ID: <20240613170154.6441-3-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240613170154.6441-1-twoerner@gmail.com> References: <20240613170154.6441-1-twoerner@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 13 Jun 2024 17:02:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/326 The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. http://radxa.com/products/zeros/zero3w/ tech specs: - Rockchip RK3566 (4x Arm Cortex-A55 @ 1.6GHz) - Arm Mali-G52-2EE (OpenGL ES 1.1/2.0/3.0/3.1/3.2, Vulkan 1.1, OpenCL 2.0) - LPDDR4 RAM (1/2/3/8 GB) - µSD - optional onboard eMMC (8/16/32/64 GB) - IEEE 802.11 b/g/n/ac/ax(WiFi6), BT5.4 with BLE - 1x USB 2.0 Type C OTG, 1x USB 3.0 Type C Host - 1x µHDMI (1080p @ 60fps) - 1x MIPI CSI camera port - colour-coded 40-pin GPIO (uart, spi, i2c, pcm/i2s, pwm, gpio) - 72mm x 30mm Signed-off-by: Trevor Woerner --- v3 changes: - new --- README | 1 + conf/machine/include/radxa-zero-3.inc | 6 ++++++ conf/machine/include/rk3566.inc | 1 + conf/machine/radxa-zero-3e.conf | 7 +------ conf/machine/radxa-zero-3w.conf | 7 +++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 6 +++--- recipes-kernel/linux/linux-torvalds-next_git.bb | 2 +- 7 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 conf/machine/include/radxa-zero-3.inc create mode 100644 conf/machine/radxa-zero-3w.conf diff --git a/README b/README index a9a040a4308d..909840de2c0d 100644 --- a/README +++ b/README @@ -41,6 +41,7 @@ Status of supported boards: rock-3a rock-4c-plus radxa-zero-3e + radxa-zero-3w builds: marsboard-rk3066 radxarock diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc new file mode 100644 index 000000000000..1cdcaa2214fa --- /dev/null +++ b/conf/machine/include/radxa-zero-3.inc @@ -0,0 +1,6 @@ +require conf/machine/include/rk3566.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig" diff --git a/conf/machine/include/rk3566.inc b/conf/machine/include/rk3566.inc index 586d68806df6..64d47c004a1f 100644 --- a/conf/machine/include/rk3566.inc +++ b/conf/machine/include/rk3566.inc @@ -5,6 +5,7 @@ DEFAULTTUNE ?= "cortexa55" ROCKCHIP_CLOSED_TPL ?= "1" require conf/machine/include/soc-family.inc +MACHINEOVERRIDES .= "${@bb.utils.contains_any('MACHINE', 'radxa-zero-3e radxa-zero-3w', ':radxa-zero-3', '', d)}" require conf/machine/include/rockchip-defaults.inc require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc require conf/machine/include/rockchip-wic.inc diff --git a/conf/machine/radxa-zero-3e.conf b/conf/machine/radxa-zero-3e.conf index 3a39d6c12a1f..37792cbf36a5 100644 --- a/conf/machine/radxa-zero-3e.conf +++ b/conf/machine/radxa-zero-3e.conf @@ -3,10 +3,5 @@ #@DESCRIPTION: The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. #http://radxa.com/products/zeros/zero3e/ -require conf/machine/include/rk3566.inc - -PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +require conf/machine/include/radxa-zero-3.inc KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3e.dtb" -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" - -UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig" diff --git a/conf/machine/radxa-zero-3w.conf b/conf/machine/radxa-zero-3w.conf new file mode 100644 index 000000000000..5193d45e1f69 --- /dev/null +++ b/conf/machine/radxa-zero-3w.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: Radxa Zero 3W +#@DESCRIPTION: The Radxa ZERO 3w is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. +#http://radxa.com/products/zeros/zero3w/ + +require conf/machine/include/radxa-zero-3.inc +KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3w.dtb" diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index e1ee17ef6905..de7024545841 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -2,9 +2,9 @@ require u-boot-rockchip.inc FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI:radxa-zero-3e = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo" -SRCREV:radxa-zero-3e = "8cdf606e616baa36751f3b4adcfaefc781126c8c" -SRCREV:radxa-zero-3e:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +SRC_URI:radxa-zero-3 = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo" +SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg" SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a" diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb index a932f5397771..9a95eb5bc4d8 100644 --- a/recipes-kernel/linux/linux-torvalds-next_git.bb +++ b/recipes-kernel/linux/linux-torvalds-next_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEFAULT_PREFERENCE = "-1" COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:radxa-zero-3e = "radxa-zero-3e" +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" LINUX_VERSION = "6.10-rc3" PV = "${LINUX_VERSION}+git${SRCPV}" From patchwork Thu Jun 13 17:01:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 45081 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D4CCC27C4F for ; Thu, 13 Jun 2024 17:02:15 +0000 (UTC) Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by mx.groups.io with SMTP id smtpd.web10.13882.1718298126481769251 for ; Thu, 13 Jun 2024 10:02:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MaKdhGla; spf=pass (domain: gmail.com, ip: 209.85.219.50, mailfrom: twoerner@gmail.com) Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-6b06e63d288so6740506d6.0 for ; Thu, 13 Jun 2024 10:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718298124; x=1718902924; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Kvlx2D3DQm8ZV/OB6MTcbYSdp+lt0RYf7jLGVmiWFsM=; b=MaKdhGlapDEDp7KF5S3kbON6d9/nZ7maBVMAP6dhu5Uc0OdlpZNJF7HK9E1mBCmxLH /kpl83GYG86dZK1dXlZZ3pBo4OpwtJPkoqf6US01mMwvc3eLxXg1nl/3SOgiSxaGbiy3 QLXBNglCwpnHW369F3f6r1t4BwvcqlOUEH7z6KxIyVnhBr3CcEm9A73TjGWWIuC5vCqJ HpI0s+aAdA/oxs7sM4cyJqE81TkAv03FYJyxaJWNg/t9Vj1MhN7ty0Swa0F5sw82kX2M yRwdeGY3Mq5GroZFg4fVXDHv69qLSf1xtFnx0sdGbam220eUKIlIeFLOOCL/SR3i732k KkYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718298124; x=1718902924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kvlx2D3DQm8ZV/OB6MTcbYSdp+lt0RYf7jLGVmiWFsM=; b=cdxzJ1iNNnoTih3WxiEQGDxhVXhCD5nHF+L39hvRgIDy8mDHY4lJKpV8RepdNRFXpZ F1MP3NXCc727j8+hUuBS511wnGqkQEIJ3Cir4L2o8UxtGInqHZknjj06j8XbLe+tobQI s1QhWa3dnLBeP0yJCKGzFUvr/8xT8rFY+P8ESxIPgqh/1mLRtCn/1ltDp6h7cT7p7CiA 4eFn5N9+LqsleXWlqegPom22PJIM1y87IemQD1fe0fb8QRLlEfbqfv68elAZAOnaiw7m y+CHpRpLafNlH//BbLF5qKxS8s8p9QnKaWYtdDC+qNF8ogsjCP/RR8ArAiGrnzdb0588 axkw== X-Gm-Message-State: AOJu0Yypjbh0SPz5N9/fqjXB+HljcnpbSIkJmg/jqG7rlBzI632Sq4On qK7uL7SFsbf4ynjy+MMUsH661uzAuXOwvwfWIc0DvtF/xDf/A+Nhhh1hwA== X-Google-Smtp-Source: AGHT+IE2lvK8YAdzMeWNYSHN/ofjOeRB/LzLmgs5wo4eNYKOqqqvj/P9uxBAVKD/o9tsiFPCJ1aa4g== X-Received: by 2002:a05:6214:4a41:b0:6b2:a364:b85b with SMTP id 6a1803df08f44-6b2afc8082fmr1592866d6.17.1718298124230; Thu, 13 Jun 2024 10:02:04 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b2a5c18209sm8588676d6.42.2024.06.13.10.02.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 10:02:02 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v3 4/4] README: sort MACHINE names Date: Thu, 13 Jun 2024 13:01:54 -0400 Message-ID: <20240613170154.6441-4-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240613170154.6441-1-twoerner@gmail.com> References: <20240613170154.6441-1-twoerner@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 13 Jun 2024 17:02:15 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/327 Previously the MACHINEs were listed in the order in which they were added to the layer. Going forward, separate the list into 32 vs 64 bit, sort each of those groups, while distinguishing between which boards support wic and which don't. Signed-off-by: Trevor Woerner Reviewed-by: Quentin Schulz --- v3 changes: - new --- README | 59 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/README b/README index 909840de2c0d..6003e7c652fe 100644 --- a/README +++ b/README @@ -18,34 +18,39 @@ Dependencies: Status of supported boards: -------------------------- builds and boots wic image: - nanopi-m4 - nanopi-m4-2gb - rock-pi-e - rock-pi-4a - rock-pi-4b - rock-pi-4c - rock64 - tinker-board - tinker-board-s - vyasa-rk3288 - firefly-rk3288 - nanopi-r4s - rock-5b - nanopi-r2s - nanopi-m4b - rock-pi-s - rock-5a - roc-rk3328-cc - roc-rk3308-cc - orangepi-5-plus - rock-3a - rock-4c-plus - radxa-zero-3e - radxa-zero-3w + 32-bit: + firefly-rk3288 + tinker-board + tinker-board-s + vyasa-rk3288 + + 64-bit: + nanopi-m4 + nanopi-m4-2gb + nanopi-m4b + nanopi-r2s + nanopi-r4s + orangepi-5-plus + radxa-zero-3e + radxa-zero-3w + roc-rk3308-cc + roc-rk3328-cc + rock-3a + rock-4c-plus + rock-5a + rock-5b + rock-pi-4a + rock-pi-4b + rock-pi-4c + rock-pi-e + rock-pi-s + rock64 + builds: - marsboard-rk3066 - radxarock - rock2-square + 32-bit: + marsboard-rk3066 + radxarock + rock2-square Notes: -----