From mboxrd@z Thu Jan 1 00:00:00 1970 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 AF932C25B47 for ; Wed, 25 Oct 2023 13:56:28 +0000 (UTC) Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by mx.groups.io with SMTP id smtpd.web11.44245.1698242180905965245 for ; Wed, 25 Oct 2023 06:56:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bOoz31cR; spf=pass (domain: gmail.com, ip: 209.85.160.171, mailfrom: twoerner@gmail.com) Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-41cc7379b23so35038941cf.3 for ; Wed, 25 Oct 2023 06:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698242180; x=1698846980; darn=lists.yoctoproject.org; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=IRbFFpatRthfPkqbOX94puU6SXVK2LKH7tnHjmPCxJw=; b=bOoz31cRAw97KtM/VfsJWpNpS2kBXkfx2HvaTeDDfj9y2k+uh1pd39BYmwWO/QKZmG dtBlymnunkQwyc7SUsTI+/X85RCNJSFPv2S8jlKFzTWz2o4xuvgLWs2Qbco1xkdi/0qm THNGr2nnltXpyBUXH1Wt1KuStzjkSGoC+8ejG3hmWZZQdxmitszqsjjmyN1p+k1gpzUZ pyWS/M8EGAaJePZKGwI+gFIWcPwRIyfvkHBT6jdbobm9w63AhKKQSUhMLEEvoJK5Ccg3 4FTKWydgqCx5vzSbbaAgZB6aRdUORTV/mykbR/ZBHjNzeprAjGjkQ6AfvMLAaFji4THU Ys1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698242180; x=1698846980; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IRbFFpatRthfPkqbOX94puU6SXVK2LKH7tnHjmPCxJw=; b=DNjXCLUXkZf4cjlmTq6gxthTMSmF7g6cOOE7xkihd+fdpXPrfxHZnbxkrpJeAPjFP4 +m7FaNRS2boH90uUZycQuG2TGGJFBa9yHbvhWjQDDCdKwoyfbdjTApRw4psFiF32Ahzy xSPu6l/jpesffsTHbDY46C9fRXmJEWD363fEuSBt3c2DDkgZ3xwQdwpQqhp6374TUegn 324RPgL5RLLjfwRp5KWso90uVJqsLTTvZSke9nLBjAAdF+WTSMDzP7J/G9/C3zxsEav4 3C948MpqsVw3qsySFAJperFsM3Zv4ouhGNu3+FnCB4NjDWQQXhFXyKWPZN0e7G5ExU05 weqw== X-Gm-Message-State: AOJu0YxxoN5KeSj66tuRhW56upMsdrqyMJPMBStXHIUWVPZ6FG7L9yVM XAEAG8a3dbPnJjVZdOFauBQ= X-Google-Smtp-Source: AGHT+IF7lJRqZZI7ahAY3P4zR/PzbEfi3ziM59Lqy672s4AmnH6xTTg/SDNRAE6d2HaSs3KXO04Osw== X-Received: by 2002:a05:622a:216:b0:41c:c6a6:338f with SMTP id b22-20020a05622a021600b0041cc6a6338fmr19461014qtx.53.1698242179874; Wed, 25 Oct 2023 06:56:19 -0700 (PDT) Received: from localhost (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id k25-20020ac84799000000b0041abcc69050sm4209829qtq.95.2023.10.25.06.56.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 06:56:19 -0700 (PDT) Date: Wed, 25 Oct 2023 09:56:16 -0400 From: Trevor Woerner To: anthony.t.davies@gmail.com Cc: yocto@lists.yoctoproject.org Subject: Re: [meta-rockchip] [PATCH v3] rock-3a add Message-ID: <20231025135616.GA9837@localhost> References: <20231016104344.401706-1-anthony.t.davies@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20231016104344.401706-1-anthony.t.davies@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) 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 ; Wed, 25 Oct 2023 13:56:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61481 Hi Anthony, Thanks for working on this. On Mon 2023-10-16 @ 09:43:45 PM, anthony.t.davies@gmail.com wrote: > From: Anthony Davies > > Add support for the Radxa Rock 3A > https://wiki.radxa.com/Rock3/3a > > The TF-A project does not currently have support for > the rk3568. Therefore, for the time-being, the only way to supply a > TPL/DDR-init for the rk3568 is to use the closed-source rkbin binaries > from Rockchip. If/when TF-A adds support for the rk3588 we can investigate > switching. > > recipes-bsp/rkbin/rockchip-rkbin_git.bb was modified to allow a machine > override to allow both rk3568 and rk3588s to use differnet binary blobs > > Signed-off-by: Anthony Davies > --- > README | 1 + > conf/machine/include/rk3568.inc | 17 +++++++++++++++++ > conf/machine/rock-3a.conf | 12 ++++++++++++ > recipes-bsp/rkbin/rockchip-rkbin_git.bb | 16 +++++++++++++++- > recipes-bsp/u-boot/u-boot%.bbappend | 5 +++++ > 5 files changed, 50 insertions(+), 1 deletion(-) > create mode 100644 conf/machine/include/rk3568.inc > create mode 100644 conf/machine/rock-3a.conf > > diff --git a/README b/README > index 8104474..3357b47 100644 > --- a/README > +++ b/README > @@ -32,6 +32,7 @@ Status of supported boards: > nanopi-r4s > rock-5b > nanopi-r2s > + rock-3a There's still an issue with indents/tabs. > builds: > marsboard-rk3066 > radxarock > diff --git a/conf/machine/include/rk3568.inc b/conf/machine/include/rk3568.inc > new file mode 100644 > index 0000000..5382b58 > --- /dev/null > +++ b/conf/machine/include/rk3568.inc > @@ -0,0 +1,17 @@ > +MACHINEOVERRIDES =. "rk3568:" > +DEFAULTTUNE ?= "cortexa55" > + > +require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc > +require conf/machine/include/rockchip-defaults.inc > +require conf/machine/include/rockchip-wic.inc > + > +KBUILD_DEFCONFIG ?= "defconfig" > +KERNEL_FEATURES:append:rk3568 = " 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/rock-3a.conf b/conf/machine/rock-3a.conf > new file mode 100644 > index 0000000..2ed83a3 > --- /dev/null > +++ b/conf/machine/rock-3a.conf > @@ -0,0 +1,12 @@ > +#@TYPE: Machine > +#@NAME: Radxa Rock 3a > +#@DESCRIPTION: ROCK3 is a series of Rockchip RK3566/RK3568 based > +#SBC(Single Board Computer) and Compute Module by Radxa. > +#https://wiki.radxa.com/Rock3 > + > +require conf/machine/include/rk3568.inc > + > +KERNEL_DEVICETREE = "rockchip/rk3568-rock-3a.dtb" > +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" > + > +UBOOT_MACHINE = "rock-3a-rk3568_defconfig" > diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb > index 7fefb01..ad5593c 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:rk3588s = "rk3588s" > +COMPATIBLE_MACHINE:rk3568 = "rk3568" > > PACKAGE_ARCH = "${MACHINE_ARCH}" > > @@ -25,7 +26,16 @@ do_install() { > PACKAGES = "${PN}" > ALLOW_EMPTY:${PN} = "1" > > -do_deploy() { > +do_deploy:rk3568() { > + # Prebuilt TF-A > + install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3568.elf > + # 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 > +} > + > +do_deploy:rk3588s() { > # Prebuilt TF-A > install -m 644 ${S}/bin/rk35/rk3588_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3588.elf > # Prebuilt OPTEE-OS > @@ -34,4 +44,8 @@ do_deploy() { > install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v*.bin ${DEPLOYDIR}/ddr-rk3588.bin > } > > +do_deploy() { > + bbfatal "COMPATIBLE_MACHINE requires a corressponding do_deploy:() override" > +} > + This is not related to adding support for rock3a. > addtask deploy after do_install > diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot%.bbappend > index e79c471..66c81da 100644 > --- a/recipes-bsp/u-boot/u-boot%.bbappend > +++ b/recipes-bsp/u-boot/u-boot%.bbappend > @@ -9,12 +9,17 @@ EXTRA_OEMAKE:append:rk3588s = " \ > BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \ > ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \ > " > +EXTRA_OEMAKE:append:rk3568 = " \ > + BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3568.elf \ > + ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3568.bin \ > + " > > INIT_FIRMWARE_DEPENDS ??= "" > INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy" > INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" > INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" > INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy" > +INIT_FIRMWARE_DEPENDS:rk3568 = " rockchip-rkbin:do_deploy" > do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}" > > do_compile:append:rock2-square () { > -- > 2.34.1 >