bmips: tweak Kconfig options

Add patch to reduce and improve selected bmips kernel config options.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

3 files changed, 49 insertions, 16 deletions

diff --git a/target/linux/bmips/config-5.15 b/target/linux/bmips/config-5.15
index a66443eaba..f1d7752bd8 100644
--- a/target/linux/bmips/config-5.15
+++ b/target/linux/bmips/config-5.15
@@ -12,9 +12,7 @@ CONFIG_BCM6345_EXT_IRQ=y
 CONFIG_BCM6345_L1_IRQ=y
 CONFIG_BCM6368_ENETSW=y
 CONFIG_BCM63XX_POWER=y
-CONFIG_BCM7038_L1_IRQ=y
 CONFIG_BCM7038_WDT=y
-CONFIG_BCM7120_L2_IRQ=y
 CONFIG_BCMA=y
 CONFIG_BCMA_BLOCKIO=y
 # CONFIG_BCMA_DEBUG is not set
@@ -28,8 +26,6 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_PM=y
 CONFIG_BMIPS_GENERIC=y
-CONFIG_BOARD_SCACHE=y
-CONFIG_BRCMSTB_L2_IRQ=y
 CONFIG_CEVT_R4K=y
 CONFIG_CLK_BCM63268_TIMER=y
 CONFIG_CLK_BCM_63XX_GATE=y
@@ -41,7 +37,6 @@ CONFIG_CPU_BMIPS=y
 CONFIG_CPU_BMIPS32_3300=y
 CONFIG_CPU_BMIPS4350=y
 CONFIG_CPU_BMIPS4380=y
-CONFIG_CPU_BMIPS5000=y
 CONFIG_CPU_GENERIC_DUMP_TLB=y
 CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_RIXI=y
@@ -56,7 +51,6 @@ CONFIG_CPU_SUPPORTS_CPUFREQ=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRC16=y
-CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
@@ -151,12 +145,11 @@ CONFIG_MIPS_ASID_SHIFT=0
 CONFIG_MIPS_CLOCK_VSYSCALL=y
 # CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set
 CONFIG_MIPS_CMDLINE_FROM_DTB=y
-CONFIG_MIPS_CPU_SCACHE=y
 CONFIG_MIPS_EBPF_JIT=y
 CONFIG_MIPS_EXTERNAL_TIMER=y
-CONFIG_MIPS_L1_CACHE_SHIFT=7
+CONFIG_MIPS_L1_CACHE_SHIFT=6
+CONFIG_MIPS_L1_CACHE_SHIFT_4=y
 CONFIG_MIPS_L1_CACHE_SHIFT_6=y
-CONFIG_MIPS_L1_CACHE_SHIFT_7=y
 CONFIG_MIPS_LD_CAN_LINK_VDSO=y
 # CONFIG_MIPS_NO_APPENDED_DTB is not set
 CONFIG_MIPS_NR_CPU_NR_MAP=2
@@ -196,6 +189,7 @@ CONFIG_OF_IRQ=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_MDIO=y
 CONFIG_PADATA=y
+CONFIG_PAHOLE_VERSION=0
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_BCM6318=y
@@ -271,13 +265,10 @@ CONFIG_SYS_HAS_CPU_BMIPS=y
 CONFIG_SYS_HAS_CPU_BMIPS32_3300=y
 CONFIG_SYS_HAS_CPU_BMIPS4350=y
 CONFIG_SYS_HAS_CPU_BMIPS4380=y
-CONFIG_SYS_HAS_CPU_BMIPS5000=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_SYS_SUPPORTS_HIGHMEM=y
 CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_SMP=y
 CONFIG_TARGET_ISA_REV=0
 CONFIG_TICK_CPU_ACCOUNTING=y
diff --git a/target/linux/bmips/patches-5.15/220-mips-bmips-tweak-Kconfig-options.patch b/target/linux/bmips/patches-5.15/220-mips-bmips-tweak-Kconfig-options.patch
new file mode 100644
index 0000000000..83684fc1b7
--- /dev/null
+++ b/target/linux/bmips/patches-5.15/220-mips-bmips-tweak-Kconfig-options.patch
@@ -0,0 +1,42 @@
+From 20a4b57c0fafd23ae0f6bcab5b5adf4af4c80280 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Thu, 16 Mar 2023 19:31:21 +0100
+Subject: [PATCH] mips: bmips: tweak Kconfig options
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -274,25 +274,20 @@ config BMIPS_GENERIC
+ 	select SYNC_R4K
+ 	select COMMON_CLK
+ 	select BCM6345_L1_IRQ
+-	select BCM7038_L1_IRQ
+-	select BCM7120_L2_IRQ
+-	select BRCMSTB_L2_IRQ
+ 	select IRQ_MIPS_CPU
+ 	select DMA_NONCOHERENT
+ 	select SYS_SUPPORTS_32BIT_KERNEL
+-	select SYS_SUPPORTS_LITTLE_ENDIAN
+ 	select SYS_SUPPORTS_BIG_ENDIAN
+-	select SYS_SUPPORTS_HIGHMEM
+ 	select SYS_HAS_CPU_BMIPS32_3300
+ 	select SYS_HAS_CPU_BMIPS4350
+ 	select SYS_HAS_CPU_BMIPS4380
+-	select SYS_HAS_CPU_BMIPS5000
+ 	select SWAP_IO_SPACE
+ 	select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
+ 	select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
+ 	select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
+ 	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
+ 	select HARDIRQS_SW_RESEND
++	select MIPS_L1_CACHE_SHIFT_4
+ 	help
+ 	  Build a generic DT-based kernel image that boots on select
+ 	  BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top
diff --git a/target/linux/bmips/patches-5.15/600-mips-bmips-add-pci-support.patch b/target/linux/bmips/patches-5.15/600-mips-bmips-add-pci-support.patch
index b10dd8d432..0d0967fa97 100644
--- a/target/linux/bmips/patches-5.15/600-mips-bmips-add-pci-support.patch
+++ b/target/linux/bmips/patches-5.15/600-mips-bmips-add-pci-support.patch
@@ -1,9 +1,9 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -277,6 +277,7 @@ config BMIPS_GENERIC
- 	select BCM7038_L1_IRQ
- 	select BCM7120_L2_IRQ
- 	select BRCMSTB_L2_IRQ
+@@ -274,6 +274,7 @@ config BMIPS_GENERIC
+ 	select SYNC_R4K
+ 	select COMMON_CLK
+ 	select BCM6345_L1_IRQ
 +	select HAVE_PCI
  	select IRQ_MIPS_CPU
  	select DMA_NONCOHERENT