[PATCH 05/13] ARM: davinci: mark all ATAGS board files as unused

Thu Jul 28 04:54:09 PDT 2022

On Thu, Jul 21, 2022 at 4:18 PM Arnd Bergmann <arnd at kernel.org> wrote:
>
> From: Arnd Bergmann <arnd at arndb.de>
>
> From an earlier discussion, it appears that the davinci da8xx machines
> that are still functional have already been converted to DT, while the
> remaining board files are only kept because nobody has stepped up to
> remove them.
>
> Mark all these boards as 'depends on UNUSED_BOARD_FILES' with the
> plan to remove them in early 2023 after the next longterm supported
> kernel is out.
>
> Cc: Sekhar Nori <nsekhar at ti.com>
> Cc: Bartosz Golaszewski <brgl at bgdev.pl>
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>
> ---
>  arch/arm/configs/davinci_all_defconfig | 11 -----------
>  arch/arm/configs/multi_v5_defconfig    |  9 ---------
>  arch/arm/mach-davinci/Kconfig          |  8 ++++++++
>  3 files changed, 8 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
> index c60c39a8b95f..fc71a03a9c8c 100644
> --- a/arch/arm/configs/davinci_all_defconfig
> +++ b/arch/arm/configs/davinci_all_defconfig
> @@ -14,17 +14,8 @@ CONFIG_ARCH_MULTIPLATFORM=y
>  CONFIG_ARCH_MULTI_V5=y
>  # CONFIG_ARCH_MULTI_V7 is not set
>  CONFIG_ARCH_DAVINCI=y
> -CONFIG_ARCH_DAVINCI_DM644x=y
> -CONFIG_ARCH_DAVINCI_DM355=y
> -CONFIG_ARCH_DAVINCI_DM646x=y
>  CONFIG_ARCH_DAVINCI_DA830=y
>  CONFIG_ARCH_DAVINCI_DA850=y
> -CONFIG_ARCH_DAVINCI_DM365=y
> -CONFIG_MACH_SFFSDR=y
> -CONFIG_MACH_NEUROS_OSD2=y
> -CONFIG_MACH_DM355_LEOPARD=y
> -CONFIG_MACH_MITYOMAPL138=y
> -CONFIG_MACH_OMAPL138_HAWKBOARD=y
>  CONFIG_DAVINCI_MUX_DEBUG=y
>  CONFIG_DAVINCI_MUX_WARNINGS=y
>  CONFIG_AEABI=y
> @@ -110,7 +101,6 @@ CONFIG_KEYBOARD_XTKBD=m
>  CONFIG_INPUT_TOUCHSCREEN=y
>  CONFIG_INPUT_MISC=y
>  CONFIG_INPUT_PWM_BEEPER=m
> -CONFIG_INPUT_DM355EVM=m
>  CONFIG_SERIO_LIBPS2=y
>  # CONFIG_VT_CONSOLE is not set
>  CONFIG_SERIAL_8250=y
> @@ -138,7 +128,6 @@ CONFIG_SYSCON_REBOOT_MODE=m
>  CONFIG_BATTERY_LEGO_EV3=m
>  CONFIG_WATCHDOG=y
>  CONFIG_DAVINCI_WATCHDOG=y
> -CONFIG_MFD_DM355EVM_MSP=y
>  CONFIG_TPS6507X=y
>  CONFIG_REGULATOR=y
>  CONFIG_REGULATOR_FIXED_VOLTAGE=y
> diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
> index 794c7a177594..e0be0e0023f3 100644
> --- a/arch/arm/configs/multi_v5_defconfig
> +++ b/arch/arm/configs/multi_v5_defconfig
> @@ -12,17 +12,8 @@ CONFIG_MACH_ASPEED_G4=y
>  CONFIG_ARCH_AT91=y
>  CONFIG_SOC_AT91SAM9=y
>  CONFIG_ARCH_DAVINCI=y
> -CONFIG_ARCH_DAVINCI_DM644x=y
> -CONFIG_ARCH_DAVINCI_DM355=y
> -CONFIG_ARCH_DAVINCI_DM646x=y
>  CONFIG_ARCH_DAVINCI_DA830=y
>  CONFIG_ARCH_DAVINCI_DA850=y
> -CONFIG_ARCH_DAVINCI_DM365=y
> -CONFIG_MACH_SFFSDR=y
> -CONFIG_MACH_NEUROS_OSD2=y
> -CONFIG_MACH_DM355_LEOPARD=y
> -CONFIG_MACH_MITYOMAPL138=y
> -CONFIG_MACH_OMAPL138_HAWKBOARD=y
>  CONFIG_ARCH_MXC=y
>  CONFIG_SOC_IMX25=y
>  CONFIG_SOC_IMX27=y
> diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
> index 008cbc2ab867..d7b6990954f4 100644
> --- a/arch/arm/mach-davinci/Kconfig
> +++ b/arch/arm/mach-davinci/Kconfig
> @@ -26,6 +26,7 @@ config ARCH_DAVINCI_DM644x
>
>  config ARCH_DAVINCI_DM355
>         bool "DaVinci 355 based system"
> +       depends on ATAGS && UNUSED_BOARD_FILES
>         select DAVINCI_AINTC
>         select ARCH_DAVINCI_DMx
>
> @@ -37,6 +38,7 @@ config ARCH_DAVINCI_DM646x
>  config ARCH_DAVINCI_DA830
>         bool "DA830/OMAP-L137/AM17x based system"
>         depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT)
> +       depends on ATAGS
>         select ARCH_DAVINCI_DA8XX
>         # needed on silicon revs 1.0, 1.1:
>         select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE
> @@ -45,6 +47,7 @@ config ARCH_DAVINCI_DA830
>  config ARCH_DAVINCI_DA850
>         bool "DA850/OMAP-L138/AM18x based system"
>         depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT)
> +       depends on ATAGS
>         select ARCH_DAVINCI_DA8XX
>         select DAVINCI_CP_INTC
>
> @@ -53,6 +56,7 @@ config ARCH_DAVINCI_DA8XX
>
>  config ARCH_DAVINCI_DM365
>         bool "DaVinci 365 based system"
> +       depends on ATAGS && UNUSED_BOARD_FILES
>         select DAVINCI_AINTC
>         select ARCH_DAVINCI_DMx
>
> @@ -127,6 +131,7 @@ config MACH_DAVINCI_DM365_EVM
>  config MACH_DAVINCI_DA830_EVM
>         bool "TI DA830/OMAP-L137/AM17x Reference Platform"
>         default ARCH_DAVINCI_DA830
> +       depends on ATAGS && UNUSED_BOARD_FILES
>         depends on ARCH_DAVINCI_DA830
>         select GPIO_PCF857X if I2C
>         help
> @@ -156,6 +161,7 @@ endchoice
>
>  config MACH_DAVINCI_DA850_EVM
>         bool "TI DA850/OMAP-L138/AM18x Reference Platform"
> +       depends on ATAGS && UNUSED_BOARD_FILES
>         default ARCH_DAVINCI_DA850
>         depends on ARCH_DAVINCI_DA850
>         help
> @@ -197,6 +203,7 @@ endchoice
>  config MACH_MITYOMAPL138
>         bool "Critical Link MityDSP-L138/MityARM-1808 SoM"
>         depends on ARCH_DAVINCI_DA850
> +       depends on ATAGS && UNUSED_BOARD_FILES
>         help
>           Say Y here to select the Critical Link MityDSP-L138/MityARM-1808
>           System on Module.  Information on this SoM may be found at
> @@ -205,6 +212,7 @@ config MACH_MITYOMAPL138
>  config MACH_OMAPL138_HAWKBOARD
>         bool "TI AM1808 / OMAPL-138 Hawkboard platform"
>         depends on ARCH_DAVINCI_DA850
> +       depends on ATAGS && UNUSED_BOARD_FILES
>         help
>           Say Y here to select the TI AM1808 / OMAPL-138 Hawkboard platform .
>
> --
> 2.29.2
>

Acked-by: Bartosz Golaszewski <brgl at bgdev.pl>