diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-09-15 15:47:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-09-15 15:48:01 +0200 |
| commit | 92be260308d8861f3a61fe592b9f23c5bc917af3 (patch) | |
| tree | 5e2b7be6dd0888ac39109be23c1a94fdce8effcd | |
| parent | 70757ee5d2bc6da3a31dfbf808d534faa19178bd (diff) | |
| parent | eca86a61aedaa40310135c8799b28187afbc677e (diff) | |
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>
| -rw-r--r-- | arch/arm/configs/s3c6400_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig index a37e6ac40825..967b1cb22136 100644 --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig @@ -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 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 54c3304c7587..ac81f08aac57 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -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 |