Unverified Commit 92be2603 authored Sep 15, 2025 by Arnd Bergmann

Merge tag 'samsung-defconfig-6.18' of...

Merge tag 'samsung-defconfig-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/defconfig

Samsung SoC defconfig changes for v6.18

1. Cleanup MTD_NAND_S3C2410, being removed from the kernel via separate
   tree.
2. Enable Axis ARTPEC SoC in arm64 defconfig - new Samsung subarch.

* tag 'samsung-defconfig-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: defconfig: Enable Axis ARTPEC SoC
  ARM: s3c6400_defconfig: Drop MTD_NAND_S3C2410

Link: https://lore.kernel.org/r/20250909180127.99783-3-krzysztof.kozlowski@linaro.org


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 70757ee5 eca86a61

arch/arm/configs/s3c6400_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ CONFIG_MODULE_UNLOAD=y
		# CONFIG_BLK_DEV_BSG is not set
		CONFIG_MTD=y
		CONFIG_MTD_RAW_NAND=y
		CONFIG_MTD_NAND_S3C2410=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_EEPROM_AT24=y

arch/arm64/configs/defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ CONFIG_ARCH_AIROHA=y
		CONFIG_ARCH_SUNXI=y
		CONFIG_ARCH_ALPINE=y
		CONFIG_ARCH_APPLE=y
		CONFIG_ARCH_ARTPEC=y
		CONFIG_ARCH_AXIADO=y
		CONFIG_ARCH_BCM=y
		CONFIG_ARCH_BCM2835=y