summaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2024-06-18 21:04:22 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2024-06-18 21:58:29 +0200
commit157c7bd50c36d0577fe279db4d24705fcd9440ad (patch)
treeaec0041d4b730a32ab941cd9a0414712b6dacd6a /target/linux/bcm27xx
parent2cd6da257c4a9d0cfdf891fec96ff89240872986 (diff)
downloadopenwrt-157c7bd50c36d0577fe279db4d24705fcd9440ad.tar.gz
openwrt-157c7bd50c36d0577fe279db4d24705fcd9440ad.tar.bz2
openwrt-157c7bd50c36d0577fe279db4d24705fcd9440ad.zip
bcm27xx: remove 6.6 CONFIG_ARCH_BCM_63XX symbol
This symbol was removed upstream, but it was present on bcm27xx due to a malformed upstream RPi patch. Fixes: 8c405cdcccad ("bcm27xx: add 6.6 kernel patches") Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx')
-rw-r--r--target/linux/bcm27xx/config-6.61
-rw-r--r--target/linux/bcm27xx/patches-6.6/950-0103-Improve-__copy_to_user-and-__copy_from_user-performa.patch19
2 files changed, 1 insertions, 19 deletions
diff --git a/target/linux/bcm27xx/config-6.6 b/target/linux/bcm27xx/config-6.6
index a974862cea..55f5523ab5 100644
--- a/target/linux/bcm27xx/config-6.6
+++ b/target/linux/bcm27xx/config-6.6
@@ -1,4 +1,3 @@
-# CONFIG_ARCH_BCM_63XX is not set
# CONFIG_BACKLIGHT_RPI is not set
# CONFIG_BCM2712_MIP is not set
# CONFIG_COMMON_CLK_RP1 is not set
diff --git a/target/linux/bcm27xx/patches-6.6/950-0103-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/bcm27xx/patches-6.6/950-0103-Improve-__copy_to_user-and-__copy_from_user-performa.patch
index 9760b48893..2d546c7502 100644
--- a/target/linux/bcm27xx/patches-6.6/950-0103-Improve-__copy_to_user-and-__copy_from_user-performa.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0103-Improve-__copy_to_user-and-__copy_from_user-performa.patch
@@ -1580,27 +1580,10 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
__clear_user_memset(void __user *addr, unsigned long n)
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
-@@ -182,6 +182,30 @@ config ARCH_BCM_53573
+@@ -182,6 +182,13 @@ config ARCH_BCM_53573
The base chip is BCM53573 and there are some packaging modifications
like BCM47189 and BCM47452.
-+config ARCH_BCM_63XX
-+ bool "Broadcom BCM63xx DSL SoC"
-+ depends on ARCH_MULTI_V7
-+ select ARCH_HAS_RESET_CONTROLLER
-+ select ARM_ERRATA_754322
-+ select ARM_ERRATA_764369 if SMP
-+ select ARM_GIC
-+ select ARM_GLOBAL_TIMER
-+ select CACHE_L2X0
-+ select HAVE_ARM_ARCH_TIMER
-+ select HAVE_ARM_TWD if SMP
-+ select HAVE_ARM_SCU if SMP
-+ help
-+ This enables support for systems based on Broadcom DSL SoCs.
-+ It currently supports the 'BCM63XX' ARM-based family, which includes
-+ the BCM63138 variant.
-+
+config BCM2835_FAST_MEMCPY
+ bool "Enable optimized __copy_to_user and __copy_from_user"
+ depends on ARCH_BCM2835 && ARCH_MULTI_V6