From patchwork Fri Oct 7 16:46:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13631 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 3A10EC433F5 for ; Fri, 7 Oct 2022 16:47:16 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by mx.groups.io with SMTP id smtpd.web11.7002.1665161229777958614 for ; Fri, 07 Oct 2022 09:47:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=liDZYqpW; spf=pass (domain: gmail.com, ip: 209.85.218.51, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f51.google.com with SMTP id 13so12579069ejn.3 for ; Fri, 07 Oct 2022 09:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sW29xfLFg/4vghfRXGZLMMkDJITI65v6X3rDVwqlnM0=; b=liDZYqpWM6L4HEt83nlsSl7xbZAHo1hdtWe2uClPylVOuVSjOuoPCqfqinG2d6g+tg uath50LeeNHLo6CMoLycUhZaBsZFleh4cUHJzUqutZo/QE1pqueAOKsMJOMkzVriveFl jzflMlpDOC8wvPztU9jrlBfTU9fy+SdTGAZQzkcPtdstwl84fMKlBtir2prGrdTvI0UP +7AyyVXjMhXCOuIjSqLFeqUoafBn1sHEQe+XbdB4qn8yApV89gVO8OspGQM/7qxiJOVg gFdj5+Z2LWCtGdxbX24JG3hRkWZHbIAG1KYhkS6KAJ+90Q4ssiG9ybrcIZLVM+qQ0kqn OsAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sW29xfLFg/4vghfRXGZLMMkDJITI65v6X3rDVwqlnM0=; b=TG6rEOZ8xTMQ9qGocsth5640mF7UCsG7Xo8czD36LlsUg1XIoXNiuZSmtn7aYzIa4I YtPOuihg5gNdqo3vyQbSc3QRzhwyBfSdAr4OO2GegeR0UnXR9UpcYMI10PNifaiLcBPm DbB2+2QTVPkFjI6MAKcNRRntujgb0osoVMMCXV4XnMouVcui9LrxWzimlfd904L5WiF0 ZBBUMZp4nsY3t7Tbzx5PA8ipuU6fht2QDROc19Tx2zsjthrCQApZx3NyY/cPQ9mXfZbW GAYhw/3X8ml65sv7xNJ3Chno7jZKWsRxI1cVUu7VWa5IXUhNwMNgrG5WwVGK4BWuZjbE AfzA== X-Gm-Message-State: ACrzQf38ewu4u0A/V7TaR7FSlFAxHmAfZcNr1MoBuMNYU18miTb12Mym baFMv3ofFjeNirjrZcP3oZsTpGGseCM= X-Google-Smtp-Source: AMsMyM7SdZvPJFyMPaaUDx3L7qzsGbbUdJLduY/WAiE/CiOv5R3Zfe1ChYZOgTtzhyOVsYWJ4T2oDw== X-Received: by 2002:a17:907:6d84:b0:78d:36d8:b797 with SMTP id sb4-20020a1709076d8400b0078d36d8b797mr5014360ejc.704.1665161227683; Fri, 07 Oct 2022 09:47:07 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id ch8-20020a0564021bc800b00459ad800bbcsm1802171edb.33.2022.10.07.09.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 09:47:07 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [OE-Core][PATCH 1/2] u-boot: Remove duplicate inherit of cml1 Date: Fri, 7 Oct 2022 17:46:41 +0100 Message-Id: <20221007164640.17471-1-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 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, 07 Oct 2022 16:47:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/171530 Splitting u-boot-configure.inc out of the base left duplicate cml1.bbclass in the base include. Fixes: fc9a17ad386c ("u-boot: Split do_configure logic into separate file") Signed-off-by: Alex Kiernan --- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index f022aed732ce..b2f33e382664 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS += "${@bb.utils.contains('UBOOT_ENV_SUFFIX', 'scr', 'u-boot-mkimage-native', '', d)}" -inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch +inherit uboot-config uboot-extlinux-config uboot-sign deploy python3native kernel-arch DEPENDS += "swig-native" From patchwork Fri Oct 7 16:46:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13632 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 14C90C433FE for ; Fri, 7 Oct 2022 16:47:26 +0000 (UTC) Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by mx.groups.io with SMTP id smtpd.web08.6714.1665161238729671002 for ; Fri, 07 Oct 2022 09:47:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KsBsc5Bc; spf=pass (domain: gmail.com, ip: 209.85.208.50, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f50.google.com with SMTP id a13so7874932edj.0 for ; Fri, 07 Oct 2022 09:47:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=Oi3jrDvys5fGhmica4PauZdfe13PsaNtMmYOk63ns8I=; b=KsBsc5BcB3PFy9rLjDn3Ij3kIPo9YkHoYeEtq80vwi236/VSI0rkShU2D2IiLyHGbT G/DdGyE229HV1hsIbsID3W0MVPKvE62GHbhDkWuIVZXqiGn/nT8N14wZ6bohdJQN+IXw 6FxtoNdGWnzWudedRWITNisf/gxvjcYYg1iVvYnv6rTiE+jSk5jOb10C7oYL7CuF4N5K SmhWlzcCtPtN7ymYtZBiCnRykoNuyUuu2Ev2RIpLpu6AYDsTsSBBy9dNnnPsIcfn/Cfp jl0GToHoDIqh8bvZj+/wJWNTPSGECcds8AvFgUDazl4e4TwfzU6/SLTgXSBBaTkWQmUu rYaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Oi3jrDvys5fGhmica4PauZdfe13PsaNtMmYOk63ns8I=; b=H0+0EKKyUjvVEq2pyw8XE59983HTDwM7GSNdzdasvcDWvGOL4FrEDR9cTYFhZ7by1h zyWKMp0GyK5014Qj2fsbO7qWmuJATVKSCSppNmqBRn8otDZ6R3VyGqV476dptPtHMQVp 2mwsYqnA839X5YetRyezRQSui1U4j5Nnmu5f75PY4OV54o96+9TTIpyc5hJMuqppWifk MAS673bJtRXU55P0bE7bc0fAYoWsLTsLhNR38WNDG6k7TpRBjkxHndfxWW1AYhwdKqkd OTidNU3Q1BqOlsOa0IqsvxXZC1SgKBM5oAvMUD66KKOsuyQjmxjTOpD8eB0+vvP6IZW8 fLhg== X-Gm-Message-State: ACrzQf29/WrXqv4cQDipnA86HVhMt+itGjj/vEWRnA7Kq94kzdKyjO3V qsWsLPfE9eNa8QCvudXQzSIZ4w6Pl5Y= X-Google-Smtp-Source: AMsMyM5UxwjB5CuYgYZbyunokEjiPBcy3tFLJl07vDrYJ7VjmLQcbVYEUDw8PbFgvC0YMyUcThxVQA== X-Received: by 2002:a05:6402:e9d:b0:443:7833:3d7b with SMTP id h29-20020a0564020e9d00b0044378333d7bmr5382383eda.151.1665161236838; Fri, 07 Oct 2022 09:47:16 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id ch8-20020a0564021bc800b00459ad800bbcsm1802171edb.33.2022.10.07.09.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 09:47:16 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [OE-Core][PATCH 2/2] u-boot: Add savedefconfig task Date: Fri, 7 Oct 2022 17:46:43 +0100 Message-Id: <20221007164640.17471-2-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221007164640.17471-1-alex.kiernan@gmail.com> References: <20221007164640.17471-1-alex.kiernan@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, 07 Oct 2022 16:47:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/171531 Add savedefconfig task which U-Boot supports (unfortunately not all consumers of cml1 support this). Signed-off-by: Alex Kiernan --- meta/recipes-bsp/u-boot/u-boot.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index b2f33e382664..5705e5835b21 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -26,6 +26,13 @@ UBOOT_LOCALVERSION ?= "" require u-boot-configure.inc +do_savedefconfig() { + bbplain "Saving defconfig to:\n${B}/defconfig" + oe_runmake -C ${B} savedefconfig +} +do_savedefconfig[nostamp] = "1" +addtask savedefconfig after do_configure + do_compile () { if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk