realtek: 6.12: adapt platform patch

Upstream has integrated the Realtek target into the generic MIPS
initialization and so MACH_REALTEK_RTL has gained some new features.
Especially:

- CONFIG_MACH_GENERIC_CORE generates central modules
- board-realtek module adds device specific extensions

The current downstream initialization works well and upgrading to
kernel 6.12 is not the right time to harmonize this. Modify the
MACH definitions to the current needs.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/18935
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/realtek/patches-6.12/300-mips-add-rtl838x-platform.patch b/target/linux/realtek/patches-6.12/300-mips-add-rtl838x-platform.patch
index bb89a7864fe49a41b248f99107d0cb869ea08aa5..b15decaa936de606eea66c702b3bef267fab4c7b 100644 (file)
--- a/target/linux/realtek/patches-6.12/300-mips-add-rtl838x-platform.patch
+++ b/target/linux/realtek/patches-6.12/300-mips-add-rtl838x-platform.patch
@@ -21,11 +21,12 @@ Submitted-by: Birger Koblitz <git@birger-koblitz.de>
  platform-$(CONFIG_SGI_IP28)           += sgi-ip22/
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -620,21 +620,23 @@ config RALINK
+@@ -651,23 +651,24 @@ config RALINK
  
  config MACH_REALTEK_RTL
        bool "Realtek RTL838x/RTL839x based machines"
 -      select MIPS_GENERIC
+-      select MACH_GENERIC_CORE
        select DMA_NONCOHERENT
        select IRQ_MIPS_CPU
 -      select CSRC_R4K
@@ -40,6 +41,7 @@ Submitted-by: Birger Koblitz <git@birger-koblitz.de>
        select BOOT_RAW
        select PINCTRL
        select USE_OF
+       select REALTEK_OTTO_TIMER
 +      select NO_EXCEPT_FILL
 +      select SYS_SUPPORTS_HIGHMEM
 +      select SYS_HAS_EARLY_PRINTK
@@ -50,9 +52,9 @@ Submitted-by: Birger Koblitz <git@birger-koblitz.de>
  
  config SGI_IP22
        bool "SGI IP22 (Indy/Indigo2)"
-@@ -970,6 +972,36 @@ config CAVIUM_OCTEON_SOC
- 
- endchoice
+@@ -1011,6 +1012,36 @@ config FIT_IMAGE_FDT_EPM5
+         from Mobileye in the FIT kernel image.
+         This requires u-boot on the platform.
  
 +config RTL838X
 +      bool "Realtek RTL838X based platforms"

diff --git a/target/linux/realtek/patches-6.12/306-disable-upstream-realtek-board.patch b/target/linux/realtek/patches-6.12/306-disable-upstream-realtek-board.patch
new file mode 100644 (file)
index 0000000..62dd642
--- /dev/null
+++ b/target/linux/realtek/patches-6.12/306-disable-upstream-realtek-board.patch
@@ -0,0 +1,16 @@
+From: Markus Stockhausen <markus.stockhausen@gmx.de>
+Subject: [PATCH] realtek: disable upstream Realtek board
+
+Upstream now has integrated the Realtek target into the generic
+MIPS initialization. For now disable the board compilation.
+
+Submitted-by: Markus Stockhausen <markus.stockhausen@gmx.de>
+---
+--- a/arch/mips/generic/Makefile
++++ b/arch/mips/generic/Makefile
+@@ -13,4 +13,4 @@ obj-$(CONFIG_LEGACY_BOARD_SEAD3)     += boar
+ obj-$(CONFIG_LEGACY_BOARD_OCELOT)     += board-ocelot.o
+ obj-$(CONFIG_MACH_INGENIC)                    += board-ingenic.o
+ obj-$(CONFIG_VIRT_BOARD_RANCHU)               += board-ranchu.o
+-obj-$(CONFIG_MACH_REALTEK_RTL)                += board-realtek.o
++# obj-$(CONFIG_MACH_REALTEK_RTL)              += board-realtek.o