From patchwork Thu Feb 2 14:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 19009 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 DFD45C636CC for ; Sat, 4 Feb 2023 09:16:49 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.2745.1675502200515559179 for ; Sat, 04 Feb 2023 01:16:40 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 24E0BC14 for ; Sat, 4 Feb 2023 01:17:22 -0800 (PST) Received: from jdm-VirtualBox.fosdem.net?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 864813F71E for ; Sat, 4 Feb 2023 01:16:39 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH] arm/linux-yocto: avoid kernel defconfig warning Date: Thu, 2 Feb 2023 09:28:50 -0500 Message-Id: <20230202142850.795987-1-jon.mason@arm.com> X-Mailer: git-send-email 2.25.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 ; Sat, 04 Feb 2023 09:16:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4357 2 symbols were added to the arm64 kernel defconfig without the corresponding code. Remove these unnecessary pieces to avoid the warning. Signed-off-by: Jon Mason --- ...4-defconfig-Enable-Tegra-MGBE-driver.patch | 28 ++++++++++++ ...config-Add-Nuvoton-NPCM-family-suppo.patch | 45 +++++++++++++++++++ .../linux/linux-yocto_%.bbappend | 5 +++ 3 files changed, 78 insertions(+) create mode 100644 meta-arm/recipes-kernel/linux/files/0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch create mode 100644 meta-arm/recipes-kernel/linux/files/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch diff --git a/meta-arm/recipes-kernel/linux/files/0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch b/meta-arm/recipes-kernel/linux/files/0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch new file mode 100644 index 00000000..995bc2c5 --- /dev/null +++ b/meta-arm/recipes-kernel/linux/files/0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch @@ -0,0 +1,28 @@ +From 7bc0bae10b0f21cfc8df23848844b66bf1b4d751 Mon Sep 17 00:00:00 2001 +From: Jon Mason +Date: Fri, 3 Feb 2023 05:16:43 -0500 +Subject: [PATCH 1/2] Revert "arm64: defconfig: Enable Tegra MGBE driver" + +This reverts commit 4cac4de4b05f0a1d5920d12278bf8787011661d3. + +Signed-off-by: Jon Mason +Upstream-Status: Inappropriate +--- + arch/arm64/configs/defconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig +index 0b6af3348e79..70919b241469 100644 +--- a/arch/arm64/configs/defconfig ++++ b/arch/arm64/configs/defconfig +@@ -362,7 +362,6 @@ CONFIG_SMSC911X=y + CONFIG_SNI_AVE=y + CONFIG_SNI_NETSEC=y + CONFIG_STMMAC_ETH=m +-CONFIG_DWMAC_TEGRA=m + CONFIG_TI_K3_AM65_CPSW_NUSS=y + CONFIG_QCOM_IPA=m + CONFIG_MESON_GXL_PHY=m +-- +2.30.2 + diff --git a/meta-arm/recipes-kernel/linux/files/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch b/meta-arm/recipes-kernel/linux/files/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch new file mode 100644 index 00000000..d5b5363a --- /dev/null +++ b/meta-arm/recipes-kernel/linux/files/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch @@ -0,0 +1,45 @@ +From 891eeb87cddb0d52bc9eac39afcca5027a660be6 Mon Sep 17 00:00:00 2001 +From: Jon Mason +Date: Fri, 3 Feb 2023 05:21:07 -0500 +Subject: [PATCH 2/2] Revert "arm64: defconfig: Add Nuvoton NPCM family + support" + +This reverts commit 45472f1e5348c7b755b4912f2f529ec81cea044b + +Signed-off-by: Jon Mason +Upstream-Status: Inappropriate +--- + arch/arm64/configs/defconfig | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig +index 70919b241469..4f09b80a1b96 100644 +--- a/arch/arm64/configs/defconfig ++++ b/arch/arm64/configs/defconfig +@@ -51,7 +51,6 @@ CONFIG_ARCH_MESON=y + CONFIG_ARCH_MVEBU=y + CONFIG_ARCH_NXP=y + CONFIG_ARCH_MXC=y +-CONFIG_ARCH_NPCM=y + CONFIG_ARCH_QCOM=y + CONFIG_ARCH_RENESAS=y + CONFIG_ARCH_ROCKCHIP=y +@@ -637,7 +636,6 @@ CONFIG_UNIPHIER_WATCHDOG=y + CONFIG_PM8916_WATCHDOG=m + CONFIG_BCM2835_WDT=y + CONFIG_BCM7038_WDT=m +-CONFIG_NPCM7XX_WATCHDOG=y + CONFIG_MFD_ALTERA_SYSMGR=y + CONFIG_MFD_BD9571MWV=y + CONFIG_MFD_AXP20X_I2C=y +@@ -1049,7 +1047,6 @@ CONFIG_COMMON_CLK_FSL_SAI=y + CONFIG_COMMON_CLK_S2MPS11=y + CONFIG_COMMON_CLK_PWM=y + CONFIG_COMMON_CLK_VC5=y +-CONFIG_COMMON_CLK_NPCM8XX=y + CONFIG_COMMON_CLK_BD718XX=m + CONFIG_CLK_RASPBERRYPI=m + CONFIG_CLK_IMX8MM=y +-- +2.30.2 + diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend index a641ec2d..24154275 100644 --- a/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend @@ -3,9 +3,14 @@ ARMFILESPATHS := "${THISDIR}/files:" COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64" FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}" SRC_URI:append:generic-arm64 =" \ + file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \ + file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \ file://generic-arm64-kmeta;type=kmeta;destsuffix=generic-arm64-kmeta \ " + + + FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}" SRC_URI:append:qemuarm64-secureboot = " \ file://tee.cfg \