From fb4262dc3183bf8e6db72ff7f04fd9f23cd32d08 Mon Sep 17 00:00:00 2001 From: Rustam Adilov Date: Sat, 17 Oct 2026 14:24:48 +0500 Subject: [PATCH] realtek: merge the two mips/Kconfig patches There is no reason for rtl960x platform patch to be on its own when the 300-01-enhance-realtek-platform-config.patch touch the exact same place. Merge the two together. Signed-off-by: Rustam Adilov Link: https://github.com/openwrt/openwrt/pull/25949 Signed-off-by: Markus Stockhausen --- ...0-01-enhance-realtek-platform-config.patch | 25 ++++++++++++++++--- .../301-mips-add-rtl960x-platform.patch | 25 ------------------- 2 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 target/linux/realtek/patches-6.18/301-mips-add-rtl960x-platform.patch diff --git a/target/linux/realtek/patches-6.18/300-01-enhance-realtek-platform-config.patch b/target/linux/realtek/patches-6.18/300-01-enhance-realtek-platform-config.patch index a2155bc993b..745b72f1466 100644 --- a/target/linux/realtek/patches-6.18/300-01-enhance-realtek-platform-config.patch +++ b/target/linux/realtek/patches-6.18/300-01-enhance-realtek-platform-config.patch @@ -1,11 +1,12 @@ From fce11f68491b46b93df69de0630cd9edb90bc772 Mon Sep 17 00:00:00 2001 From: Birger Koblitz Date: Wed, 29 Dec 2021 21:54:21 +0100 -Subject: [PATCH] realtek: Create 4 different Realtek Platforms +Subject: [PATCH] realtek: Create 5 different Realtek Platforms Creates RTL83XX as a basic kernel config parameter for the -RTL838X, RTL839x, RTL930X and RTL931X platforms with respective -configurations for the SoCs, which are introduced in addition. +RTL838X, RTL839x, RTL930X, RTL931X and RTL960X platforms with +respective configurations for the SoCs, which are introduced in +addition. Submitted-by: Birger Koblitz --- @@ -38,7 +39,7 @@ Submitted-by: Birger Koblitz config SGI_IP22 bool "SGI IP22 (Indy/Indigo2)" -@@ -1056,6 +1060,37 @@ config FIT_IMAGE_FDT_EPM5 +@@ -1056,6 +1060,53 @@ config FIT_IMAGE_FDT_EPM5 from Mobileye in the FIT kernel image. This requires u-boot on the platform. @@ -72,6 +73,22 @@ Submitted-by: Birger Koblitz + select SYS_SUPPORTS_VPE_LOADER + select SYS_SUPPORTS_SMP + select SYS_SUPPORTS_MIPS_CPS ++ ++config RTL960X ++ bool "Realtek RTL960X based platforms" ++ depends on MACH_REALTEK_RTL ++ select MIPS_CPU_SCACHE ++ select SYS_SUPPORTS_MULTITHREADING ++ select MIPS_GIC ++ select COMMON_CLK ++ select CLKSRC_MIPS_GIC ++ select SYS_SUPPORTS_VPE_LOADER ++ select SYS_SUPPORTS_SMP ++ select SYS_SUPPORTS_MIPS_CPS ++ select HAVE_PCI ++ select PCI_DRIVERS_GENERIC ++ select SYS_SUPPORTS_ZBOOT ++ select MIPS_EXTERNAL_TIMER + source "arch/mips/alchemy/Kconfig" source "arch/mips/ath25/Kconfig" diff --git a/target/linux/realtek/patches-6.18/301-mips-add-rtl960x-platform.patch b/target/linux/realtek/patches-6.18/301-mips-add-rtl960x-platform.patch deleted file mode 100644 index 5db6833db5f..00000000000 --- a/target/linux/realtek/patches-6.18/301-mips-add-rtl960x-platform.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -1091,6 +1091,22 @@ config RTL931X - select SYS_SUPPORTS_SMP - select SYS_SUPPORTS_MIPS_CPS - -+config RTL960X -+ bool "Realtek RTL960X based platforms" -+ depends on MACH_REALTEK_RTL -+ select MIPS_CPU_SCACHE -+ select SYS_SUPPORTS_MULTITHREADING -+ select MIPS_GIC -+ select COMMON_CLK -+ select CLKSRC_MIPS_GIC -+ select SYS_SUPPORTS_VPE_LOADER -+ select SYS_SUPPORTS_SMP -+ select SYS_SUPPORTS_MIPS_CPS -+ select HAVE_PCI -+ select PCI_DRIVERS_GENERIC -+ select SYS_SUPPORTS_ZBOOT -+ select MIPS_EXTERNAL_TIMER -+ - source "arch/mips/alchemy/Kconfig" - source "arch/mips/ath25/Kconfig" - source "arch/mips/ath79/Kconfig"