From patchwork Thu May 29 02:41:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63786 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 8D972C3ABB2 for ; Thu, 29 May 2025 02:42:03 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web10.12281.1748486517485786670 for ; Wed, 28 May 2025 19:41:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=h2qZ1H+r; spf=pass (domain: konsulko.com, ip: 209.85.210.182, mailfrom: tim.orling@konsulko.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-739b3fe7ce8so284706b3a.0 for ; Wed, 28 May 2025 19:41:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486516; x=1749091316; 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=V78m16xrm/lAGYhEAAU/pvDB28zo8XNZH2x1xsThROM=; b=h2qZ1H+radQkrWpH/xcn9N9TBATwaU6VYDzFWRC1o+t3Kt65kNvCZaezvgdFfDnJf2 E4qKlhZ9usXCUUwuhAj5Mc6UIe92Pw+59n/eOFIq69s+vtKPDI+4d3tCT/Oco0uhE0lv ORSKUrBkiO86WiiS+v4TKsiWB7nhkW/jURrR8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486516; x=1749091316; 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=V78m16xrm/lAGYhEAAU/pvDB28zo8XNZH2x1xsThROM=; b=SI59yfTVapkzRBtIx59ayf4IRJBzpZqUQenrkpRpOKWNYX1MT9XSs3ndBTi0iDjm/h UA+dp0XwKzeT865oErIq6ObfKWuRGtUCJWL5ao3Gq0fcbVOb6Gb5CuJNy+nrwrnT9mYf 4ov70qbI05ILkuBRw8/Vd99h/o6vplQAw7v6jZStW5m4a1hl81ReQSU7lW1Z7E2GuYQ0 xTRpENskVsDF9V9tBftKgd59uGA1zjqbmfON/8uYGWOaMJ6+JItxVtfi2VFIOKRG9N32 iL2dnTRaLPPnBT4iCDFj+Wrx09zsznNnhHPJmCJIOe/7wOh0xp8FI/SB1yVRyq7mKj7H p/yA== X-Gm-Message-State: AOJu0YxgMwaxGXr10VwiPiFzBM2POwnbzVidQbxvScTrCJ2ULtPw6cu4 0WEkJu1joVE7WkzRDUiXMRX70/tS4avrDBf7vA0LnTmpCJwtVI2P47SHnBhSUnzflWVxR7TNQJn nK4GqmFhXNw== X-Gm-Gg: ASbGncs2DdnE1/yi6KnS90CWQq0L5/bJiu28qxhU65C3Y8g0y+FsEeCfhj7R/6eB4MT GUVk7wAFVBbldQbB2UAnK1IFBKq0i9hfoe3oLG0rZIrbivsL+2t9t4lZTV343qRXGwPZ/FPIg2P 2GmVIMqw5NDF8luDIyfmwIZycODtPyhtUBNsDCGRuNzzR5xqilUShKxODkpHk7aRFPsoey3tnu8 HcmbQ0w6na2XCi6CaqYVJEdj3DK6iqZJYoXp0hQtknSaXEO6qMdbOEqrC+lF4ZS1i4RHkKFt3Up jtjb/axsuJO9fNxlB3GA2UF7Qd7yp04/P5kYHyTv4IMCNbdVK6/FGdAlpDzpQBt7LeyW8xQuxAH hoY4EVwMHc9zBVpw= X-Google-Smtp-Source: AGHT+IFyXZrGjuvGLrXqyOTS6OdB73miKL3pfMac3VINKacjao6lxbDCVAi+NaAxg75A2+KafP1gfA== X-Received: by 2002:a05:6a21:3945:b0:1fd:ecfa:b6d7 with SMTP id adf61e73a8af0-21acbb104cdmr768345637.28.1748486516301; Wed, 28 May 2025 19:41:56 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b2d99ec762dsm1791254a12.52.2025.05.28.19.41.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:41:55 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 01/11] u-boot: Fix potential index error issues in do_deploy with multiple u-boot configurations Date: Wed, 28 May 2025 19:41:28 -0700 Message-ID: <2dc63a32d4ad8a0b0179bb8d2468f8bf104e5732.1748486276.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1585 From: Florian Amstutz If i or j have not been unset in do_deploy:prepend functions, images are not correctly copied to DEPLOYDIR. (From OE-Core rev: 5a0764eaac90bd62dac4a387eed5eb68f556412f) Signed-off-by: Florian Amstutz Signed-off-by: Richard Purdie Signed-off-by: Tim Orling --- recipes-bsp/u-boot/u-boot.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc index f5b43f6..608d621 100644 --- a/recipes-bsp/u-boot/u-boot.inc +++ b/recipes-bsp/u-boot/u-boot.inc @@ -217,6 +217,7 @@ RDEPENDS:${PN} += "${PN}-env" do_deploy () { if [ -n "${UBOOT_CONFIG}" ] then + unset i j for config in ${UBOOT_MACHINE}; do i=$(expr $i + 1); for type in ${UBOOT_CONFIG}; do From patchwork Thu May 29 02:41:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63785 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 8B678C5B543 for ; Thu, 29 May 2025 02:42:03 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mx.groups.io with SMTP id smtpd.web11.12371.1748486520097727852 for ; Wed, 28 May 2025 19:42:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=WHjUoRpI; spf=pass (domain: konsulko.com, ip: 209.85.214.193, mailfrom: tim.orling@konsulko.com) Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-234477e3765so4350405ad.2 for ; Wed, 28 May 2025 19:42:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486519; x=1749091319; 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=X8YARpms9tgVK34KLCMupvTM26DOPFgr/li0ljjYm5I=; b=WHjUoRpICWeigHeN46YJ8RpcQF8wASIkjpwqMcJ6OfraAQuzBUeHPp5fMCOvdiS2aV YP0WxelVnAVyfHdcviyhrCfoGsOcSQGln+H8dYmsLtZ6fHxKGXk6Pqc+Q/OUe2tul84s 9R9PZe5axPqb/IXyAK8fFPzSAhPjjvEBsgEHE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486519; x=1749091319; 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=X8YARpms9tgVK34KLCMupvTM26DOPFgr/li0ljjYm5I=; b=uxREiMEXnEEeaB212XTyS26Z+AwdtIAv1ULnTndTIibEUQO94TvpWU6mns9We8CiyS z8QDVuU3/IbRet4zVFKQo5c+W47+A2ZLOwObdvMg2GPgjz3fGcyCj3gvUwpPb6i0LDYf sZINpunz01lVrB9RiFePk9umL1BuMx8gJ3Ne1GpImnbdu0z3Yr6mlubjn0uhLBA1rgNs vniMENbMufoN6Elx84ADgu4bK77/1DrB/bz6OQFBRpLJ2NhRkr6GbJTzLfF9X/XcYs71 0l1JPylB7Zc1/kzgL6inJuaTmXCxwEGZzIwKnSQFga4td3KRYyH8MTOLNxrCqHtwWbUZ hdPg== X-Gm-Message-State: AOJu0YxyuzjfT4TmhluSMUco/Z8rcIGSZwXY1Oipu/3eDST6RLWqiiX1 oNM+JCN9i60RSgKQL72lKantVTWmNkwD3gtNMOJrxmzs64l6z1xg5BOCEK5cmbJVn1TyUgu0CYK iiZp8sW3FCFds X-Gm-Gg: ASbGnct3CeaN8pRpr1Twfg39vVUgrrsAord4qYEUXQBtwQ/5JRoSNU790pS6DGvxskj MlKhZJILa0tVwe8QA+FUIR5pM4B2a9Bre+TobHJOJ8ehQSu6Zo2DE8V4baSEYqcCZRlDzj0V7fI nNaHhXA70K8ySaOuF90WSYweGzrcbKbRaoPUuPbeBgXWhG8EszZxWYpHAqaf9493kcHfeQnFTYM XZB+/fh9LtXN3tBGj59iKuvplY/NNA6RLiYBC6FOiaS+KPmpm6JZN/Scgn/uFv61QQCz/dook6N HxvHjl0D+aGeZ18jrFwk+5mo31MunCa+gbGtOEfNjIfP6hOv383mOYOtdKBqoy5ibIstQabrZjp ME8pMyNPmKkE4sn8= X-Google-Smtp-Source: AGHT+IGcgwBCyFVHBzm4ByHFKFNMxle93czuaD0oIyXhAA8vW5zOMQyeJht+a4dqOkdc1ZxzQYrpWA== X-Received: by 2002:a17:902:e849:b0:22c:3609:97ed with SMTP id d9443c01a7336-234d2add5bdmr51972475ad.30.1748486519083; Wed, 28 May 2025 19:41:59 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23506d19c88sm2745835ad.247.2025.05.28.19.41.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:41:58 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 02/11] u-boot: upgrade 2024.04 -> 2024.07 Date: Wed, 28 May 2025 19:41:29 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1586 From: Fabio Estevam Upgrade to U-Boot 2024.07. (From OE-Core rev: 377e8d7fc019b0b2a0fd020e51741a4543f5f209) Signed-off-by: Fabio Estevam Signed-off-by: Richard Purdie Signed-off-by: Tim Orling --- recipes-bsp/u-boot/u-boot-common.inc | 2 +- .../u-boot/{u-boot-tools_2024.04.bb => u-boot-tools_2024.07.bb} | 0 recipes-bsp/u-boot/{u-boot_2024.04.bb => u-boot_2024.07.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename recipes-bsp/u-boot/{u-boot-tools_2024.04.bb => u-boot-tools_2024.07.bb} (100%) rename recipes-bsp/u-boot/{u-boot_2024.04.bb => u-boot_2024.07.bb} (100%) diff --git a/recipes-bsp/u-boot/u-boot-common.inc b/recipes-bsp/u-boot/u-boot-common.inc index ca53573..1b5382a 100644 --- a/recipes-bsp/u-boot/u-boot-common.inc +++ b/recipes-bsp/u-boot/u-boot-common.inc @@ -12,7 +12,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "25049ad560826f7dc1c4740883b0016014a59789" +SRCREV = "3f772959501c99fbe5aa0b22a36efe3478d1ae1c" SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" diff --git a/recipes-bsp/u-boot/u-boot-tools_2024.04.bb b/recipes-bsp/u-boot/u-boot-tools_2024.07.bb similarity index 100% rename from recipes-bsp/u-boot/u-boot-tools_2024.04.bb rename to recipes-bsp/u-boot/u-boot-tools_2024.07.bb diff --git a/recipes-bsp/u-boot/u-boot_2024.04.bb b/recipes-bsp/u-boot/u-boot_2024.07.bb similarity index 100% rename from recipes-bsp/u-boot/u-boot_2024.04.bb rename to recipes-bsp/u-boot/u-boot_2024.07.bb From patchwork Thu May 29 02:41:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63791 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 50ED4C3ABB2 for ; Thu, 29 May 2025 02:42:13 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web10.12283.1748486523348809998 for ; Wed, 28 May 2025 19:42:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=pb2m8jF9; spf=pass (domain: konsulko.com, ip: 209.85.215.179, mailfrom: tim.orling@konsulko.com) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-b26df8f44e6so482405a12.2 for ; Wed, 28 May 2025 19:42:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486522; x=1749091322; 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=lBdsr0FDhMHV95agD75dqMgxG1h7FDlVgHQmn6FsZpc=; b=pb2m8jF9r4YZQNMONhBzJ0iRQ4Rpw1+bkbd72XpIFCWFvMZO7sEWypTqtEO+pkfnUB ZltF8IN/ZlNwt10A/vgGasVGCpGhWZ0WB3GnjvbZTTTG4h3ta+fch/zMOHQt/ImGIk+h ma8AvgefZKSAyf5sUlIJVx26DMN+Cm/GVs1hI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486522; x=1749091322; 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=lBdsr0FDhMHV95agD75dqMgxG1h7FDlVgHQmn6FsZpc=; b=B9pEEFeow+cm2KYAuQZAIZBGfzet5G0oki1Yz9ewVzZQZSXC6aEvoW18djM1rMWa1x NOUBRtfk68ZjNAJAxSDegt2P/GjFcCmJeY3zqEzvkulrDlvt/bRHy9XyEgPQwwZu17lJ Cf4PsBWdHAeNDcRAtq+xs365n6sRuzHpGWmsR/vKT3AJHdlK9hTCgIBIOS5RcaLzfsHb ONEm8a2Awf/TVcmmrNke+47CXtHQsODR/kSHDDjlIjmQUfCaUNB6SxuzpeLKsQO0jwjj ZR1Hb1bzcZW6lLHWoZ8kfcxD5vm91EDGyhh9AKJ0Ka1atWkR0Z6xt6kWrlG8S6HP5dDa Z1DA== X-Gm-Message-State: AOJu0YzCv2UFAwkPZnXCw10si0htjFMqot/MG13j3oaXbNzR01qorRSF SN0Yrv1azNdJuHMRgmyzACqkQdUgUGUziCxQmQ9E/XfOfbV7iS0hXWRjXR5uZ/AT5NqFZFovxsS Xe02E9+p0eQ== X-Gm-Gg: ASbGncslJwzhttWuskL7G9LdGBMKF1pDaoUmvfEkYtTtoWNrdigQY7aCe4a5y0iVH1i 3knK0dZ8VtL+QhzZedVejhFf9tcZFS3Pzw4b8pRcmaFzDBSq2uKH9k6r+poeqwcfS0kjXbfyAGW bO3POc/P/S5ZBayUZ/vM4+/9IrhH7dbIa6hVKxcEwt4sCjiWo5jiezpCN4kaN+Kh00e9/n/4LV4 2LiMcvYv8CjsdbiGvEHpgEMrdqnFGMZ3NU1R76CMjGDApfxIdmc3lKb5n7o/NGsYb0njufZe3RV 5DkETHGcA1yET5X5p5HVYStRs0tqqU/grzcLkwKWLZSP51UrmPdZfkUKwMN8w7M8CgdiEy4GDLL Vk2YdFxvQb8r7qkE= X-Google-Smtp-Source: AGHT+IEG+ZuW7YLWGb2iMa/MtQNyfqe4Yu1HdTsId+xgXCIExgwu3NrZTXV+g3mqzw83ZacRRWtkcA== X-Received: by 2002:a17:90b:5205:b0:311:e9ac:f5ce with SMTP id 98e67ed59e1d1-311e9acf940mr5272283a91.21.1748486521730; Wed, 28 May 2025 19:42:01 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3121b6fb2a4sm350003a91.9.2025.05.28.19.42.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:42:01 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 03/11] u-boot.inc: Refactor do_* steps into functions that can be overridden Date: Wed, 28 May 2025 19:41:30 -0700 Message-ID: <667fcf6da43756f373210fffd42b99dcd264677c.1748486276.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1587 From: Ryan Eatmon The looping logic for handling (and not handling) UBOOT_CONFIG has led to the various do_* functions to be large and unwieldy. In order to modify one of the functional blocks inside of a loop (or in the else condition) means you either have to replace the function entirely, or append the function and undo something it did and then do what you need for your change. This refactor breaks out all of the inner loops and else clauses into new functions that themselves can be overridden without needing to worry about the bulk of the looping logic. It should not break any existing recipes doing prepends, appends, or overrides. None of the functional blocks were changed, just refactored out into new functions. (From OE-Core rev: 937bcc229502fcc154cc676b4fcc93c561873def) Signed-off-by: Ryan Eatmon Signed-off-by: Richard Purdie Signed-off-by: Tim Orling --- recipes-bsp/u-boot/u-boot-configure.inc | 36 ++- recipes-bsp/u-boot/u-boot.inc | 281 ++++++++++++++++-------- 2 files changed, 208 insertions(+), 109 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-configure.inc b/recipes-bsp/u-boot/u-boot-configure.inc index 235623d..fc74646 100644 --- a/recipes-bsp/u-boot/u-boot-configure.inc +++ b/recipes-bsp/u-boot/u-boot-configure.inc @@ -16,23 +16,35 @@ do_configure () { for type in ${UBOOT_CONFIG}; do j=$(expr $j + 1); if [ $j -eq $i ]; then - oe_runmake -C ${S} O=${B}/${config} ${config} - if [ -n "${@' '.join(find_cfgs(d))}" ]; then - merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} - oe_runmake -C ${S} O=${B}/${config} oldconfig - fi + uboot_configure_config $config $type fi done unset j done unset i else - if [ -n "${UBOOT_MACHINE}" ]; then - oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} - else - oe_runmake -C ${S} O=${B} oldconfig - fi - merge_config.sh -m .config ${@" ".join(find_cfgs(d))} - cml1_do_configure + uboot_configure fi } + +uboot_configure_config () { + config=$1 + type=$2 + + oe_runmake -C ${S} O=${B}/${config} ${config} + if [ -n "${@' '.join(find_cfgs(d))}" ]; then + merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} + oe_runmake -C ${S} O=${B}/${config} oldconfig + fi +} + +uboot_configure () { + if [ -n "${UBOOT_MACHINE}" ]; then + oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} + else + oe_runmake -C ${S} O=${B} oldconfig + fi + merge_config.sh -m .config ${@" ".join(find_cfgs(d))} + cml1_do_configure +} + diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc index 608d621..6f1170f 100644 --- a/recipes-bsp/u-boot/u-boot.inc +++ b/recipes-bsp/u-boot/u-boot.inc @@ -54,40 +54,21 @@ do_compile () { if [ -n "${UBOOT_CONFIG}" -o -n "${UBOOT_DELTA_CONFIG}" ] then - unset i j k + unset i j for config in ${UBOOT_MACHINE}; do i=$(expr $i + 1); for type in ${UBOOT_CONFIG}; do j=$(expr $j + 1); if [ $j -eq $i ] then - oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} - for binary in ${UBOOT_BINARIES}; do - k=$(expr $k + 1); - if [ $k -eq $i ]; then - cp ${B}/${config}/${binary} ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} - fi - done - - # Generate the uboot-initial-env - if [ -n "${UBOOT_INITIAL_ENV}" ]; then - oe_runmake -C ${S} O=${B}/${config} u-boot-initial-env - cp ${B}/${config}/u-boot-initial-env ${B}/${config}/u-boot-initial-env-${type} - fi - - unset k + uboot_compile_config $i $config $type fi done unset j done unset i else - oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} - - # Generate the uboot-initial-env - if [ -n "${UBOOT_INITIAL_ENV}" ]; then - oe_runmake -C ${S} O=${B} u-boot-initial-env - fi + uboot_compile fi if [ -n "${UBOOT_ENV}" ] && [ "${UBOOT_ENV_SUFFIX}" = "scr" ] @@ -96,6 +77,46 @@ do_compile () { fi } +uboot_compile_config () { + i=$1 + config=$2 + type=$3 + + oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} + + unset k + for binary in ${UBOOT_BINARIES}; do + k=$(expr $k + 1); + if [ $k -eq $i ]; then + uboot_compile_config_copy_binary $config $type $binary + fi + done + unset k + + # Generate the uboot-initial-env + if [ -n "${UBOOT_INITIAL_ENV}" ]; then + oe_runmake -C ${S} O=${B}/${config} u-boot-initial-env + cp ${B}/${config}/u-boot-initial-env ${B}/${config}/u-boot-initial-env-${type} + fi +} + +uboot_compile_config_copy_binary () { + config=$1 + type=$2 + binary=$3 + + cp ${B}/${config}/${binary} ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} +} + +uboot_compile () { + oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} + + # Generate the uboot-initial-env + if [ -n "${UBOOT_INITIAL_ENV}" ]; then + oe_runmake -C ${S} O=${B} u-boot-initial-env + fi +} + do_install () { if [ -n "${UBOOT_CONFIG}" ] then @@ -105,32 +126,14 @@ do_install () { j=$(expr $j + 1); if [ $j -eq $i ] then - install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} - - # Install the uboot-initial-env - if [ -n "${UBOOT_INITIAL_ENV}" ]; then - install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} - fi + uboot_install_config $config $type fi done unset j done unset i else - install -D -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} - - # Install the uboot-initial-env - if [ -n "${UBOOT_INITIAL_ENV}" ]; then - install -D -m 644 ${B}/u-boot-initial-env ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} - fi + uboot_install fi if [ -n "${UBOOT_ELF}" ] @@ -143,17 +146,14 @@ do_install () { j=$(expr $j + 1); if [ $j -eq $i ] then - install -m 644 ${B}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} + uboot_install_elf_config $config $type fi done unset j done unset i else - install -m 644 ${B}/${UBOOT_ELF} ${D}/boot/${UBOOT_ELF_IMAGE} - ln -sf ${UBOOT_ELF_IMAGE} ${D}/boot/${UBOOT_ELF_BINARY} + uboot_install_elf fi fi @@ -172,17 +172,14 @@ do_install () { j=$(expr $j + 1); if [ $j -eq $i ] then - install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE}-${type} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE} + uboot_install_spl_config $config $type fi done unset j done unset i else - install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} - ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYFILE} + uboot_install_spl fi fi @@ -198,6 +195,63 @@ do_install () { fi } +uboot_install_config () { + config=$1 + type=$2 + + install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} + ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} + + # Install the uboot-initial-env + if [ -n "${UBOOT_INITIAL_ENV}" ]; then + install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} + fi +} + +uboot_install () { + install -D -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} + + # Install the uboot-initial-env + if [ -n "${UBOOT_INITIAL_ENV}" ]; then + install -D -m 644 ${B}/u-boot-initial-env ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} + fi +} + +uboot_install_elf_config () { + config=$1 + type=$2 + + install -m 644 ${B}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} +} + +uboot_install_elf () { + install -m 644 ${B}/${UBOOT_ELF} ${D}/boot/${UBOOT_ELF_IMAGE} + ln -sf ${UBOOT_ELF_IMAGE} ${D}/boot/${UBOOT_ELF_BINARY} +} + +uboot_install_spl_config () { + config=$1 + type=$2 + + install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} + ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE}-${type} + ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE} +} + +uboot_install_spl () { + install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} + ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYFILE} +} + PACKAGE_BEFORE_PN += "${PN}-env ${PN}-extlinux" RPROVIDES:${PN}-env += "u-boot-default-env" @@ -224,40 +278,14 @@ do_deploy () { j=$(expr $j + 1); if [ $j -eq $i ] then - install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} - cd ${DEPLOYDIR} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} - ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} - - # Deploy the uboot-initial-env - if [ -n "${UBOOT_INITIAL_ENV}" ]; then - install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} - cd ${DEPLOYDIR} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE}-${type} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${type} - fi + uboot_deploy_config $config $type fi done unset j done unset i else - install -D -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - - cd ${DEPLOYDIR} - rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} - - # Deploy the uboot-initial-env - if [ -n "${UBOOT_INITIAL_ENV}" ]; then - install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} - cd ${DEPLOYDIR} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE} - ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV} - fi + uboot_deploy fi if [ -e ${WORKDIR}/fw_env.config ] ; then @@ -277,20 +305,14 @@ do_deploy () { j=$(expr $j + 1); if [ $j -eq $i ] then - install -m 644 ${B}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} + uboot_deploy_elf_config $config $type fi done unset j done unset i else - install -m 644 ${B}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE} - ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} - ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} + uboot_deploy_elf fi fi @@ -305,21 +327,14 @@ do_deploy () { j=$(expr $j + 1); if [ $j -eq $i ] then - install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} - rm -f ${DEPLOYDIR}/${SPL_BINARYFILE} ${DEPLOYDIR}/${SPL_SYMLINK} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE}-${type} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} - ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK} + uboot_deploy_spl_config $config $type fi done unset j done unset i else - install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} - ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARYNAME} - ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} + uboot_deploy_spl fi fi @@ -343,4 +358,76 @@ do_deploy () { fi } +uboot_deploy_config () { + config=$1 + type=$2 + + install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + cd ${DEPLOYDIR} + ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} + ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} + ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} + + # Deploy the uboot-initial-env + if [ -n "${UBOOT_INITIAL_ENV}" ]; then + install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} + cd ${DEPLOYDIR} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE}-${type} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${type} + fi +} + +uboot_deploy () { + install -D -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + + cd ${DEPLOYDIR} + rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} + + # Deploy the uboot-initial-env + if [ -n "${UBOOT_INITIAL_ENV}" ]; then + install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} + cd ${DEPLOYDIR} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE} + ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV} + fi +} + +uboot_deploy_elf_config () { + config=$1 + type=$2 + + install -m 644 ${B}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} +} + +uboot_deploy_elf () { + install -m 644 ${B}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE} + ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} + ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} +} + +uboot_deploy_spl_config () { + config=$1 + type=$2 + + install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} + rm -f ${DEPLOYDIR}/${SPL_BINARYFILE} ${DEPLOYDIR}/${SPL_SYMLINK} + ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE}-${type} + ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE} + ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK} +} + +uboot_deploy_spl () { + install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} + ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARYNAME} + ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} +} + addtask deploy before do_build after do_compile From patchwork Thu May 29 02:41:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63788 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 51B63C5B552 for ; Thu, 29 May 2025 02:42:13 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.12373.1748486525392667092 for ; Wed, 28 May 2025 19:42:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=Rgre8Ton; spf=pass (domain: konsulko.com, ip: 209.85.214.170, mailfrom: tim.orling@konsulko.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22e16234307so4344215ad.0 for ; Wed, 28 May 2025 19:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486524; x=1749091324; 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=gky7hq0hMD2rSCMS84DYtN2E+ae7KB2HBXN4sYS0RK8=; b=Rgre8TonBweqcM/Ekg0aq9+eEEDScjgxOoJdVaSEg+Mq99M15hGIE4gH6V6Zgvww0J PJTvkKfAl1sHl72U7l7z9MLnFOWT9aGoL8yst6rgFO4LJ5k9IuKhH58kxEUz2r2NmltN i23Glyuu4inYstrPXSYB467wdgQtx5NA++v+k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486524; x=1749091324; 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=gky7hq0hMD2rSCMS84DYtN2E+ae7KB2HBXN4sYS0RK8=; b=i92zK/aRRcN6ppI9JkCVwHCCb8VrWT6BZrQg3cdz5HFNuGa8oV9/WvVvokgz+y1JIl jJ7AD1mb0n2/CM0IerCzBOpi/1H1XhXH+niEYPsA4cJZHa1sz7dPoBp8gEG8zu3wDyq7 AR/yB2TcZlBCcHxp34y7SrAfhA3g95HGNmKy/q8otW2aPjwA/kC+PdX26cpisNZfNGEp 6mThIvARTCiavvjSObhXG4fd0QgF1ggO+V9LGcQs9KVZiFFpZOxKmtv6IcVUjePA0Tj4 ym6lE8Vlk36Grc9oBQ3+8f5+3cDO3yNdM1aQIa0KT3DcNUsV/634KdUiGXjYIoSjDssy Qjuw== X-Gm-Message-State: AOJu0YwIwrmd7DicqF4ltdSZ77mtlBtRoToSqxINsMSpNhz6jE3T5oi6 leMf5xJJqlrr2RxgSBYSLoIoGVJhkYOy3vByB2YA6BuCTjowmVgc26Axcc8ZIEyQ+VLULR8Z3AA uBQiHM8IPig== X-Gm-Gg: ASbGnct/OvjIVoPSfvofD+/mhzvQhguupb8/gNCKocCet+bPV+4yvKekmqWr64ZilKW /9QY/AafR8LvT3LTZRQvXKDOv837LE0hmKWl6o07eptn+JpMkfHn03s3u/zd/egLRpBlDrRvnYi C6nPu+o9DuoWuo03ONZKIpibbBwRry5qvHIh+5VIbod6GXyjv4vLcyW8ZSSwOIBn6J0HLtFjPWo nS3DCxXhjNGMncR4vFFcMBvv42MZXBbMUoUVYAMYGGYJ7sILQczotdi8fgaSkyaHmfzkkIjcOYl PizvAv9Uoubd90TIthmVU6BfsJbuUq2Byc7LYUjLqbI8prZN+pgkLQizSMt9C0/I8kIOg3Akdkq RU5LxWOXccmP0BTE= X-Google-Smtp-Source: AGHT+IF4iG4EKwrDpbFWmYCnhbXJCcxuMeLFjq/9suotXTdFW2g0YFjcVy35juuTcyj00+YPVfwMWA== X-Received: by 2002:a17:902:d50d:b0:233:d3e7:6fd6 with SMTP id d9443c01a7336-234f6a08ad2mr29560745ad.19.1748486524052; Wed, 28 May 2025 19:42:04 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23506bc8880sm2876045ad.22.2025.05.28.19.42.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:42:03 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 04/11] u-boot: Ensure we use BFD as linker even if using GCC for it Date: Wed, 28 May 2025 19:41:31 -0700 Message-ID: <11e70fb42b3ad26b582a17291458a26adc7c7bb6.1748486276.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1588 From: Otavio Salvador If we are using 'ld-is-gold' as DISTRO_FEATURE, the U-Boot Makefile has mechanisms to ensure that we use BFD as linker. However, this does not work for the GCC when it is used as linking tool. To support that, we added explicit BFD use whenever we have the DISTRO_FEATURE feature enabled. (From OE-Core rev: d36ee7a87c0d89b2820eea4bfcdae342adc75019) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie Signed-off-by: Tim Orling --- recipes-bsp/u-boot/u-boot.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc index 6f1170f..9b612e1 100644 --- a/recipes-bsp/u-boot/u-boot.inc +++ b/recipes-bsp/u-boot/u-boot.inc @@ -9,7 +9,8 @@ inherit uboot-config uboot-extlinux-config uboot-sign deploy python3native kerne DEPENDS += "swig-native" -EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP}" V=1' +EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} V=1' +EXTRA_OEMAKE += 'CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)} ${DEBUG_PREFIX_MAP}"' EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' From patchwork Thu May 29 02:41:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63789 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 5E8F6C5B549 for ; Thu, 29 May 2025 02:42:13 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mx.groups.io with SMTP id smtpd.web11.12374.1748486527112950092 for ; Wed, 28 May 2025 19:42:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=QpWdy62f; spf=pass (domain: konsulko.com, ip: 209.85.214.193, mailfrom: tim.orling@konsulko.com) Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-2349282084bso5947335ad.1 for ; Wed, 28 May 2025 19:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486526; x=1749091326; 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=fMaFSQHiB5u6+zDpEuU54+n9HwB48kcxixGoMiFgcvk=; b=QpWdy62fq130Hq5R9exZeqs87ns9fin+XaEe91m2jwl1CVluxrOdEjPtxc/0dauEtQ 81OiHcPSTf1+DzsGPJHRraeRE15vlPKR65D30a6NdmyoFOeuGcB/o86IrbdAMi8uN9v4 Gd5MTGxSwL6gqZZsfw7OZXbGPmKOSbUjM+cMc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486526; x=1749091326; 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=fMaFSQHiB5u6+zDpEuU54+n9HwB48kcxixGoMiFgcvk=; b=ngNEK/whH9podOuRMVONLNNJQRejaWv9Qw4s+hh3xJ2Lpz7Ei9i5+fqW9xkD7noQyA Lhb07Ek3ZfG5JwX1qrmP8QrzGMwCfPLLI5vhQwgHvpW/dlW5LFUREP5+C+nMFHm6yD8l owj1qqatJ9PYRepCuBjJhIGMY/yQlG6TaZP4+QKA1jF9m1JtmkzrYnsPWDBF+U7pJPKz QOnZq+3sT9bu7VuI4stRLqoWekyOfLPd3PK/51JvlxBHY1/LoazPY/hf8pqw2S1MhQ59 xB8azKCm+2H1aDqjf3sfS5FzgzrJgWE3m9mlmwfiG6kxemekIeaQwucIUpjChIHrk6B6 uzGw== X-Gm-Message-State: AOJu0Yz54hMp0sfhrqV6yOc0Y0Mbw2iLooaors6oMnk59KCwXAH8BLEK L9px2PEBG0zB06wYj0wYcViq7nl3i399ut0OUqPEu3Y4RkNw16eO34ki3Pi54tcaoln5wGa8Cc4 hgobes/RZQGug X-Gm-Gg: ASbGncv6y2/73s1NYg51YaE3v6dvsURWoOGJZQFgmlXBeDczXV4oT6Zm+Rirki2oc77 MTqpap165GRHlvwPFl6QA92zJFfzmcPTvMgIqE09AWQy1H591v1JDKbcm6YVPW4nQMlpY+GEWv6 sMWPxbRHQrvnbz82FlGSKpeS8+Gv07J+crfadgL+CXtVZM0kKdkc2B5tSq6sAfwZgnAZISkBR74 G79PD8upZ4aOgFJNPvNm4DV8oR3N/Fr51WoKEEAxmOahIz7zlIrlRAeivVGjRpFGpRjmtj34Am9 YzbXRMHShsdi0BIDHsMqhINRcvgtWikIrebM5uUkJhlFrzXRmgI2Zw4QREQMw2lDYJye5gHbFnb twijtU5jM+ki+qB0= X-Google-Smtp-Source: AGHT+IHOeuqFWSkORHvuUm5EsQx0s9V8u6QXuFlrDX4GS+p31A3VpQZ8w4rvVLcmHnWi3BfZrGyPog== X-Received: by 2002:a17:902:cecc:b0:235:737:7bd with SMTP id d9443c01a7336-23508033d8emr6643065ad.27.1748486526171; Wed, 28 May 2025 19:42:06 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23506bc8880sm2876395ad.22.2025.05.28.19.42.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:42:05 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 05/11] u-boot: upgrade 2024.07 -> 2024.10 Date: Wed, 28 May 2025 19:41:32 -0700 Message-ID: <16a823200c47413be169ba887e2786cb511cf17e.1748486276.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1589 From: Fabio Estevam Upgrade to U-Boot 2024.10. Add the gnutls-native dependency because now U-Boot needs it installed on the host machine to handle the CONFIG_TOOLS_MKEFICAPSULE option. (From OE-Core rev: e3ece22060725c9eebc0feed9b2be2d00ce4bf8e) Signed-off-by: Fabio Estevam Reviewed-by: Quentin Schulz Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Tim Orling --- recipes-bsp/u-boot/u-boot-common.inc | 2 +- .../{u-boot-tools_2024.07.bb => u-boot-tools_2024.10.bb} | 0 recipes-bsp/u-boot/u-boot_2024.07.bb | 5 ----- recipes-bsp/u-boot/u-boot_2024.10.bb | 4 ++++ 4 files changed, 5 insertions(+), 6 deletions(-) rename recipes-bsp/u-boot/{u-boot-tools_2024.07.bb => u-boot-tools_2024.10.bb} (100%) delete mode 100644 recipes-bsp/u-boot/u-boot_2024.07.bb create mode 100644 recipes-bsp/u-boot/u-boot_2024.10.bb diff --git a/recipes-bsp/u-boot/u-boot-common.inc b/recipes-bsp/u-boot/u-boot-common.inc index 1b5382a..113f215 100644 --- a/recipes-bsp/u-boot/u-boot-common.inc +++ b/recipes-bsp/u-boot/u-boot-common.inc @@ -12,7 +12,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "3f772959501c99fbe5aa0b22a36efe3478d1ae1c" +SRCREV = "f919c3a889f0ec7d63a48b5d0ed064386b0980bd" SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" diff --git a/recipes-bsp/u-boot/u-boot-tools_2024.07.bb b/recipes-bsp/u-boot/u-boot-tools_2024.10.bb similarity index 100% rename from recipes-bsp/u-boot/u-boot-tools_2024.07.bb rename to recipes-bsp/u-boot/u-boot-tools_2024.10.bb diff --git a/recipes-bsp/u-boot/u-boot_2024.07.bb b/recipes-bsp/u-boot/u-boot_2024.07.bb deleted file mode 100644 index b15bcaa..0000000 --- a/recipes-bsp/u-boot/u-boot_2024.07.bb +++ /dev/null @@ -1,5 +0,0 @@ -require u-boot-common.inc -require u-boot.inc - -DEPENDS += "bc-native dtc-native python3-pyelftools-native" - diff --git a/recipes-bsp/u-boot/u-boot_2024.10.bb b/recipes-bsp/u-boot/u-boot_2024.10.bb new file mode 100644 index 0000000..db8b2d5 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot_2024.10.bb @@ -0,0 +1,4 @@ +require u-boot-common.inc +require u-boot.inc + +DEPENDS += "bc-native dtc-native gnutls-native python3-pyelftools-native" From patchwork Thu May 29 02:41:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63790 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 6CD1CC5B553 for ; Thu, 29 May 2025 02:42:13 +0000 (UTC) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mx.groups.io with SMTP id smtpd.web10.12286.1748486529237524603 for ; Wed, 28 May 2025 19:42:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=UdKXqhTx; spf=pass (domain: konsulko.com, ip: 209.85.210.194, mailfrom: tim.orling@konsulko.com) Received: by mail-pf1-f194.google.com with SMTP id d2e1a72fcca58-73bf5aa95e7so264684b3a.1 for ; Wed, 28 May 2025 19:42:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486528; x=1749091328; 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=utCPNlzLT4Q12C7+tfjYgTlC35optYMAW7DR7KcQh2I=; b=UdKXqhTxvJsMn+TE5bFic0IctZ7BJt+17nzDVXA3tn3Ce94qU/ZIeckrgEQ3W99+jD C6fsAjnV3BJxxVAUhswJt2D8p/A9biM4GfKUWcO9B5zez5AsWCr4sPOVr+UMpoSA1jTV h2f+GkeYtS3iWvQwiMtsvI0TwXGoTyCOtF9FQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486528; x=1749091328; 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=utCPNlzLT4Q12C7+tfjYgTlC35optYMAW7DR7KcQh2I=; b=pGHxc83e/Ik52ILjtqFTsnp/fnwVxwHmxM0+avN6kyXpLj+SpN1ii9anGQC+L24bug WUi+fWM/ZveU5pBwk/GAppolWYcrk0/WlNlS9GXncg7i8p6eauHOvET0LLUZTjZnHSJK G5dC4HQSdY3DNchhl9B3ufQYXzVpQ5AyKfYnqdpp+CqvZSdiwHo9yI6moDh80N3cfDH9 DdScRwZOmvegQ5J3a+1GvrN2aHVUf4BBx0dB5MOKyov2O+zYJ0VNeOdy445Xfp++TwuE pCYd+NYEtpbpdK+PaYEjD67rI8c9Rjlbbu5W51yAOjCD2i2zbrgCmjOZnRL55FgRdU9X ShBw== X-Gm-Message-State: AOJu0YybgdkyX1Q/1K5jgU8vgmxkfZ5YKegkS67Yab06fQobwGQXeDxJ 1rjw3zknau1xXwGo47Rr41OAkfc2Rhr81R8B+SCQdbNRNYlOMXuIsOyJ2wPHZJ9z50FG13yC2TB 0gqVBIT/iEr8L X-Gm-Gg: ASbGnctxQvjHrn2cwp9iYAf5RevNFKh08z0FfY/321hm1/h5IYOKMcSLA28kFxGxThn zgwRvWyOSkFIkDM3Oddv9WDcU7XZs8+R1yvbG9BGRCYfHa004sdnCHBTFfTVzC3EnwIphEt7uN+ tNQgxbk4DIWuSiLc4VZAo08A1kk7QVTSiJo+z+uNqMNECsdeUXBNJE4MFs7iWsMwfm9zEueWmAd RQnwY8bdfdR03jbLLSFNtoCRFcOMrrbk7FnwIdl0ahYbs++/XXo5TjIgL5IAngJWOPJLMVHeDKW WbWJBDj/D4Pf6TKjrgjpYC6Sb3BQ5obn0qpq7w4v7gc4fu5QsZDTlPmykXw4UkiJsMMd2R80F4V 7dz6c+4hRrYOQZaA= X-Google-Smtp-Source: AGHT+IH85q7QdIQRj8gG66oe3Iogtanm5vbIDvJ5rzj4OkKoBwgilNx9Q/M+S6AyP0u+5SGW9HThNA== X-Received: by 2002:a05:6a00:1412:b0:740:b3d9:c889 with SMTP id d2e1a72fcca58-745fe0c9063mr25631062b3a.22.1748486528154; Wed, 28 May 2025 19:42:08 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-747affd4398sm312396b3a.134.2025.05.28.19.42.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:42:07 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 06/11] u-boot: Add patch to use SWIG_AppendOutput Date: Wed, 28 May 2025 19:41:33 -0700 Message-ID: <223fd058a1575187b7063603b04d9e3f9e9fd6c5.1748486276.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1590 From: Markus Volk Swig has changed language specific AppendOutput functions. The helper macro SWIG_AppendOutput remains unchanged. Use that instead of SWIG_Python_AppendOutput, which would require an extra parameter since swig 4.3.0. (From OE-Core rev: 4eae7888e91c7c864bf490dee38716267be6202e) Signed-off-by: Markus Volk Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Tim Orling --- ...bfdt-libfdt.i_shipped-Use-SWIG_Appen.patch | 60 +++++++++++++++++++ recipes-bsp/u-boot/u-boot-common.inc | 1 + 2 files changed, 61 insertions(+) create mode 100644 recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch diff --git a/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch new file mode 100644 index 0000000..9cd2cee --- /dev/null +++ b/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch @@ -0,0 +1,60 @@ +From e093607e9a08e9c29b7bbaa6aeb137036db798a6 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Wed, 30 Oct 2024 05:46:00 +0100 +Subject: [PATCH] scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Swig has changed language specific AppendOutput functions. The helper +macro SWIG_AppendOutput remains unchanged. Use that instead +of SWIG_Python_AppendOutput, which would require an extra parameter +since swig 4.3.0. + +/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds +| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’: +| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’ +| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val); +| | ^~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted + +Signed-off-by: Markus Volk +--- + scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped +index 56cc5d48f4..e4659489a9 100644 +--- a/scripts/dtc/pylibfdt/libfdt.i_shipped ++++ b/scripts/dtc/pylibfdt/libfdt.i_shipped +@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t; + fdt_string(fdt1, fdt32_to_cpu($1->nameoff))); + buff = PyByteArray_FromStringAndSize( + (const char *)($1 + 1), fdt32_to_cpu($1->len)); +- resultobj = SWIG_Python_AppendOutput(resultobj, buff); ++ resultobj = SWIG_AppendOutput(resultobj, buff); + } + } + +@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t; + + %typemap(argout) int *depth { + PyObject *val = Py_BuildValue("i", *arg$argnum); +- resultobj = SWIG_Python_AppendOutput(resultobj, val); ++ resultobj = SWIG_AppendOutput(resultobj, val); + } + + %apply int *depth { int *depth }; +@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t; + if (PyTuple_GET_SIZE(resultobj) == 0) + resultobj = val; + else +- resultobj = SWIG_Python_AppendOutput(resultobj, val); ++ resultobj = SWIG_AppendOutput(resultobj, val); + } + } + +-- +2.47.0 + diff --git a/recipes-bsp/u-boot/u-boot-common.inc b/recipes-bsp/u-boot/u-boot-common.inc index 113f215..fe3afb3 100644 --- a/recipes-bsp/u-boot/u-boot-common.inc +++ b/recipes-bsp/u-boot/u-boot-common.inc @@ -15,6 +15,7 @@ PE = "1" SRCREV = "f919c3a889f0ec7d63a48b5d0ed064386b0980bd" SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" +SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch" S = "${WORKDIR}/git" B = "${WORKDIR}/build" From patchwork Thu May 29 02:41:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63787 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 48498C5B543 for ; Thu, 29 May 2025 02:42:13 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mx.groups.io with SMTP id smtpd.web11.12376.1748486531277819735 for ; Wed, 28 May 2025 19:42:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=OUk9kGZ9; spf=pass (domain: konsulko.com, ip: 209.85.214.193, mailfrom: tim.orling@konsulko.com) Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-234b9dfb842so4585145ad.1 for ; Wed, 28 May 2025 19:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486530; x=1749091330; 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=HqhtjyrS+M3o4+O5eJGz5Mg9LNrVYXN7HjTR/DsYrW4=; b=OUk9kGZ99yW6pzXm2XngPCUxizvBmkMhmz9JKftwS0QuvzzOHx2bKtzQoXT7kCSa6h wVWhVpX7FlCUlqEA0Fu+mRyKEnYqk3/Ct7UeoSdtxksvea6PK1CZIN3XmUnpFULWhJr7 wJvAXUaAzD0/0DfrgHDUdGaHKOX3Hqk/GgFsg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486530; x=1749091330; 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=HqhtjyrS+M3o4+O5eJGz5Mg9LNrVYXN7HjTR/DsYrW4=; b=GASpFYzseDxGXx8ERaqm2bzdtHJG0+9XiHxnQ5qs+JcbD+/x1ZC7b+4WKgLhtWxWSB 8AaXfF1C2ewjhZWrjlws7vb2PVVMASn7Omj+ghhnKc6OUinrOW+Bx3w3vIYm3F4SD7Th Z4YgObPYEVyAFR2xNQDnU9VBXg5/cw2mU6ri+8jcf86emT4KELmcigu7TjbTgXp0/KA5 S+EnaUo2algtm62C88t+9tixSaxDZSPwT1BbZCnmJHJyYU/VQe1tPXluKcajIhg73Lyd BJ4LH1HO8WK9yeXAQXXh+U8EiJE4X7wjL3ERYonUD4MDL0ZsagHWPaW51C7sKJHfiKQj nxFA== X-Gm-Message-State: AOJu0YzI593/+//BD9PwFyFjp1aRru0fDalh9K1ha7gdHIvne9wa4KMo UGhcthHsqLoNrhEAgq5uMSzqyVgNgTmquXII99oLc5aqB2IiEBp0zsJDRVaslVkX52GBWY2ofU9 i0nja81DIVnTw X-Gm-Gg: ASbGncud5ClP7dymCQ0nLsoSpKq3SncSfOIVhAMAu+Ewb63SRN3SVGIbZ0zWzB//NFD aT64D25nMAeKIgwQIQl3/D/mXLidXBis+OaCdg+dvmmJSirhn4k5F/k1XmehEtFzcIWoLnaLRgD KQIveqgx6qw+96arQSd2Nl1z7aqtdfxcblfjnhOWFfdk9fR9znWFQf8NRyrkfLOJoEhjjqORrzY GobrJcUDUmdteedlvIg5W8SX3T5rHZ90zui9Kk9HPMTLd8aPpfz5hFIyPY73XfhvDdzFAyylqOP PCMP4MSNSzujbcbK0WbCUearCXlj/nsseLofS+YZUVdV2YttxZXrgt6XaKCY+xHsvCn3R748pQF BTJUtJ6sLUowetGI= X-Google-Smtp-Source: AGHT+IFkIxHVR0olNpwf+5xRBw6Y3aI3YEnGDSlLB9hASz0M8vc5UF9AYuD1T5KW/dB6FscTS1cPPA== X-Received: by 2002:a17:902:cf01:b0:234:bca7:2920 with SMTP id d9443c01a7336-234bca735b4mr104064845ad.24.1748486530265; Wed, 28 May 2025 19:42:10 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23506cf5453sm2754385ad.183.2025.05.28.19.42.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:42:09 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 07/11] u-boot: Update Upstream-Status Date: Wed, 28 May 2025 19:41:34 -0700 Message-ID: <7afb006c0749452e3e393e230460336cc4b10b3e.1748486276.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1591 From: Fabio Estevam 0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch is now applied in U-Boot upstream. Update the Upstream-Status accordingly. (From OE-Core rev: 718f97d90b13c190e2b1852447764c31464ebdf1) Signed-off-by: Fabio Estevam Signed-off-by: Richard Purdie Signed-off-by: Tim Orling --- ...1-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch index 9cd2cee..2eeef99 100644 --- a/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch +++ b/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch @@ -17,7 +17,7 @@ since swig 4.3.0. | 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val); | | ^~~~~~~~~~~~~~~~~~~~~~~~ -Upstream-Status: Submitted +Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/a63456b9191fae2fe49f4b121e025792022e3950] Signed-off-by: Markus Volk --- From patchwork Thu May 29 02:41:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63792 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 65E60C5B549 for ; Thu, 29 May 2025 02:42:23 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.12378.1748486533320768913 for ; Wed, 28 May 2025 19:42:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=WFaC7EsC; spf=pass (domain: konsulko.com, ip: 209.85.214.182, mailfrom: tim.orling@konsulko.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2320d06b728so4308035ad.1 for ; Wed, 28 May 2025 19:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486532; x=1749091332; 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=yZ/rFKhYOtX2WexiAgN2vqC2yw6ZQHSny+K/H2TqT1U=; b=WFaC7EsCAOtMYBbWJYYr/vnfWJfqlZEvydJKbcDjZ9E709RL1CKZjDc1NX1s9J4+5c 6V6TvWPKDwHgCZdXvs0YwAYjcF0epooPegiMOKaVbxEmAyzQ5gAA27kUkM5tyCiZeKr7 E37lub71RZUuag++6ydTytIj1s1AfHUULMorI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486532; x=1749091332; 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=yZ/rFKhYOtX2WexiAgN2vqC2yw6ZQHSny+K/H2TqT1U=; b=M2+YCh/V7Tg7P+edk6pHEkEeYUiUGs+FpQlcxsNPw4hQzdeyF7sijHoWIthsy6cBEe KAp9ep5/uXZ48aSdh+mgamCrdTN3PCf606VPspid7En5dws+q3RdQIEgUDcGpDTOr76K Agp241iexyvq3134E7vpasFVHJIl7M+bf8OK41KDbeL+J0QE5d+dc/ulZAuUCRr4o1rI W2OThM7BMR506Duzu9BwEpWicUMZHnWPGCHuD8uXNTDec25qU1UUGOt93VUa040OE9yY t6xKjNZ08AhYiAXvG5fCo5/3ayRLNMaH+v33z5i4M6SiZgOsS18LvZnWhGeX1D+r6fRh Tq0w== X-Gm-Message-State: AOJu0YwuwlueHN5ialep723DFFJtfz0X2jNEcpbC70A59vRXav8tZy/q 4uPkLcBuQlfFr9GdckE/9/DuXE7vPTHW8JTKfb2QZtq3OuBkmA3prcB6TMtNa86KUec13przjvD 4p0L8yhFG0g== X-Gm-Gg: ASbGncvphJx4PLWwc4n7j0OSFX6VClQ9h9+5t5VvfrnLvBwhyd0hMzFIxWopmPbKeM/ 6HsmvUlAanvgCxX4dkda8YNIcHVhzW7Bkl7VoqjaSVu2tVftAEQo7jVh8SKczfOUbwgZ8GJGFju /m+fNtLLYyudXV1z+sjdAnrmgWjjAjDFeGnRf27saXZmbOO4CMrQHMgSj9SbNbChQtWyzWWI6IT ByIzkgVR0X7BPYmKN7igNv8lLx9WqGa9fu89a+sdLP2C7W4wr+uy7MyQwsz8XM6B5zumohy6cIm RHWDxDoxbM5ixLZVhd4NplHHBoTQGANN25ZzBc8pBDPr/j/g/TokGVccUHpBdejzol9kZHIR/QB z6pX4SRcgGgtl48Y= X-Google-Smtp-Source: AGHT+IFFgPUrPUiVC7cXsnp01OZ21BABHv0Y26wKkhS4L+EVY9BroTIHTHA8IvNRs2Li48FBH9+ORw== X-Received: by 2002:a17:903:245:b0:233:f3df:513d with SMTP id d9443c01a7336-234d2c2d2bemr71980475ad.35.1748486532376; Wed, 28 May 2025 19:42:12 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23506cf9100sm2748245ad.198.2025.05.28.19.42.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:42:11 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 08/11] u-boot: Set CVE_PRODUCT Date: Wed, 28 May 2025 19:41:35 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:23 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1592 From: Maik Otto The CPE vendor is "denx" and the CPE product is "u-boot". Set CVE_PRODUCT for properly matching in the NVD database. (From OE-Core rev: d2e5d427de13b33694a1d802f5ac833b2c04ced6) Signed-off-by: Maik Otto Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Tim Orling --- recipes-bsp/u-boot/u-boot.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc index 9b612e1..b9c0ab0 100644 --- a/recipes-bsp/u-boot/u-boot.inc +++ b/recipes-bsp/u-boot/u-boot.inc @@ -20,6 +20,8 @@ PACKAGECONFIG ??= "openssl" # a host build dependency. PACKAGECONFIG[openssl] = ",,openssl-native" +CVE_PRODUCT = "denx:u-boot" + # Allow setting an additional version string that will be picked up by the # u-boot build system and appended to the u-boot version. If the .scmversion # file already exists it will not be overwritten. From patchwork Thu May 29 02:41:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63793 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 65E2AC5B543 for ; Thu, 29 May 2025 02:42:23 +0000 (UTC) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mx.groups.io with SMTP id smtpd.web11.12380.1748486535828827846 for ; Wed, 28 May 2025 19:42:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=DeoBcuSP; spf=pass (domain: konsulko.com, ip: 209.85.210.194, mailfrom: tim.orling@konsulko.com) Received: by mail-pf1-f194.google.com with SMTP id d2e1a72fcca58-7399a2dc13fso444512b3a.2 for ; Wed, 28 May 2025 19:42:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486534; x=1749091334; 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=G27VnDS9f032XVtef3svsE7ylQYmg5L4KPgji7my7s8=; b=DeoBcuSPTxg3rSbCVCjUUC6JdT42/s8UBGe/nRgrt1J5tvL2Zl50d2FaNjidq5rr3d h+F0UiETlm8GjD1sP5WH6CUIfYkqbVR4XWOzSFTwd6OJC50PN/BvsTlXx37CYE32Wba6 WL/vY7gmmIWMv6/hv48GjdqC1tOANaK5otiYI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486534; x=1749091334; 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=G27VnDS9f032XVtef3svsE7ylQYmg5L4KPgji7my7s8=; b=S+iK3La9Pe+VqHEVrLMgXY0xyDhZC2lwyrfHOMBIKud2mvpUPa7yRt8c2MkNulqj3C YMHA8R3Ar1qLPuMvqYBZIi8Icay1uCbPcsrfXgb4Ednt0lauSB6cOCy48VbiNHdOkn39 k3IlcZgb8e9/RVbjHFiXLn2blbz/lIxDz59t6Z40dLre3kSvwmfryuw9ZXUvGokm2Edt 9izvjaQvgWB/TPpzwLw8/kB06oS0oP+WdRyOiBQ1Fh2ZwmP8w6xiZ7Tug/9+k1qedOJi YM4aoO8CqQpM/utwAdtw/4LB44i1jGR4rkmEoLdPdOGHmFtj7woT3T6xvjdvdJgEVpLB uwHA== X-Gm-Message-State: AOJu0YyTgM7Mc8sFViXB/JSWAvIE30zJmsZQP+wmDUQzRd7/ghj9A8vW al6F/CT/YiDFeSHuKhQ3xJXjVnGKSRBZlunIAbVYIdjr1Dy6FzNcsV734/7/vEalfoWdfAGPEr8 UuR/vMz+X18VV X-Gm-Gg: ASbGncuvJ0wo0Z7i8YAv/C71d4FBgJQY6XMGU0EiSeVlqBeqHu0hi90/0lnLAbSF+ZZ efuj8iifotYSgMUuNOWbMu5KDDckbJUSp8byTEj+mbEhWA5R1IaftPTdjg5R9Yh6VrmB7l9Fc5C EL+VQpA51af7oPgZ3poqd00NkTQkK3B5RsSf3YbXfp9/DqOuL1itnBHT2Y2CF3wV9EUiL68Ig1m 91x/AUnPgaTnlP5ANqs3G9+Tc5LR7SYwlmeyFsY3q9Q/2blC3o8UADT9ANGiMACzfztSju3qTqD 5bTVCMynRgzVv472tr48RIzYYMA0Ou7jV67npLiaHdbCGF2y0gk+YJ68ZpxztIbc/1LC3ShXZhQ SvIZC0XrIg82L/9E= X-Google-Smtp-Source: AGHT+IGhSC5GehuVXIGdMdwAr1CZik+6aB0vNI0q4PLoQbo/YyGKg1s9YtjNks+UbCSznTn8Fc+FPQ== X-Received: by 2002:a05:6a00:3996:b0:740:9331:78f0 with SMTP id d2e1a72fcca58-745fe0700c1mr23783225b3a.22.1748486534526; Wed, 28 May 2025 19:42:14 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-747affd4208sm309040b3a.140.2025.05.28.19.42.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:42:13 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 09/11] u-boot: upgrade 2024.10 -> 2025.01 Date: Wed, 28 May 2025 19:41:36 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:23 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1593 From: Fabio Estevam Upgrade to U-Boot 2025.01. Remove the patch as it has been upstreamed. (From OE-Core rev: e16a24f04b56ca3fec6509a3286e2e3bb5c21c1e) Signed-off-by: Fabio Estevam Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Tim Orling --- ...bfdt-libfdt.i_shipped-Use-SWIG_Appen.patch | 60 ------------------- recipes-bsp/u-boot/u-boot-common.inc | 3 +- ...ols_2024.10.bb => u-boot-tools_2025.01.bb} | 0 .../{u-boot_2024.10.bb => u-boot_2025.01.bb} | 0 4 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch rename recipes-bsp/u-boot/{u-boot-tools_2024.10.bb => u-boot-tools_2025.01.bb} (100%) rename recipes-bsp/u-boot/{u-boot_2024.10.bb => u-boot_2025.01.bb} (100%) diff --git a/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch deleted file mode 100644 index 2eeef99..0000000 --- a/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e093607e9a08e9c29b7bbaa6aeb137036db798a6 Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Wed, 30 Oct 2024 05:46:00 +0100 -Subject: [PATCH] scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Swig has changed language specific AppendOutput functions. The helper -macro SWIG_AppendOutput remains unchanged. Use that instead -of SWIG_Python_AppendOutput, which would require an extra parameter -since swig 4.3.0. - -/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds -| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’: -| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’ -| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val); -| | ^~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/a63456b9191fae2fe49f4b121e025792022e3950] - -Signed-off-by: Markus Volk ---- - scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped -index 56cc5d48f4..e4659489a9 100644 ---- a/scripts/dtc/pylibfdt/libfdt.i_shipped -+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped -@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t; - fdt_string(fdt1, fdt32_to_cpu($1->nameoff))); - buff = PyByteArray_FromStringAndSize( - (const char *)($1 + 1), fdt32_to_cpu($1->len)); -- resultobj = SWIG_Python_AppendOutput(resultobj, buff); -+ resultobj = SWIG_AppendOutput(resultobj, buff); - } - } - -@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t; - - %typemap(argout) int *depth { - PyObject *val = Py_BuildValue("i", *arg$argnum); -- resultobj = SWIG_Python_AppendOutput(resultobj, val); -+ resultobj = SWIG_AppendOutput(resultobj, val); - } - - %apply int *depth { int *depth }; -@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t; - if (PyTuple_GET_SIZE(resultobj) == 0) - resultobj = val; - else -- resultobj = SWIG_Python_AppendOutput(resultobj, val); -+ resultobj = SWIG_AppendOutput(resultobj, val); - } - } - --- -2.47.0 - diff --git a/recipes-bsp/u-boot/u-boot-common.inc b/recipes-bsp/u-boot/u-boot-common.inc index fe3afb3..fc86024 100644 --- a/recipes-bsp/u-boot/u-boot-common.inc +++ b/recipes-bsp/u-boot/u-boot-common.inc @@ -12,10 +12,9 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "f919c3a889f0ec7d63a48b5d0ed064386b0980bd" +SRCREV = "6d41f0a39d6423c8e57e92ebbe9f8c0333a63f72" SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" -SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch" S = "${WORKDIR}/git" B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-tools_2024.10.bb b/recipes-bsp/u-boot/u-boot-tools_2025.01.bb similarity index 100% rename from recipes-bsp/u-boot/u-boot-tools_2024.10.bb rename to recipes-bsp/u-boot/u-boot-tools_2025.01.bb diff --git a/recipes-bsp/u-boot/u-boot_2024.10.bb b/recipes-bsp/u-boot/u-boot_2025.01.bb similarity index 100% rename from recipes-bsp/u-boot/u-boot_2024.10.bb rename to recipes-bsp/u-boot/u-boot_2025.01.bb From patchwork Thu May 29 02:41:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63795 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 6B980C3ABB2 for ; Thu, 29 May 2025 02:42:23 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.12289.1748486537464769730 for ; Wed, 28 May 2025 19:42:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=Wo+H81RE; spf=pass (domain: konsulko.com, ip: 209.85.216.53, mailfrom: tim.orling@konsulko.com) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-3109f106867so472049a91.1 for ; Wed, 28 May 2025 19:42:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486536; x=1749091336; 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=UmRt8Ms4cHicRXKaFF+6/iLHOg2bv/pF5iKfKFCWGZI=; b=Wo+H81REdPOouOwkDCeJZ2yqd5LcjxMMPzhnSn9DKmKxBDu5TV5lQBzfF8L5yZI4Uj //3vs5YtKD22yCbMsawWxvW7L93CaJrL3kbOg6ACsOekQI+CVRloNx+LO6pbGYH58oMo JE7eybIu15j3xWtsj1IhK2FGR9ICLeyDLcRBs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486536; x=1749091336; 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=UmRt8Ms4cHicRXKaFF+6/iLHOg2bv/pF5iKfKFCWGZI=; b=e+gFlAIgKpK0FPpiX0f+w6efPBeovaYcSlaWptnipQ4zVklR6qf3W3jZ3UqXGLjAvf 16E5tx1QU8SI4LJt/ZRYRcK/i4E8rFXPUZeaA7ReHRg2meNiSIR0Lmj0EnqEdY8+KGQH Hjhhz9zdzjTTQysqXZ/rOTxVn+NJQQUiMT/dOnfBG0434BKy1OGeFkxB8qfxsUT4jl64 ONm3AtPdwEBoDtSQXUOcY+9YYtIiKjVUlrhAQKZYaGi4UvqANbBUZil95Yt8jL1g6d3y u63b4bBiR4NtgmyY1PIn7bbeZ5SYbMLbRSvYWRrHl2uNaHQ+q0BPwpi3aq67reJnYn7h 1gAA== X-Gm-Message-State: AOJu0YwfOT3whKB75cc0nW+XZFK8Ys8JQIXD27qY0bENzfapVZtqo/Ck XSvc3bheQZaasbWcZgYOazqWAWUr44i0VtG6d16A0DEAsOoTmLEgf7w9Y9E3cV1vZFw3F2Xfule Di8Uxc17r9Q== X-Gm-Gg: ASbGnctB0nfUZnDy/mdoH4BTdujp1Vj0b3MpJQiOgURW7JVdpf1ciAPq0TYqJ9n5KEW t6bKijAMqFd0iwYuFvf52xtJHO5nSl7xcd86uA4+HYtmoGrR41q4X5DkIMGzGOl83j20NBS+37p o0BuunSro21BmjwH76tn4aluM+muFeaYjjbTeWER4fjqOEEhkoGoyp3D4Rpxf55jlZn3dFAuOot j3zMvWa1RTbNFJ4ViPxa+Qj2l7+NHWWHVyOaLX6T5IJ43wLXUQAetWWd/Whv2McUvhMAmpgFPWB SipSKJiUK5Zx4zXIPMfz1vD2xYFp5iVzZOmrpN9w5BJE1/f1CdJ+rp9GhbzcthVAx0fY6x4/0+u tasSdWlKGFLm/XMY= X-Google-Smtp-Source: AGHT+IEKaPJE5DFbT2Q0kz+wMEkJtHAtcNCGJ7q2MlTah1P4OsM28OSS57iNV+YNZiCfxG61nb3rnA== X-Received: by 2002:a17:90a:e710:b0:311:bdea:dca0 with SMTP id 98e67ed59e1d1-3121dcc544bmr991601a91.33.1748486536455; Wed, 28 May 2025 19:42:16 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3121b6fb2c2sm355156a91.2.2025.05.28.19.42.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:42:16 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 10/11] u-boot-tools.inc: Fix variable assignment whitespace Date: Wed, 28 May 2025 19:41:37 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:23 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1594 From: Tim Orling Recipes are much more readable with whitespace around the assignment operators. Fix various assignments in OE-Core to show this is definitely the preferred formatting. (From OE-Core rev: 30ea609d3357fb3de911f2f6a5e6856c151b976a) Signed-off-by: Richard Purdie Only apply to u-boot-tools.inc Signed-off-by: Tim Orling --- recipes-bsp/u-boot/u-boot-tools.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot-tools.inc b/recipes-bsp/u-boot/u-boot-tools.inc index 09b3c3f..278360c 100644 --- a/recipes-bsp/u-boot/u-boot-tools.inc +++ b/recipes-bsp/u-boot/u-boot-tools.inc @@ -2,7 +2,7 @@ SUMMARY = "U-Boot bootloader tools" DEPENDS += "gnutls openssl util-linux swig-native" inherit python3native -export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" +export STAGING_INCDIR = "${STAGING_INCDIR_NATIVE}" PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage" PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native" From patchwork Thu May 29 02:41:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63794 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 76FE9C5B552 for ; Thu, 29 May 2025 02:42:23 +0000 (UTC) Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by mx.groups.io with SMTP id smtpd.web11.12381.1748486539607064738 for ; Wed, 28 May 2025 19:42:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=GN+/+IbA; spf=pass (domain: konsulko.com, ip: 209.85.216.67, mailfrom: tim.orling@konsulko.com) Received: by mail-pj1-f67.google.com with SMTP id 98e67ed59e1d1-3119822df05so416848a91.0 for ; Wed, 28 May 2025 19:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748486539; x=1749091339; 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=jtFhq8bQ9uIfdumAAVywI9DPtPtGmWoXY7eYbpNrmHM=; b=GN+/+IbAYMO+gQeMgzjPMUP9VFsS6CMaM05rCwR3sVwrrE1VSBH/VWJKNhbH9JIKdZ ZjBjz8Ex4wPvcqKQHV/+TfYKXMS8PlGVtAbantkqivpxfK4WYuLX6d0YmFtmFwJRKMCa /GKCAWtlY/sZ4am6s87t1gxAYEc9zT1y26DXo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748486539; x=1749091339; 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=jtFhq8bQ9uIfdumAAVywI9DPtPtGmWoXY7eYbpNrmHM=; b=gPH/g+Eu34HD2/cUrQvrdXKUea1DoaO5U4smSw2s6e/T6kiun0w5VpoNZnORqgkYRF eiug3xNL26m9ptPi5iXhBCgpO9USCkYt7GiED0HsZ5/VW3Xx1wU7lZg1m/wlG/VuoO9/ mr2r34itTea9ALGekzUPlrTIWROlKA9yIvlo54jYQDzR8JDcQhUQz4y56FxF5beOfcuv bsfRPzfHV5QShzOBEDJ6iryXGj/EvFd2EDiDUuRbCYjOI7zBS8zO9KgeeKYsnEif73q3 PtrxlloyWX0G7nOl7QLsRE05LaK21tayE/lAPXCi7+ehyY8gOT9W0NcNIQq+WNtIHIPu /SBA== X-Gm-Message-State: AOJu0YyOcUQG2+iGbjU5COu+J/W8aberN+UvMcfcMh8v1GVVYRkr56Y7 JobE6xB7pg4LbEBF6DGxYgyLCgJzz3VtSg9gQ6DhSwl/UdIsBXMPNjt30pp2NxXyP/WDoCtF2LP 3/Y5tSc7KwPiP X-Gm-Gg: ASbGncvVcxoOjBindXZxKw9HaNL6n9SrhU9/6BZybmyfBgh4ZkEEa9W6gzqq7KdVHSr rPOeh4CEBLQ96xprnvMBqlWgeAR/F8TkdbJda8f+WLMXA/zHPYztDO30a6oPGQ5HgIcX+mAX4if LayHLkEGqzh+Onxgq0DLY6tXexAsNshSB+UUxBo5g+QaIBGHwqdir/8BnR5EPY55SYsf3k6Q9Jp /l+OL+W/hp5vC67Wh6AYcY0LrG+JIWzBRXfr1BbDM6KoB7+X4O4dATAWd93NxovRhxH/i+mBiu1 5yXnYxOnnbs7uO8lhEJCI3TYuaL0V1TCjh6rJeeQaqijPlEJHaVyHIN8F0uGywZtol/DIA/sREB jZg3S2qCh+CC2l8g= X-Google-Smtp-Source: AGHT+IFJxFKl8PqfssO1R5oDxUtjtNCJiy2aMwCEVMThDMzQuz9oNOG758cADfnM0GLAsGz1d2peNg== X-Received: by 2002:a17:90b:1910:b0:311:a314:c2d9 with SMTP id 98e67ed59e1d1-311a314c48bmr12514183a91.9.1748486538552; Wed, 28 May 2025 19:42:18 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3121b91c16asm352208a91.22.2025.05.28.19.42.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 19:42:18 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Subject: [PATCH 11/11] u-boot: upgrade 2025.01 -> 2025.04 Date: Wed, 28 May 2025 19:41:38 -0700 Message-ID: <68856926465b56b98599ab2506fceb0d1bcfad5b.1748486276.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 02:42:23 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1595 From: Fabio Estevam Upgrade to U-Boot 2025.04. While at it, pass the tag parameter in SRC_URI. (From OE-Core rev: 4a1671159ec05e9b013a7fd31f65d50302e657e0) Signed-off-by: Fabio Estevam Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Tim Orling --- recipes-bsp/u-boot/u-boot-common.inc | 4 ++-- .../{u-boot-tools_2025.01.bb => u-boot-tools_2025.04.bb} | 0 recipes-bsp/u-boot/{u-boot_2025.01.bb => u-boot_2025.04.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename recipes-bsp/u-boot/{u-boot-tools_2025.01.bb => u-boot-tools_2025.04.bb} (100%) rename recipes-bsp/u-boot/{u-boot_2025.01.bb => u-boot_2025.04.bb} (100%) diff --git a/recipes-bsp/u-boot/u-boot-common.inc b/recipes-bsp/u-boot/u-boot-common.inc index fc86024..fd1eab5 100644 --- a/recipes-bsp/u-boot/u-boot-common.inc +++ b/recipes-bsp/u-boot/u-boot-common.inc @@ -12,9 +12,9 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "6d41f0a39d6423c8e57e92ebbe9f8c0333a63f72" +SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a" -SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" +SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}" S = "${WORKDIR}/git" B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-tools_2025.01.bb b/recipes-bsp/u-boot/u-boot-tools_2025.04.bb similarity index 100% rename from recipes-bsp/u-boot/u-boot-tools_2025.01.bb rename to recipes-bsp/u-boot/u-boot-tools_2025.04.bb diff --git a/recipes-bsp/u-boot/u-boot_2025.01.bb b/recipes-bsp/u-boot/u-boot_2025.04.bb similarity index 100% rename from recipes-bsp/u-boot/u-boot_2025.01.bb rename to recipes-bsp/u-boot/u-boot_2025.04.bb From patchwork Thu May 29 03:24:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 63797 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 BC132C54FB3 for ; Thu, 29 May 2025 03:25:23 +0000 (UTC) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by mx.groups.io with SMTP id smtpd.web10.12820.1748489123067700799 for ; Wed, 28 May 2025 20:25:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@konsulko.com header.s=google header.b=F1CFZ4AG; spf=pass (domain: konsulko.com, ip: 209.85.210.195, mailfrom: tim.orling@konsulko.com) Received: by mail-pf1-f195.google.com with SMTP id d2e1a72fcca58-742af848148so245760b3a.1 for ; Wed, 28 May 2025 20:25:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1748489122; x=1749093922; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=neeaq75vTwnWJuTUP94mzo7ZeiY7HOakrFkZ/VbYSrQ=; b=F1CFZ4AGm7DiK+qj+hDcucbAcrxGWm5slUBFPIES58Tfjo5/t5QoBYIJk0yXRPmh6R XyVKFivCkQvRzCDx/pjh3jw2PTKKIn786n3SifAkTZmGItNIuD5uKVK7dtp3IFEVLAdt BsHjuRKnBis974IUiC8le0Sh9M3zpdNXT7mKA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748489122; x=1749093922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=neeaq75vTwnWJuTUP94mzo7ZeiY7HOakrFkZ/VbYSrQ=; b=EzpPe32RV+UBKrDiFc3hKdo+bRTEDY+JuX/HP5eYAZ90BC5QCYyBR3LkLLmWbxswTZ SnX7apJUzRjcpKEprigafsfMQwFHtXcQBQnCwRU6eZMW44AF9TBeZYph1Dy78IF9NUnI tJbxPhbmlNPtIqRepfDuQpP+GuRhxq1jSO8aOMzU59vecJOFDrZ00gH0VXg0uM01kgWW sP7SdK4vqx2GxFhRfNnArcR8PToBG64Ty5hSvYindLJxsiuSdR2UXI26HmYoUk0w78IU gCQuoENrFjQnOGk4Cgc5mHu15wT7rw1nWY4n9CGyhEmZMdgtBE7qGt6iwHA+Iyv3UYUy MVuA== X-Gm-Message-State: AOJu0YzlIzUw3/Q9+9ude/sTxeSxEBi8MKTcUU6sEoE89pC8JfTivfsn tplONis4NFtBvP3qqXxvhVz3sEIJeL0Ft4vvwsx06hZm41cYL3bu3oPuP5a4twK/z86cnP5x5gt QpltR5Y4/t6Qq X-Gm-Gg: ASbGncvYMcPbQA+LWigwISMOR/2b5pkRzQkK1BCLJm5xge7ODYdibszGjviFoN2cRDN 9h4ygJ26TldBm8y6zpVVH80gw0VeFg5D7nWCpFfmxaWGrHGLoCp93npdMP3DiUDwO2E1mDmxvRi tWwfUM1Lgwoy52GVRHzrQsJ7fqRBbc/qIBENSzhTrYjZsqCX5ZdH/cgIHLNU/3vNwxM2emhiUqW gBXfwdqBFBRdP6GZXVcoyXX6OUIDw04gFajdF6YBmD6xWBrFlO9IVMcG1pmNM1Y5ZdSjmnoQfeO AXGXrYgGGumt+IQ3b8lk4oc9IiZIz5gJR/p+ReFd+KF3hkQLYHsz/w/U+mGVa57O8/96aaxDjk5 GmE6cqZ+Jc06f2ClWUpJAiotGPw== X-Google-Smtp-Source: AGHT+IEJ1dg6GBYAtI21ytIEVUGhF/f+n9Ul7YpTmqNUJRXFz1/RutfdVYscXLHuhx4EXcJuVDy+9g== X-Received: by 2002:a05:6a00:114c:b0:740:596b:4a7f with SMTP id d2e1a72fcca58-745fe035e92mr27902618b3a.16.1748489121869; Wed, 28 May 2025 20:25:21 -0700 (PDT) Received: from localhost (c-98-232-159-17.hsd1.or.comcast.net. [98.232.159.17]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-747affd41d7sm342022b3a.123.2025.05.28.20.25.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 20:25:21 -0700 (PDT) From: tim.orling@konsulko.com To: yocto-patches@lists.yoctoproject.org Cc: Tim Orling Subject: [PATCH 12/12] u-boot-common.inc: drop tag from SRC_URI Date: Wed, 28 May 2025 20:24:41 -0700 Message-ID: <20250529032517.774042-1-tim.orling@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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, 29 May 2025 03:25:23 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/1596 From: Tim Orling Fixes parsing error: WARNING: .../meta-lts-mixins/recipes-bsp/u-boot/u-boot_2025.04.bb: Exception during build_dependencies for fetcher_hashes_dummyfunc| ETA: --:--:-- WARNING: .../meta-lts-mixins/recipes-bsp/u-boot/u-boot_2025.04.bb: Error during finalise of .../meta-lts-mixins/recipes-bsp/u-boot/u-boot_2025.04.bb ERROR: ExpansionError during parsing .../meta-lts-mixins/recipes-bsp/u-boot/u-boot_2025.04.bb | ETA: 0:01:39 bb.data_smart.ExpansionError: Failure expanding variable fetcher_hashes_dummyfunc[vardepvalue], expression was ${@bb.fetch.get_hashvalue(d)} which triggered exception FetchError: Fetcher failure: Conflicting revisions (34820924edbc4ec7803eb89d9852f4b870fa760a from SRCREV and v2025.04 from the url) found, please specify one valid value The variable dependency chain for the failure is: fetcher_hashes_dummyfunc[vardepvalue] ERROR: Parsing halted due to errors, see error messages above WARNING: .../meta-lts-mixins/recipes-bsp/u-boot/u-boot-tools_2025.04.bb: Exception during build_dependencies for fetcher_hashes_dummyfunc WARNING: .../meta-lts-mixins/recipes-bsp/u-boot/u-boot-tools_2025.04.bb: Error during finalise of .../meta-lts-mixins/recipes-bsp/u-boot/u-boot-tools_2025.04.bb Signed-off-by: Tim Orling --- recipes-bsp/u-boot/u-boot-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot-common.inc b/recipes-bsp/u-boot/u-boot-common.inc index fd1eab5..b0ea013 100644 --- a/recipes-bsp/u-boot/u-boot-common.inc +++ b/recipes-bsp/u-boot/u-boot-common.inc @@ -14,7 +14,7 @@ PE = "1" # repo during parse SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a" -SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}" +SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" S = "${WORKDIR}/git" B = "${WORKDIR}/build"