From 456716b15fb89cee97859b972c59ab395724182c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 29 Apr 2026 21:08:03 -0700 Subject: [PATCH] bcm53xx: refresh 6.18 config Add missing symbols for 6.18. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/23166 Signed-off-by: Jonas Jelonek --- target/linux/bcm53xx/config-6.18 | 11 ++-- ...eraki-mr26-set-mac-address-for-gmac0.patch | 52 ------------------- 2 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 target/linux/bcm53xx/patches-6.18/050-v6.13-ARM-dts-meraki-mr26-set-mac-address-for-gmac0.patch diff --git a/target/linux/bcm53xx/config-6.18 b/target/linux/bcm53xx/config-6.18 index 0a9e9bb593..0b794e2ede 100644 --- a/target/linux/bcm53xx/config-6.18 +++ b/target/linux/bcm53xx/config-6.18 @@ -17,6 +17,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USES_CFI_GENERIC_LLVM_PASS=y CONFIG_ARM=y CONFIG_ARM_AMBA=y CONFIG_ARM_APPENDED_DTB=y @@ -68,7 +69,6 @@ CONFIG_BGMAC=y CONFIG_BGMAC_BCMA=y CONFIG_BGMAC_PLATFORM=y CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y -CONFIG_BLK_MQ_PCI=y CONFIG_BOUNCE=y CONFIG_BROADCOM_PHY=y CONFIG_CACHE_L2X0=y @@ -106,8 +106,9 @@ CONFIG_CRC16=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y +CONFIG_CRYPTO_LIB_BLAKE2S_ARCH=y CONFIG_CRYPTO_LIB_GF128MUL=y +CONFIG_CRYPTO_LIB_SHA256_ARCH=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_ZSTD=y @@ -166,7 +167,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GENERIC_VDSO_32=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_74X164=y CONFIG_GPIO_BCM_XGS_IPROC=y @@ -211,8 +211,6 @@ CONFIG_MDIO_BUS=y CONFIG_MDIO_BUS_MUX=y # CONFIG_MDIO_BUS_MUX_BCM_IPROC is not set CONFIG_MDIO_BUS_MUX_MMIOREG=y -CONFIG_MDIO_DEVICE=y -CONFIG_MDIO_DEVRES=y CONFIG_MFD_SYSCON=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y CONFIG_MIGRATION=y @@ -272,6 +270,7 @@ CONFIG_OLD_SIGSUSPEND3=y CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_PADATA=y +CONFIG_PAGE_BLOCK_MAX_ORDER=11 CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y @@ -310,12 +309,10 @@ CONFIG_REGMAP_I2C=y CONFIG_REGMAP_MMIO=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y -CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SGL_ALLOC=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_SOCK_RX_QUEUE_MAPPING=y diff --git a/target/linux/bcm53xx/patches-6.18/050-v6.13-ARM-dts-meraki-mr26-set-mac-address-for-gmac0.patch b/target/linux/bcm53xx/patches-6.18/050-v6.13-ARM-dts-meraki-mr26-set-mac-address-for-gmac0.patch deleted file mode 100644 index f6a6f819d1..0000000000 --- a/target/linux/bcm53xx/patches-6.18/050-v6.13-ARM-dts-meraki-mr26-set-mac-address-for-gmac0.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ad1915e2070cf832bfb81dcbeb44b073c09e6dcc Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Sun, 20 Oct 2024 18:51:47 -0700 -Subject: [PATCH] ARM: dts: meraki-mr26: set mac address for gmac0 - -Currently this needs to be done in userspace. - -Signed-off-by: Rosen Penev -Link: https://lore.kernel.org/r/20241021015147.172700-1-rosenp@gmail.com -Signed-off-by: Florian Fainelli ---- - .../dts/broadcom/bcm53015-meraki-mr26.dts | 20 +++++++++++++++++++ - 1 file changed, 20 insertions(+) - ---- a/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts -+++ b/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts -@@ -59,6 +59,9 @@ - - &gmac0 { - status = "okay"; -+ -+ nvmem-cells = <&macaddr_board_config_66>; -+ nvmem-cell-names = "mac-address"; - }; - - &gmac1 { -@@ -102,8 +105,25 @@ - }; - - partition@800000 { -+ compatible = "linux,ubi"; - label = "ubi"; - reg = <0x800000 0x7780000>; -+ -+ volumes { -+ ubi-volume-board-config { -+ volname = "board-config"; -+ -+ nvmem-layout { -+ compatible = "fixed-layout"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ macaddr_board_config_66: macaddr@66 { -+ reg = <0x66 0x6>; -+ }; -+ }; -+ }; -+ }; - }; - }; - };