Merge branch 'master' into dev_x3b

saiarcot895 · web-flow · commit 1a79c5b063fb · 2025-03-07T08:47:11.000-08:00
diff --git a/patch/kconfig-exclusions b/patch/kconfig-exclusions
@@ -22,7 +22,7 @@ CONFIG_MLXSW_PCI
 [arm64]
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU
 
-[marvell-arm64]
+[marvell-prestera-arm64]
 CONFIG_UBIFS_FS_ZSTD
 CONFIG_CRYPTO_DEV_SAFEXCEL
 
@@ -31,7 +31,7 @@ CONFIG_ARM64_VA_BITS_48
 
 [armhf]
 
-[marvell-armhf]
+[marvell-prestera-armhf]
 CONFIG_ARCH_VIRT
 CONFIG_ARCH_BCM
 CONFIG_ARCH_EXYNOS
diff --git a/patch/kconfig-force-inclusions b/patch/kconfig-force-inclusions
@@ -2,5 +2,5 @@
 CONFIG_COMPAT_VDSO=y
 CONFIG_THUMB2_COMPAT_VDSO=y
 
-[marvell-armhf]
+[marvell-prestera-armhf]
 CONFIG_ARCH_NR_GPIO=0
diff --git a/patch/kconfig-inclusions b/patch/kconfig-inclusions
@@ -204,7 +204,7 @@ CONFIG_PREEMPTIRQ_TRACEPOINTS=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_KEXEC_FILE=y
 
-[marvell-arm64]
+[marvell-prestera-arm64]
 
 [pensando]
 CONFIG_ARCH_PENSANDO=y
@@ -233,7 +233,7 @@ CONFIG_EEPROM_SFF_8436=m
 CONFIG_EEPROM_OPTOE=m
 CONFIG_I2C_MUX_GPIO=m
 
-[marvell-armhf]
+[marvell-prestera-armhf]
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_OF_PARTS=y
 
diff --git a/patch/kconfig-secure-boot-exclusions b/patch/kconfig-secure-boot-exclusions
@@ -18,4 +18,3 @@ CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
 
 [armhf]
 
-[marvell-armhf]
diff --git a/patch/kconfig-secure-boot-inclusions b/patch/kconfig-secure-boot-inclusions
@@ -16,4 +16,3 @@ CONFIG_MODULE_SIG_FORCE=y
 
 [armhf]
 
-[marvell-armhf]

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,3 @@ CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT`
`18`	`18`
`19`	`19`	`[armhf]`
`20`	`20`
`21`		`-[marvell-armhf]`