From patchwork Fri Jun 13 10:23:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 64910 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 B7D12C71135 for ; Fri, 13 Jun 2025 10:24:20 +0000 (UTC) Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by mx.groups.io with SMTP id smtpd.web10.7228.1749810254796488879 for ; Fri, 13 Jun 2025 03:24:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Ffpaujth; spf=pass (domain: gmail.com, ip: 209.85.219.52, mailfrom: twoerner@gmail.com) Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6fadb9a0325so17189356d6.2 for ; Fri, 13 Jun 2025 03:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749810253; x=1750415053; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=OVEqjnWbfeR1PRkoTmcEKeVqEEKxH/jC6CA5CHsl7A4=; b=FfpaujthqIUooR3MPPYyDDeWkceAjqPELZdb5uaVJQIhwPspW/0mkYAd555xrOhnVz 4sYgSIDzxykmQw2QIm639YoncuJ7/EDn6G5LhAJd981ZgXUqSOHnk3t3lo96BjNxQ3NY 92vARpfvwTEdlRncxN2wQi2VltqKVLZNGyecXKFUG9C0/+eQJPg7xwY4eUQJUPBX5+mh JnT/i7KfX63cJsPtmkYC7hVzveVqRmrbIKbAVxjUSTA99nyxYI//YeXAVQMLaTZu0w/t R15Jf7NtdrJ9pYLFCe25IE22yXZdqysF+0O4rESVpkt9AwUgs6xMQIG8A89nT/WnsbuM oLhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749810253; x=1750415053; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OVEqjnWbfeR1PRkoTmcEKeVqEEKxH/jC6CA5CHsl7A4=; b=SxqTt0RJTFkfuTcbLzSpstqHk4hRGV75EansB9YLvdt2E9eoG8a1vkVyBUlxiQLRTh jWL0ba04k+IqdBmmLoxaX2TaGJYgR9soaObysSDSiZ+K7/2E6rsiF4o/2GXyXj8dttWK JRwQIc6DbW/7lw3Spdl/lvIBDt/4P8gS3BjbjirmFy/Mdzrh6NVVoTixgWO7CL/zp/SM erai09d5nfm7/xqW1DeO4CV11qBkzoyOsYnPiWn0ItF+xxxn7u4FpqAzCJP9CSV7f85B fPYPDjbckmdmoi2uHPSvdYiLMjXpwPr89egMj09LguxyO/9lEVxMSqlfkh4MP/YuOhg1 Nf9Q== X-Gm-Message-State: AOJu0Yy8AJY46W5JkXorvsDqTxz8VC5Z5sR1KQi4DoD9MhpGQ+SsVwpY Sfkj8DMr3p5SbpuFWFQThP2qnRzWFbJlsTi/h8MmxV1i6m0v6DjtjpA/QnqWtpas X-Gm-Gg: ASbGncuCQEczbyr0RIJOeBP/jLFxBTUoduSMn2PeduaEMp5Qa4q7vK3SB+lAV4R3uG6 b1YxJ3zIzH8csbhx6xMkktW8B4cEWTuQWRICGkNsvU6o6Qow+0BOlODUPbfJYjKificVyKRtl1O H82khk52b9rnBejab5Ds33YpZCyMVDGPR5xQS4yVS944I4KwBdHvKI7iWx7jMFVGHJsSkDUytMU 9Iiqobo5qrE0XibIJVjVySL1RuTBiB95tV18c55VAjU7e7yx3e0Ds4ImzUrfJhV4dBUVu4EAEpB c2oUkDqjlyTUXhQ5NrQrqteSrTV319VNc+97Jz3Fxm+mS76L0swhGOPNI8pCW/82c/hwXqlIpr3 hGf7T+fJJTjEPeFklsiKHmNX7Z6LQsA== X-Google-Smtp-Source: AGHT+IHT+Zkm/jhNgwbKJYqSLJOYXjyO05XLmhmpyAKDveuezQFx6doNBk5bf2E8ogyQ1+khD9cCLA== X-Received: by 2002:a05:622a:4c88:b0:4a5:9b9c:2d9f with SMTP id d75a77b69052e-4a72fe80f5bmr50511491cf.2.1749810241999; Fri, 13 Jun 2025 03:24: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 d75a77b69052e-4a72a2c068esm15502631cf.1.2025.06.13.03.24.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 03:24:01 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH 1/2] trusted-firmware-a: remove no-longer-required patches Date: Fri, 13 Jun 2025 06:23:56 -0400 Message-ID: <20250613102357.1539-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 ; Fri, 13 Jun 2025 10:24:20 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1638 The two patches being carried in this layer for tf-a are no longer required and can be dropped. Signed-off-by: Trevor Woerner Reviewed-by: Quentin Schulz --- .../0001-dram-Fix-build-with-gcc-11.patch | 35 ------------------- ...rk-already-defined-functions-as-weak.patch | 35 ------------------- .../trusted-firmware-a_%.bbappend | 7 ---- 3 files changed, 77 deletions(-) delete mode 100644 recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch delete mode 100644 recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch diff --git a/recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch b/recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch deleted file mode 100644 index 120ea0bd3635..000000000000 --- a/recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a09a1de53aba422249a8376b0d95024200021317 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 11 May 2021 11:55:31 -0700 -Subject: [PATCH] dram: Fix build with gcc 11 - -This is a redundant assignment which GCC warns about. - -Fixes - -plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c:781:11: error: explicitly assigning value of variable of type 'uint32_t' (aka 'unsigned int') to itself [-Werror,-Wself-assign] - twr_tmp = twr_tmp; - ~~~~~~~ ^ ~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c -index 3cdb7a296..76bc5ee96 100644 ---- a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c -+++ b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c -@@ -778,7 +778,7 @@ static void lpddr3_get_parameter(struct timing_related_config *timing_config, - else if (twr_tmp <= 8) - twr_tmp = 8; - else if (twr_tmp <= 12) -- twr_tmp = twr_tmp; -+ ; /* do nothing */ - else if (twr_tmp <= 14) - twr_tmp = 14; - else --- -2.31.1 - diff --git a/recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch b/recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch deleted file mode 100644 index bd4d2b594e44..000000000000 --- a/recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9d963cd69faf94bdcb80624132fd10392f57875b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 11 May 2021 12:11:51 -0700 -Subject: [PATCH] pmu: Do not mark already defined functions as weak - -These functions are already defined as static functions in same header -Fixes - -| plat/rockchip/common/drivers/pmu/pmu_com.h:35:14: error: weak identifier 'pmu_power_domain_ctr' never declared [-Werror] | #pragma weak pmu_power_domain_ctr | ^ -| plat/rockchip/common/drivers/pmu/pmu_com.h:36:14: error: weak identifier 'check_cpu_wfie' never declared [-Werror] -| #pragma weak check_cpu_wfie -| ^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - plat/rockchip/common/drivers/pmu/pmu_com.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/plat/rockchip/common/drivers/pmu/pmu_com.h b/plat/rockchip/common/drivers/pmu/pmu_com.h -index 5359f73b4..3f9ce7df9 100644 ---- a/plat/rockchip/common/drivers/pmu/pmu_com.h -+++ b/plat/rockchip/common/drivers/pmu/pmu_com.h -@@ -32,8 +32,6 @@ enum pmu_pd_state { - }; - - #pragma weak plat_ic_get_pending_interrupt_id --#pragma weak pmu_power_domain_ctr --#pragma weak check_cpu_wfie - - static inline uint32_t pmu_power_domain_st(uint32_t pd) - { --- -2.31.1 - diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index f2b666c127ae..4c7fc3c4c180 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -9,13 +9,6 @@ COMPATIBLE_MACHINE:append:rk3566 = "|rk3566" COMPATIBLE_MACHINE:append:rk3568 = "|rk3568" COMPATIBLE_MACHINE:append:rk3588s = "|rk3588s" -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI += "\ - file://0001-dram-Fix-build-with-gcc-11.patch \ - file://0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch \ -" - - # code bloats with clang and results in error below now # | aarch64-yoe-linux-musl-ld: region `PMUSRAM' overflowed by 3928 bytes # this needs fixing until then use gcc From patchwork Fri Jun 13 10:23:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 64909 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 CFF96C71135 for ; Fri, 13 Jun 2025 10:24:10 +0000 (UTC) Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by mx.groups.io with SMTP id smtpd.web10.7226.1749810245166434750 for ; Fri, 13 Jun 2025 03:24:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bvFWdRc+; spf=pass (domain: gmail.com, ip: 209.85.160.181, mailfrom: twoerner@gmail.com) Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-4a6f6d52af7so21471001cf.1 for ; Fri, 13 Jun 2025 03:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749810243; x=1750415043; 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=RHITbBw0W+/l5I4U3ygU/ldhMq3mm/H1vFX2SWgxYJQ=; b=bvFWdRc+JoEwhWHi2sfwIW+yAouGzpgmNOW98Uyc/6+0eCJtkpQy8upv1iTD8dvaLx lX4TshbuDf8Fd51az/XJQcU+0kKmeb2UnM5rTFvv2gMxSMNfsgfvUdZtRRZHZNvnLh0w SAjB1e4cm3u2SC0q6rGWyiXiVnco/UWGs4ABhCljs/4UgQftpD1jr4ahQBLZvxdwfudU dbYpRxEBrda7h63SE29o77n6RB55M6GkutV5jnOm8OifYVQSiVVA49xi/r83EWQ2fhCZ ZiNJJAbinuMHWCEQsC8I9JjuobzOMQDh74/ymKEM6lYnS3BbbawtIZbSXx/5vbPXQ6qh 7wtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749810243; x=1750415043; 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=RHITbBw0W+/l5I4U3ygU/ldhMq3mm/H1vFX2SWgxYJQ=; b=DPFL5kC+4Sl2qSVO6YV259qDjxkeLs+m/UW+xiuaTc1k7aOQJDhh3QNG8C4n145Iqe joDW72IuHenDVfalqlPEESQW/o6A6kPLXNjD2gt8XWAAXMQwN+LAnxBOOJ92Oeio191Z ja79Ah/JBDW9gnFWInnuX0g5kA0iPK5OIcmLI8l7St/3/d3zzaiXFJd1Mpp7Z8EKAjPQ 69MmJIHZJ+Vwq+QwlwxrQzg6JP5vXJW8KBUxMhHbH/SM17tRsTsEXvPpImuh/BfFh2L0 naSkxNVDLFuz61MN//eksppp7mykb5/MCdacgCgNihfsQnXpKYVgXufayoKIiOuU7FtH 9E5g== X-Gm-Message-State: AOJu0YynOEvHbv3w+LYdhn9O1S1P+oSFRbEj4DkiTDhDOhXW8UhYWD4i LLRja/IVRxh7ECr65I9x+/tLsZ9pbMxhSiesfbeglLDMcuw8yX7EqdUYj/b6qdoz X-Gm-Gg: ASbGnctSHiw5dq/7Ez3DCji8YGKCCpR3duqHi3a5niKISki5kAaRsMCb8ThwhzO7/K3 mrPVViWzPUJa7tkPI7fNLbmmCCADsKmJpihej30ZT5cGOLOcu/VC58mTGMi+RtKqSCIMOY8VNDP q2+8xOTszbyAS1jZGyw7m5Php9Uwf5ykynIBni57sNd7zf0Wko7HWEF2TWsiLl2itxlB8vKVlHO E873NmkU7kaIcuWPZyx2GnmB3/Riqh70Ia5m3UKgS7Lt+4KPZTapHmQbe7vZET5ML6TQPDuRAkJ OsMJMtVK8OTevte1Awkx6zhs/vDBrTpZwws88PXGEELnd7z6wAhcLnbfk9369PwbuNCebwSCrFR 5aaEAbbscCfh3ANwzyAIcVl2otpXEBFm2XIOC2hU8 X-Google-Smtp-Source: AGHT+IESSX8qsS4P9jIAXAUQDuFW348XNaY+DqxOIggI3HbODDf8rDP2lbXFuYeB++RC1Bq/SYo8GA== X-Received: by 2002:a05:622a:40c6:b0:4a6:f5a8:3832 with SMTP id d75a77b69052e-4a72ff16c48mr37765921cf.42.1749810243194; Fri, 13 Jun 2025 03:24:03 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4a72a2c068esm15502631cf.1.2025.06.13.03.24.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 03:24:02 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH 2/2] fitimage rework Date: Fri, 13 Jun 2025 06:23:57 -0400 Message-ID: <20250613102357.1539-2-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20250613102357.1539-1-twoerner@gmail.com> References: <20250613102357.1539-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 ; Fri, 13 Jun 2025 10:24:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1637 oe-core has completely re-written the fitImage support starting roughly at commit [1], update meta-rockchip to match. Most of the MACHINEs in meta-rockchip use a fitImage, but some don't. Create a boolean variable (RK_FITIMAGE), enabled by default, to keep track of which ones do and which ones don't. Use this variable to decide how to configure various image-related fields. Run tested on the following with RAUC configured: - nanopi-m4b - nanopi-r2s - radxa-zero-3e - rock-pi-4b - rock-pi-e - rock-pi-s Run tested on the following without RAUC: - radxa-zero-3e - rock-pi-e - rock-pi-s [1] oe-core: 3442d9297dca ("oe-selftest: fitimage: test external dtb") Signed-off-by: Trevor Woerner --- conf/machine/include/px30.inc | 3 +-- conf/machine/include/rk3066.inc | 1 + conf/machine/include/rk3188.inc | 1 + conf/machine/include/rk3288.inc | 1 + conf/machine/include/rk3308.inc | 3 +-- conf/machine/include/rk3328.inc | 3 +-- conf/machine/include/rk3399.inc | 3 +-- conf/machine/include/rk3566.inc | 3 +-- conf/machine/include/rk3568.inc | 3 +-- conf/machine/include/rk3588s.inc | 3 +-- conf/machine/include/rockchip-defaults.inc | 2 ++ conf/machine/include/rockchip-extlinux.inc | 8 ++++---- conf/machine/include/rockchip-fitimage.inc | 4 ++++ 13 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 conf/machine/include/rockchip-fitimage.inc diff --git a/conf/machine/include/px30.inc b/conf/machine/include/px30.inc index 8173cb19be2c..825c1fae76d7 100644 --- a/conf/machine/include/px30.inc +++ b/conf/machine/include/px30.inc @@ -11,8 +11,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc TFA_PLATFORM = "px30" TFA_BUILD_TARGET = "bl31" diff --git a/conf/machine/include/rk3066.inc b/conf/machine/include/rk3066.inc index a898309bbf88..dc0c7734812c 100644 --- a/conf/machine/include/rk3066.inc +++ b/conf/machine/include/rk3066.inc @@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyS2" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3066 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage" diff --git a/conf/machine/include/rk3188.inc b/conf/machine/include/rk3188.inc index 554d4f1c904d..3e1fc7e70822 100644 --- a/conf/machine/include/rk3188.inc +++ b/conf/machine/include/rk3188.inc @@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyFIQ0" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3188 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage" diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index 06fda69a3eb7..5cc117e633fc 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa17.inc SERIAL_CONSOLES = "115200;ttyS2" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG ?= "multi_v7_defconfig" KERNEL_FEATURES:append:rk3288 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage" diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc index d30901f15b4f..ce1cebee1aac 100644 --- a/conf/machine/include/rk3308.inc +++ b/conf/machine/include/rk3308.inc @@ -13,8 +13,7 @@ SERIAL_CONSOLES = "1500000;ttyS0" KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3308 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc index e6f810dcd2ca..4924b06f030a 100644 --- a/conf/machine/include/rk3328.inc +++ b/conf/machine/include/rk3328.inc @@ -12,8 +12,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3328 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc TFA_PLATFORM = "rk3328" TFA_BUILD_TARGET = "bl31" diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index cd1be49064ed..eb23f49370fc 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -12,8 +12,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3399 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc TFA_PLATFORM = "rk3399" TFA_BUILD_TARGET = "bl31" diff --git a/conf/machine/include/rk3566.inc b/conf/machine/include/rk3566.inc index 6386ec7eb51c..c9647a66aa42 100644 --- a/conf/machine/include/rk3566.inc +++ b/conf/machine/include/rk3566.inc @@ -11,8 +11,7 @@ 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" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os" diff --git a/conf/machine/include/rk3568.inc b/conf/machine/include/rk3568.inc index bcf9dd8b0f44..e89aa388951a 100644 --- a/conf/machine/include/rk3568.inc +++ b/conf/machine/include/rk3568.inc @@ -11,8 +11,7 @@ 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" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os" diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc index 6ec344abae5b..265244753b5a 100644 --- a/conf/machine/include/rk3588s.inc +++ b/conf/machine/include/rk3588s.inc @@ -10,8 +10,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3588s = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os" diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index 85ec7b944d1d..3835408ed8d2 100644 --- a/conf/machine/include/rockchip-defaults.inc +++ b/conf/machine/include/rockchip-defaults.inc @@ -1,7 +1,9 @@ # meta-rockchip default settings MACHINEOVERRIDES =. "${@bb.utils.contains('ROCKCHIP_CLOSED_TPL', '1', 'closed-tpl:', '', d)}" MACHINEOVERRIDES =. "rockchip:" + # kernel +RK_FITIMAGE ?= "True" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KCONFIG_MODE ?= "alldefconfig" diff --git a/conf/machine/include/rockchip-extlinux.inc b/conf/machine/include/rockchip-extlinux.inc index fddab735bbf7..95a38d4dad0c 100644 --- a/conf/machine/include/rockchip-extlinux.inc +++ b/conf/machine/include/rockchip-extlinux.inc @@ -13,13 +13,13 @@ NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split()[0].split('/')[1]}" UBOOT_EXTLINUX ?= "1" UBOOT_EXTLINUX_ROOT ?= "root=PARTLABEL=rootfsA" -UBOOT_EXTLINUX_FDTDIR ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot', d)}" -UBOOT_EXTLINUX_FDT ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot/${NONFITDT}', d)}" +UBOOT_EXTLINUX_FDTDIR ?= "${@ '' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '/boot'}" +UBOOT_EXTLINUX_FDT ?= "${@ '' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '/boot/${NONFITDT}'}" UBOOT_EXTLINUX_CONSOLE ?= "earlycon console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8" UBOOT_EXTLINUX_KERNEL_ARGS ?= "rootwait rw rootfstype=ext4" -UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${KERNEL_IMAGETYPE}" +UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${@ 'fitImage' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '${KERNEL_IMAGETYPE}'}" UBOOT_EXTLINUX_LABELS ?= "default" UBOOT_EXTLINUX_MENU_DESCRIPTION:default ?= "${MACHINE}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-extlinux" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', 'kernel-devicetree', d)}" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${@ 'linux-yocto-fitimage' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else 'kernel-devicetree'}" diff --git a/conf/machine/include/rockchip-fitimage.inc b/conf/machine/include/rockchip-fitimage.inc new file mode 100644 index 000000000000..e275faf70349 --- /dev/null +++ b/conf/machine/include/rockchip-fitimage.inc @@ -0,0 +1,4 @@ +KERNEL_CLASSES += "kernel-fit-extra-artifacts" +KERNEL_IMAGETYPE = "Image" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" +KERNEL_DEPLOY_DEPEND = "linux-yocto-fitimage:do_deploy"