From 60e3eabca49c25bae8896eb094c70b46aa0d2a0f Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 20:15:01 +0200 Subject: [PATCH] ARM: mmp: mark all board files for removal The mmp platform supports both ATAGS based board files and DT booting, but it appears that nobody has been interested in board files for a long time. Mark all of them for removal in early 2023 with a dependency on CONFIG_UNUSED_BOARD_FILES, leaving only the DT support for the future, unless someone pops up who uses them. Cc: Lubomir Rintel Cc: Haojian Zhuang Signed-off-by: Arnd Bergmann --- arch/arm/configs/mmp2_defconfig | 5 ++--- arch/arm/mach-mmp/Kconfig | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/mmp2_defconfig b/arch/arm/configs/mmp2_defconfig index 1b6b41a36888..4d39c615117b 100644 --- a/arch/arm/configs/mmp2_defconfig +++ b/arch/arm/configs/mmp2_defconfig @@ -5,10 +5,8 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_BLK_DEV_BSG is not set CONFIG_ARCH_MMP=y -CONFIG_MACH_BROWNSTONE=y -CONFIG_MACH_FLINT=y -CONFIG_MACH_MARVELL_JASPER=y CONFIG_AEABI=y +CONFIG_MACH_MMP2_DT=y CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS2,38400 mem=128M user_debug=255 earlyprintk" CONFIG_VFP=y CONFIG_MODULES=y @@ -56,6 +54,7 @@ CONFIG_BACKLIGHT_MAX8925=y CONFIG_MMC=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_MAX8925=y +# CONFIG_RESET_CONTROLLER is not set CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS=y diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index 333229c65b28..d71417d57961 100644 --- a/arch/arm/mach-mmp/Kconfig +++ b/arch/arm/mach-mmp/Kconfig @@ -18,6 +18,7 @@ if ATAGS config MACH_ASPENITE bool "Marvell's PXA168 Aspenite Development Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based @@ -26,6 +27,7 @@ config MACH_ASPENITE config MACH_ZYLONITE2 bool "Marvell's PXA168 Zylonite2 Development Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based @@ -34,6 +36,7 @@ config MACH_ZYLONITE2 config MACH_AVENGERS_LITE bool "Marvell's PXA168 Avengers Lite Development Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based @@ -42,6 +45,7 @@ config MACH_AVENGERS_LITE config MACH_TTC_DKB bool "Marvell's PXA910 TavorEVB/TTC_DKB Development Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA910 help Say 'Y' here if you want to support the Marvell PXA910-based @@ -50,6 +54,7 @@ config MACH_TTC_DKB config MACH_BROWNSTONE bool "Marvell's Brownstone Development Platform" depends on ARCH_MULTI_V7 + depends on UNUSED_BOARD_FILES select CPU_MMP2 help Say 'Y' here if you want to support the Marvell MMP2-based @@ -61,6 +66,7 @@ config MACH_BROWNSTONE config MACH_FLINT bool "Marvell's Flint Development Platform" depends on ARCH_MULTI_V7 + depends on UNUSED_BOARD_FILES select CPU_MMP2 help Say 'Y' here if you want to support the Marvell MMP2-based @@ -72,6 +78,7 @@ config MACH_FLINT config MACH_MARVELL_JASPER bool "Marvell's Jasper Development Platform" depends on ARCH_MULTI_V7 + depends on UNUSED_BOARD_FILES select CPU_MMP2 help Say 'Y' here if you want to support the Marvell MMP2-base @@ -83,6 +90,7 @@ config MACH_MARVELL_JASPER config MACH_TETON_BGA bool "Marvell's PXA168 Teton BGA Development Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based @@ -91,6 +99,7 @@ config MACH_TETON_BGA config MACH_GPLUGD bool "Marvell's PXA168 GuruPlug Display (gplugD) Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based -- 2.20.1