Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a641f3a6 authored by Russell King's avatar Russell King
Browse files

ARM: l2c: fix dependencies on PL310 errata symbols 



A number of configurations spit out warnings similar to:

warning: (SOC_IMX6 && SOC_VF610 && ARCH_OMAP4) selects PL310_ERRATA_588369 which has unmet direct dependencies (CACHE_L2X0)
warning: (SOC_IMX6 && SOC_VF610 && ARCH_OMAP4) selects PL310_ERRATA_727915 which has unmet direct dependencies (CACHE_L2X0)

Clean up the dependencies here:
* PL310 symbols should only be selected when CACHE_L2X0 is enabled.
* Since the cache-l2x0 code detects PL310 presence at runtime, and we will
  eventually get rid of CACHE_PL310, surround these errata options with an
  if CACHE_L2X0 conditional rather than repeating the dependency against
  each.

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 870cbe8c

arch/arm/mach-imx/Kconfig

+6 −6
Original line number Original line Diff line number Diff line
@@ -738,9 +738,9 @@ config SOC_IMX6 
	select HAVE_IMX_MMDC

	select HAVE_IMX_MMDC

	select HAVE_IMX_SRC

	select HAVE_IMX_SRC

	select MFD_SYSCON

	select MFD_SYSCON

	select PL310_ERRATA_588369 if CACHE_PL310

	select PL310_ERRATA_588369 if CACHE_L2X0

	select PL310_ERRATA_727915 if CACHE_PL310

	select PL310_ERRATA_727915 if CACHE_L2X0

	select PL310_ERRATA_769419 if CACHE_PL310

	select PL310_ERRATA_769419 if CACHE_L2X0





config SOC_IMX6Q

config SOC_IMX6Q

	bool "i.MX6 Quad/DualLite support"

	bool "i.MX6 Quad/DualLite support"
@@ -775,9 +775,9 @@ config SOC_VF610 
	select ARM_GIC

	select ARM_GIC

	select PINCTRL_VF610

	select PINCTRL_VF610

	select VF_PIT_TIMER

	select VF_PIT_TIMER

	select PL310_ERRATA_588369 if CACHE_PL310

	select PL310_ERRATA_588369 if CACHE_L2X0

	select PL310_ERRATA_727915 if CACHE_PL310

	select PL310_ERRATA_727915 if CACHE_L2X0

	select PL310_ERRATA_769419 if CACHE_PL310

	select PL310_ERRATA_769419 if CACHE_L2X0





	help

	help

	  This enable support for Freescale Vybrid VF610 processor.

	  This enable support for Freescale Vybrid VF610 processor.

arch/arm/mach-omap2/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,8 +32,8 @@ config ARCH_OMAP4 
	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_ARM_TWD if SMP

	select OMAP_INTERCONNECT

	select OMAP_INTERCONNECT

	select PL310_ERRATA_588369

	select PL310_ERRATA_588369 if CACHE_L2X0

	select PL310_ERRATA_727915

	select PL310_ERRATA_727915 if CACHE_L2X0

	select PM_OPP if PM

	select PM_OPP if PM

	select PM_RUNTIME if CPU_IDLE

	select PM_RUNTIME if CPU_IDLE

	select ARM_ERRATA_754322

	select ARM_ERRATA_754322

arch/arm/mach-sti/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -11,8 +11,8 @@ menuconfig ARCH_STI 
	select ARM_ERRATA_754322

	select ARM_ERRATA_754322

	select ARM_ERRATA_764369 if SMP

	select ARM_ERRATA_764369 if SMP

	select ARM_ERRATA_775420

	select ARM_ERRATA_775420

	select PL310_ERRATA_753970 if CACHE_PL310

	select PL310_ERRATA_753970 if CACHE_L2X0

	select PL310_ERRATA_769419 if CACHE_PL310

	select PL310_ERRATA_769419 if CACHE_L2X0

	help

	help

	  Include support for STiH41x SOCs like STiH415/416 using the device tree

	  Include support for STiH41x SOCs like STiH415/416 using the device tree

	  for discovery

	  for discovery

arch/arm/mach-ux500/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ config ARCH_U8500 
	select PINCTRL

	select PINCTRL

	select PINCTRL_ABX500

	select PINCTRL_ABX500

	select PINCTRL_NOMADIK

	select PINCTRL_NOMADIK

	select PL310_ERRATA_753970 if CACHE_PL310

	select PL310_ERRATA_753970 if CACHE_L2X0

	help

	help

	  Support for ST-Ericsson's Ux500 architecture

	  Support for ST-Ericsson's Ux500 architecture

arch/arm/mach-vexpress/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA 
	bool "Enable A5 and A9 only errata work-arounds"

	bool "Enable A5 and A9 only errata work-arounds"

	default y

	default y

	select ARM_ERRATA_720789

	select ARM_ERRATA_720789

	select PL310_ERRATA_753970 if CACHE_PL310

	select PL310_ERRATA_753970 if CACHE_L2X0

	help

	help

	  Provides common dependencies for Versatile Express platforms

	  Provides common dependencies for Versatile Express platforms

	  based on Cortex-A5 and Cortex-A9 processors. In order to

	  based on Cortex-A5 and Cortex-A9 processors. In order to