Commit 2c95b7e0 authored by Stephen Warren's avatar Stephen Warren
Browse files

ARM: tegra: remove CONFIG_MACH_TEGRA_DT 



* Make ARCH_TEGRA select USE_OF; DT is the way forward.
* Build board-dt-tegra*.c when the relevant Tegra SoC support is enabled,
  rather than requiring a specific config option for this.
* The board-specific config options already build board-*-pinmux.o, and
  when booting from device tree these files are no longer needed, so we
  can remove some Makefile commands related to those files.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 9132b0ed

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ config ARCH_TEGRA 
	select MIGHT_HAVE_CACHE_L2X0

	select NEED_MACH_IO_H if PCI

	select ARCH_HAS_CPUFREQ

	select USE_OF

	help

	  This enables support for NVIDIA Tegra based systems (Tegra APX,

	  Tegra 6xx and Tegra 2 series).

arch/arm/mach-tegra/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -87,13 +87,6 @@ config MACH_SEABOARD 
	 also be included for some of the derivative boards that

	 have large similarities with the seaboard design.



config MACH_TEGRA_DT

	bool "Generic Tegra20 board (FDT support)"

	depends on ARCH_TEGRA_2x_SOC

	select USE_OF

	help

	  Support for generic NVIDIA Tegra20 boards using Flattened Device Tree



config MACH_TRIMSLICE

       bool "TrimSlice board"

       depends on ARCH_TEGRA_2x_SOC

arch/arm/mach-tegra/Makefile

+3 −7
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ obj-$(CONFIG_CPU_IDLE) += sleep.o 
obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= powergate.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra2_emc.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= board-dt-tegra30.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= tegra30_clocks.o

obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o

obj-$(CONFIG_SMP)                       += reset.o
@@ -23,6 +22,9 @@ obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o 
obj-$(CONFIG_TEGRA_PCI)			+= pcie.o

obj-$(CONFIG_USB_SUPPORT)		+= usb_phy.o



obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-dt-tegra20.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= board-dt-tegra30.o



obj-$(CONFIG_MACH_HARMONY)              += board-harmony.o

obj-$(CONFIG_MACH_HARMONY)              += board-harmony-pinmux.o

obj-$(CONFIG_MACH_HARMONY)              += board-harmony-pcie.o
@@ -34,11 +36,5 @@ obj-$(CONFIG_MACH_PAZ00) += board-paz00-pinmux.o 
obj-$(CONFIG_MACH_SEABOARD)             += board-seaboard.o

obj-$(CONFIG_MACH_SEABOARD)             += board-seaboard-pinmux.o



obj-$(CONFIG_MACH_TEGRA_DT)             += board-dt-tegra20.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-harmony-pinmux.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-seaboard-pinmux.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-paz00-pinmux.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-trimslice-pinmux.o



obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice.o

obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice-pinmux.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE