From patchwork Fri Dec 13 15:48:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 54057 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 DD98FE77180 for ; Fri, 13 Dec 2024 15:48:53 +0000 (UTC) Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by mx.groups.io with SMTP id smtpd.web10.18939.1734104930674088544 for ; Fri, 13 Dec 2024 07:48:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HVeO1DKA; spf=pass (domain: gmail.com, ip: 209.85.219.42, mailfrom: twoerner@gmail.com) Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-6d8fd060e27so16065606d6.1 for ; Fri, 13 Dec 2024 07:48:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734104929; x=1734709729; 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=M9pBAST7trGuS2Nhmr6GqO4ruk4zFs+Km4T/f2C0koA=; b=HVeO1DKAKY9b4RhX+M9e4+2+wFHHBLW0XUD01mLZLEamA/NWanq/2bAsbSWQgHBtIY wNNmlImBlVVKYt6+EnxvH6HNR4KTSvqODcHfQrPm1g4DhLfs5W+2xirP0n6coHFr2ZOD 1sGYym4Ib6uWOFeEPEgz6D2WMgwqqcik3RX0NwS+eKxvtj159DLBDOY92yHG+1OudfW7 U1etLozf3kIDaU7uZErB+zX3Nbk+rIzJic8kvwR81FmmIFcEzLZIB98NYnBo3MYL6Q7A xLnNeJIyNdiBzIJN87jTYXMXoAwxbZBG5UMprRFlNnqnwE4hsftFPn3YfcVXdqCZNTrQ BjDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734104929; x=1734709729; 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=M9pBAST7trGuS2Nhmr6GqO4ruk4zFs+Km4T/f2C0koA=; b=jSZsyU7GzkbxkZDnAmXubkMrY4LS/gxWF6YaIYgk4w9UFo70ETyalzC+Aea20ay9iV Uiv0aOb2ONS+izTTd7IJw3yZuS/NZtAGhwBaxgJmQZjPHLm41YMdSQhKkZwoZpOyI/mH knQS+eEWVk+cLuTl08ULxe30kbq/Rm2P5b5A/euixJIBiKVudniaiLCy+4IaVWUHDxUl 7ouaFgxz/LP5ZDpx7qu5Q+eFTy9XDJT6VnCc1t2m98tZC/wMSI6HWmnU4fgU1+W60IVK czePryYrQ2vwDnFEbqvBdjJMh1AqNFX92js+NJhszmuSS3IbWAQCs/7TZw1YYyejMXQl ihLg== X-Gm-Message-State: AOJu0Yyh/bM8vNOZzEA+yApqf0whgwHSmqUHExW91gE/WnuxqWEZu4IQ BisQwDXRoTcRyu0Yuq/b1fmDkuhcf1rbMmjvJX8+EpZBmixfTPlaC6e3eg== X-Gm-Gg: ASbGncvPHeRF3maC84EOylc++jOpGfF2Qcyk84b85e63wyNbi96zhYWjpdIcEUzsLPt yQEcEDsI+kv8qgb/xj2N7wJ4b9tU9nQeYw6ISqL0Mr/ek3+OGD4n1lqZImG1Wux7UWgtzlX3lFO otfvyigoqcLwqEhUBTqtVWDK+bHdAgK2Pakt6JwwCcd2FvVVPUO79hiwowOaOBNjVWc1hXYCtIs mH4+IOAbaMZCssDEOWzobgvYbvLsLMNLREYUmeLbQDjiG8QghB6RTVCAXtw5HPJl7jN5i8nhg5F 3ruZKLSUGGde0fdyz947F+7V X-Google-Smtp-Source: AGHT+IElmiaFeM9Am6Vrq+YNrgTTuQKGQfPzTiuq4RHB14+h0E7GoOrGR2tVvbwfYZWJalgvW9Bczw== X-Received: by 2002:a05:6214:dc2:b0:6d8:f611:3af0 with SMTP id 6a1803df08f44-6dc968722afmr52233346d6.48.1734104929046; Fri, 13 Dec 2024 07:48:49 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da6b2291sm92221816d6.58.2024.12.13.07.48.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2024 07:48:48 -0800 (PST) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 1/4] u-boot: switch to upstream SRCREV for rk-u-boot-env Date: Fri, 13 Dec 2024 10:48:40 -0500 Message-ID: <20241213154843.27592-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 Dec 2024 15:48:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/899 When the rk-u-boot-env feature was implemented, in order for it to work the build needed a version of U-Boot that was slightly newer than 2024.04 (the current release supported by Yocto at that time). Now that 2024.10 is out, remove the SRCREV pin since the necessary code is now part of this release. Signed-off-by: Trevor Woerner --- changes from v1: - add [meta-rockchip] to subject --- recipes-bsp/u-boot/u-boot_%.bbappend | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index de7024545841..06ba6d54de8e 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -7,7 +7,6 @@ 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" DEPENDS:append:rk3308 = " u-boot-tools-native" DEPENDS:append:rock-pi-4 = " gnutls-native" From patchwork Fri Dec 13 15:48:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 54058 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 DCBBEE7717D for ; Fri, 13 Dec 2024 15:48:53 +0000 (UTC) Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) by mx.groups.io with SMTP id smtpd.web10.18941.1734104933109901902 for ; Fri, 13 Dec 2024 07:48:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=idYnONFT; spf=pass (domain: gmail.com, ip: 209.85.219.41, mailfrom: twoerner@gmail.com) Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6d888c38841so15260796d6.3 for ; Fri, 13 Dec 2024 07:48:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734104931; x=1734709731; 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=gpB0FaIvfgCK44sV2ZVkZJ5vNigqy6RiqTuT1aA+IE0=; b=idYnONFTqC3Ap9j8M+ubJuhVzbdofBaw7z0O16lV9k75WRDZFgueUdARUMNnvcsfHF zKN4MAJX7F2RTSXw+NDnk2qZrAPioGJSnTkCzgaRxVSt+aVNkkX5a8jzVazXJM7wqP3w Io/oIWrvGDRGA6LkW9zLVp5zE6udgEIKg1Kr7vUALi+YI1J83qHqWcVpSlsI7LFXOoB2 u6zh3BCAWz4G4Vrjmk9ScG4KzqM+yAHgyTBvoLckubKYUsKGPgvVzskt9Sj+CYqM67E2 mMgLxpTlxWB5o0MoFNuTfUbfakr15SArrPznfPx0z9tgVd0xUjGok8mwhb3YPJX4gPDb sXJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734104931; x=1734709731; 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=gpB0FaIvfgCK44sV2ZVkZJ5vNigqy6RiqTuT1aA+IE0=; b=hB1MV4d8iwZvpQj7wQSu0kmxe2fMsYdcYRgpegXQy7mJL/Ld3dPiVO51wyfS18zxMr wpMZZCc1IXkRpvTl+lpmx3NKtpvBgnPWh299m/88EeTaNtM6426Rtk0sSDphmgwmbWQb 5wcrdTQGQMCFiSe1C1h0Vh3wK08Gh4x+s1jfO2BlGTh2qGfMXUU0Lcl3TMCA51IB7n0Y gCa9sb8BgEL3a2Oi4IZV0v0ELQOwtAgKD+9zZhYtvv2s9JLY6CgQi9x8Q3X8bv/OXC0G j5BWKOTl9Ycb2KOtrghiaZ56UmF2GAzFpRk/1ZQ/XN3ONqMsHuOiM1Ehlz5X9jyROh/H SaTQ== X-Gm-Message-State: AOJu0YyLK/HGOxrWlUn3zPU8S89bC8ZdvkxiNg1aQwzlC/r2OcwipBVV EgCqbzsnrZQZopuFBwjzVqzdiuBWoJjbfEDtJZPWF/RJNe+AJyJ8yOxvLQ== X-Gm-Gg: ASbGncuNloLC4wb74qZWClKm4RYhIxolELjVlw045lUX5z0AnP+LRvv2N56cFhEjVG/ UiRPYqXRb8FPZmhcbVrRD2fjllKz/TLvX0nZTqdmJrGM9XEk7Ppt+/abHMl8iOULoDfAlTlLcfO 0DMOGZWRt+SA/Q3boARiUplUdWCPRDLtvUqGlZn+emRUQDLJ/qpNRp/ExCPmyDnvij8jabnq193 6YQz2uyaPnjYtuhvpHeyb1rUN3Yp8UfF+pOiOIwm1AvJG+btJueLswyoJv7Hf/6QgQWJiweL5Sy G78splVlltvGSfiB5kfdjVxc X-Google-Smtp-Source: AGHT+IFM8bz68c+3hG/T6bPY+e3Dd6qwGPS05iNpFGT+g9uCkKRGC4Vp1BbdWiAeN3tCZ9Iop8w16g== X-Received: by 2002:ad4:5d47:0:b0:6d8:a1fe:72a2 with SMTP id 6a1803df08f44-6dc96878ab1mr63236966d6.44.1734104930847; Fri, 13 Dec 2024 07:48:50 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da6b2291sm92221816d6.58.2024.12.13.07.48.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2024 07:48:49 -0800 (PST) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 2/4] u-boot: use upstream for radxa-zero-3{e|w} Date: Fri, 13 Dec 2024 10:48:41 -0500 Message-ID: <20241213154843.27592-2-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20241213154843.27592-1-twoerner@gmail.com> References: <20241213154843.27592-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 Dec 2024 15:48:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/900 Upstream U-Boot 2024.10 (the latest release supported by Yocto) has support for radxa-zero-3{e|w}. Therefore switch away from the fork where the initial U-Boot development for this board had been added. Signed-off-by: Trevor Woerner --- changes from v1: - add [meta-rockchip] to subject --- recipes-bsp/u-boot/u-boot_%.bbappend | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 06ba6d54de8e..08e1730b5d3d 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -2,10 +2,6 @@ require u-boot-rockchip.inc FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -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" DEPENDS:append:rk3308 = " u-boot-tools-native" From patchwork Fri Dec 13 15:48:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 54060 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 C1C9AE77180 for ; Fri, 13 Dec 2024 15:49:03 +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.web11.18723.1734104933681320785 for ; Fri, 13 Dec 2024 07:48:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=H90Tclrd; 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-6d8edad9932so14653956d6.0 for ; Fri, 13 Dec 2024 07:48:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734104932; x=1734709732; 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=HwvYj2HKbQGiAy/x/+qfqDk3B83EnRWwraGSS4aPBp0=; b=H90TclrdBYvqsDjn/3DW0xJiIlN7fPIY8OHFyyyzOy39iwK5a6C+BU/H3p3LHVje0w mZC5aviBSSgfAXFD4QQPA8ZbYI4yPXXOBeBCL/mJsQ4BuEuKNvpcYBpGkdLEETPXnS9D EouxtUfoIh00O+6DiMRGP/Sx79yY6hy69AWT+KFyUPlNF0eSSY1dZtB0cB5M5fKwp6hI tvaNWZC14ROddFPip0U6/07rpQC7+rBI7/tBdkLpztiE6sP8oTN0Qv3oT6l+O3Qshjo7 8bm7ZiPwnXUXIORV7m4dkFCfctswjjHsdrQ8JnOUJszHTP0/oFxmNVc24I2eC9UBLn0p IOPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734104932; x=1734709732; 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=HwvYj2HKbQGiAy/x/+qfqDk3B83EnRWwraGSS4aPBp0=; b=FznC3oPyvxB0FLIl6/PbyA9g5DGxpfaOphQuZ5JV5X20MidbslarnPvZjn/zAlYcoH Dl2p9EaOCSISKiPQkq8RuI1inYoPfbnRv6CBuCugCh2yfkx2nIa6c8WiyBG5ijowhjv9 d+YT7JYjuZlQJyJlfNQ6gzKchrgDtCpzAF3FU7UEWciLowOtfZbN/9vICDxZo8MMCn/Z gHN6+ihYpxgu74gS9ZdqqkcmnrRKcmEKsX1DnHriNlbUZFVSH9a11ET30Ej0L5W8TZAv ZDacaN6jU1Cubnt4J+ZV2jmKZh0iM4f9o7DwXSZAyXQ4BYepH1/0m3aNjtsSHUC7kocC pqLg== X-Gm-Message-State: AOJu0YzDphESrnLj9YFgO+g8uq/8TfXo+jJQT0RqoBaAc91NQA0bcXc6 hnrwMc7GhLnpWNmc+ariX8phPJ+vIX1jUudP1aDm3EnEWPtyAvJtOx4Upw== X-Gm-Gg: ASbGncu6BcWuLauwFsIjlL1ycksVHTbThL5psEUB1PbsVidX0d6xjTIueUbiAnjyLaM ONjxvkgBGAAPes7lD21pPzUQp8Mz2RIRKXc6uOVrSEr8uo+FeXc6Wm3WC0UIA/5fDl9AZ/shEHJ +5TbACFxelgN3QvOPhCjGZKi75SfoDjl9bRQgZSE8KwTJOwPMnNHjVgL4LIeN70Iw9uV5mW7Cm9 bjOHmS40Cq/i0rajm3nxX+7ZuMfBnOKdbHVzI7d6Q3auvP/ZfFG4Dm2lstrzkB4OH5ZzYZLGbgv NDY1W5s4zjfYOBWOKryrqDyP X-Google-Smtp-Source: AGHT+IGjRndcrRrTH01ugn7uCxrVVTQKrehj7EZKvF+cVHxl3/0z+efTBnwrG01BY9WVAfPxq/rmjQ== X-Received: by 2002:ad4:5f0e:0:b0:6d8:a610:21cc with SMTP id 6a1803df08f44-6dc8ca3d469mr59267196d6.1.1734104931993; Fri, 13 Dec 2024 07:48:51 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da6b2291sm92221816d6.58.2024.12.13.07.48.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2024 07:48:51 -0800 (PST) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 3/4] radxa-zero-3: switch to yocto-dev kernel Date: Fri, 13 Dec 2024 10:48:42 -0500 Message-ID: <20241213154843.27592-3-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20241213154843.27592-1-twoerner@gmail.com> References: <20241213154843.27592-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 Dec 2024 15:49:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/901 The radxa-zero-3{e|w} devices are not supported in the current yocto kernel, but they are supported in the yocto-dev kernel. Switch to yocto-dev until support is available in the yocto kernel. Signed-off-by: Trevor Woerner --- changes from v1: - add [meta-rockchip] to subject --- conf/machine/include/radxa-zero-3.inc | 2 +- ...xt_%.bbappend => linux-yocto-dev.bbappend} | 0 .../linux/linux-torvalds-next_git.bb | 25 ------------------- recipes-kernel/linux/linux-yocto-dev.bbappend | 2 ++ 4 files changed, 3 insertions(+), 26 deletions(-) rename dynamic-layers/rk-rauc-demo/recipes-kernel/linux/{linux-torvalds-next_%.bbappend => linux-yocto-dev.bbappend} (100%) delete mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc index 1c6f972c1e31..b351afae8c0f 100644 --- a/conf/machine/include/radxa-zero-3.inc +++ b/conf/machine/include/radxa-zero-3.inc @@ -2,7 +2,7 @@ MACHINEOVERRIDES =. "radxa-zero-3:" require conf/machine/include/rk3566.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig" diff --git a/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend similarity index 100% rename from dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend rename to dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb deleted file mode 100644 index b961b1408f09..000000000000 --- a/recipes-kernel/linux/linux-torvalds-next_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:" - -DESCRIPTION = "Linux Kernel" -SECTION = "kernel" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -ERROR_QA:remove = "buildpaths" -DEFAULT_PREFERENCE = "-1" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" - -LINUX_VERSION = "6.11-rc6" -KERNEL_VERSION_SANITY_SKIP = "1" -PV = "${LINUX_VERSION}+git${SRCPV}" -SRC_URI = " \ - git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;nobranch=1 \ - file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \ - " -# this is tag 'next-20240904' -SRCREV = "fdadd93817f124fd0ea6ef251d4a1068b7feceba" - -inherit kernel -inherit kernel-yocto -require recipes-kernel/linux/linux-yocto.inc diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index b6a63d7b7b29..f738d1357d6c 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus" +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" SRC_URI:append:orangepi-5-plus = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" +SRC_URI:append:radxa-zero-3 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" From patchwork Fri Dec 13 15:48:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 54059 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 C1BD6E7717D for ; Fri, 13 Dec 2024 15:49:03 +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.18725.1734104935576543445 for ; Fri, 13 Dec 2024 07:48:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=P9BLZYVT; 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-6d91653e9d7so18307436d6.1 for ; Fri, 13 Dec 2024 07:48:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734104933; x=1734709733; 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=27V1RplMfmkCFxPRLi3EM7yZ14jQMKsIy6PP6iO8fs0=; b=P9BLZYVTiM3JtS9NPbN4k7OwqJCLfhNnJKPmIxkpdY6Orq6yuuGpC3l70q9A2bN5hZ HNk4azm4hKwc5Q7X6BiaApZBbHVaib3VB6znEUq8VVU76uq7iQoMx1qARyRRi2xZuiLI o+4rqACsjLakFfqoBOqWt3oDBHuWv00DYIntihmW2oVFeK3zREQh3cCE0QrO7Zykud1e wD55BLbtACgwvI+d7IlLb07uO1jjqnzu4Tx1HY7REJVAaW/Ub7BM9r4QjW3d4WNkvW+5 9MwHdzshAqmJ96RIU8KCxV79qHxjKy/hCj3Hwk7Uo1ZxdWFPdts0Iu7CklEl3hRhV2eB 9zzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734104933; x=1734709733; 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=27V1RplMfmkCFxPRLi3EM7yZ14jQMKsIy6PP6iO8fs0=; b=Ssc0TMgatbPmZgWYkaoC9mhKYiiPnSczH3JbwqGa9fY1GAHEpL5O9K0h/xe3te1VeS G502ACR1Rq89YhZ6QmtN+aer0l9zGXq0qLK+VHRiMpWwqExnziJSnYA2wFDG5tdtGGeo JLYI9dOqxmtKp+AhArRVjEey++UifHQ98H+Ovgq83Ys3hYT9glylQkuLucC2S5K2tGwj HMQjRwKLViSSpORJn/dAxUwHedHKtSI79eFbs8S+fO3HSAiRr2xTa4Kl/OVpqYKi7wbX 8zegr4v3zQARKlahAZ60ZfHjEid7XYMny12MZcuytLrg4hem+z/DpuCXnwNf8IB7EK4v 8YJA== X-Gm-Message-State: AOJu0YwuEhFH3+2zmzm00xlVTX/NLqlsTnDl1m8Ya8mF450rkJHS7eky 4TyAuCks57JOUU34M8fG3QpySu5nriXkgdZ7QWk0ESBnXZUzkipR8NMHUg== X-Gm-Gg: ASbGncu9iqUv3692rY/YAsyLCJ0Dl1WYrCiDNsHzAIBE+MD/+NLMukGzXs7WnV3Hz1Z GCrSH7QweEYOOkAM5K2wwxHNvJ2qzaWSYJHXeRsvpO4IfeKv6jZTckQT/bd0CDMbxRxtJnV9mCs UHZGS7bnvu1LRbV62PzSueMbuSxqpPFbJpTIn9fCqnUPkQohhJ8MOo+rX3tSNFGI1r+s3dt1Fjf LzcxuebwEL8swOZ/F7Yq543sjoGb6rQanb8wnAc/cmJI+jxPZvETZvTs0LyIQBLUhv/ePtpWYgu +Y5btBoFR0vmll7QepUK3NQ/ X-Google-Smtp-Source: AGHT+IHHQglMY5VSciYDkmhivc5j6ROWczqfnZh/9IlGqyjB+QGhFI0rXvCoilCY573/ymOz+jPEjA== X-Received: by 2002:a05:6214:d83:b0:6d8:ab7e:e54f with SMTP id 6a1803df08f44-6dc9683dd36mr45227976d6.34.1734104933638; Fri, 13 Dec 2024 07:48:53 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8da6b2291sm92221816d6.58.2024.12.13.07.48.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2024 07:48:52 -0800 (PST) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 4/4] rk3308: add provider for trusted firmware-a Date: Fri, 13 Dec 2024 10:48:43 -0500 Message-ID: <20241213154843.27592-4-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20241213154843.27592-1-twoerner@gmail.com> References: <20241213154843.27592-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 Dec 2024 15:49:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/902 A PREFERRED_PROVIDER entry was missed for rk3308 builds: NOTE: Multiple providers are available for trusted-firmware-a (rk3308-rkbin, rockchip-rkbin-tf-a) Consider defining a PREFERRED_PROVIDER entry to match trusted-firmware-a This allows the RKBIN_RK3308_LATEST knob to work in all cases again. Signed-off-by: Trevor Woerner Reviewed-by: Quentin Schulz --- changes from v1 - added --- conf/machine/include/rk3308.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc index 1ecf085cd5de..d30901f15b4f 100644 --- a/conf/machine/include/rk3308.inc +++ b/conf/machine/include/rk3308.inc @@ -19,6 +19,7 @@ KERNEL_IMAGETYPE ?= "fitImage" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" +PREFERRED_PROVIDER_trusted-firmware-a = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-tf-a', 'rk3308-rkbin', d)}" PREFERRED_PROVIDER_rockchip-rkbin-ddr = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-ddr', 'rk3308-rkbin', d)}" PREFERRED_PROVIDER_rockchip-rkbin-tf-a = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-tf-a', 'rk3308-rkbin', d)}" PREFERRED_PROVIDER_rockchip-rkbin-optee-os = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-optee-os', 'rk3308-rkbin', d)}"