diff mbox series

arm/linux-yocto: avoid kernel defconfig warning

Message ID 20230202142850.795987-1-jon.mason@arm.com
State New
Headers show
Series arm/linux-yocto: avoid kernel defconfig warning | expand

Commit Message

Jon Mason Feb. 2, 2023, 2:28 p.m. UTC 
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 <jon.mason@arm.com>
---
 ...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

Comments

Jon Mason Feb. 5, 2023, 10 a.m. UTC | #1 
On Thu, 2 Feb 2023 09:28:50 -0500, Jon Mason wrote:
> 2 symbols were added to the arm64 kernel defconfig without the
> corresponding code.  Remove these unnecessary pieces to avoid the
> warning.

Applied, thanks!

[1/1] arm/linux-yocto: avoid kernel defconfig warning
      commit: dc10b73cc54fccbe781992b5b1eaf61cffbe07e6

Best regards,
diff mbox series

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 <jdmason@kudzu.us>
+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 <jon.mason@arm.com>
+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 <jdmason@kudzu.us>
+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 <jon.mason@arm.com>
+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 \