diff mbox series

[mickledore] arm/linux-yocto: remove defconfig patch

Message ID 20231020142911.2755434-1-ross.burton@arm.com
State New
Headers show
Series [mickledore] arm/linux-yocto: remove defconfig patch | expand

Commit Message

Ross Burton Oct. 20, 2023, 2:29 p.m. UTC 
From: Jon Mason <jon.mason@arm.com>

Mikko Rapeli upstreamed the patch for the Nuvoton defconfig issue and it
has been pulled back the 6.1 kernel.  So, it is no longer needed here.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ...config-Add-Nuvoton-NPCM-family-suppo.patch | 45 -------------------
 .../linux/linux-yocto-rt_6.1%.bbappend        |  1 -
 .../linux/linux-yocto_6.1%.bbappend           |  1 -
 3 files changed, 47 deletions(-)
 delete mode 100644 meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch

Comments

Jon Mason Oct. 25, 2023, 1:33 a.m. UTC | #1 
On Fri, 20 Oct 2023 15:29:11 +0100, ross.burton@arm.com wrote:
> Mikko Rapeli upstreamed the patch for the Nuvoton defconfig issue and it
> has been pulled back the 6.1 kernel.  So, it is no longer needed here.
> 
> 

Applied, thanks!

[1/1] arm/linux-yocto: remove defconfig patch
      commit: bbe2d63100a2554e7bf7f41d48e307f1bc386319

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch b/meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch
deleted file mode 100644
index d5b5363a..00000000
--- a/meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch
+++ /dev/null
@@ -1,45 +0,0 @@ 
-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-rt_6.1%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend
index e6d50a4b..94d3398c 100644
--- a/meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend
+++ b/meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend
@@ -2,5 +2,4 @@ 
 FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
 SRC_URI:append:aarch64 = " \
     file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \
-    file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \
     "
diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend
index e6d50a4b..94d3398c 100644
--- a/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend
+++ b/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend
@@ -2,5 +2,4 @@ 
 FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
 SRC_URI:append:aarch64 = " \
     file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \
-    file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \
     "