ARM: tegra: move NVIDIA common files to arch/arm/mach-tegra

All the Tegra boards borrow the files from board/nvidia/common/
directory, i.e., board/nvidia/common/* are not vendor-common files,
but SoC-common files.

Move NVIDIA common files to arch/arm/mach-tegra/ to clean up
Makefiles.

As arch/arm/mach-tegra/board.c already exists, this commit renames
board/nvidia/common/board.c to arch/arm/mach-tegra/board2.c,
expecting they will be consolidated as a second step.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Masahiro Yamada 2015-04-13 10:51:14 +09:00 committed by Tom Warren
parent 21f0fd245e
commit 237c36379c
15 changed files with 2 additions and 26 deletions

View File

@ -16,7 +16,7 @@ obj-$(CONFIG_PWM_TEGRA) += pwm.o
endif
obj-y += ap.o
obj-y += board.o
obj-y += board.o board2.o
obj-y += cache.o
obj-y += clock.o
obj-y += lowlevel_init.o
@ -25,6 +25,7 @@ obj-y += powergate.o
obj-y += xusb-padctl.o
obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o
obj-$(CONFIG_TEGRA124) += vpr.o
obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_ARMV7_PSCI) += psci.o

View File

@ -8,5 +8,3 @@
#
obj-y := ../common/tamonten.o
include $(srctree)/board/nvidia/common/common.mk

View File

@ -8,5 +8,3 @@
#
obj-y := ../common/tamonten.o
include $(srctree)/board/nvidia/common/common.mk

View File

@ -6,5 +6,3 @@
#
obj-y := ../common/tamonten-ng.o
include $(srctree)/board/nvidia/common/common.mk

View File

@ -8,5 +8,3 @@
#
obj-y := ../common/tamonten.o
include $(srctree)/board/nvidia/common/common.mk

View File

@ -15,5 +15,3 @@
#
obj-y := paz00.o
include $(srctree)/board/nvidia/common/common.mk

View File

@ -6,5 +6,3 @@
#
obj-y := trimslice.o
include $(srctree)/board/nvidia/common/common.mk

View File

@ -1,4 +0,0 @@
# Copyright (c) 2011 The Chromium OS Authors.
# SPDX-License-Identifier: GPL-2.0+
include $(src)/common.mk

View File

@ -1,3 +0,0 @@
# common options for all tegra boards
obj-y += ../../nvidia/common/board.o
obj-$(CONFIG_TEGRA_CLOCK_SCALING) += ../../nvidia/common/emc.o

View File

@ -1,6 +1,4 @@
# Copyright (c) 2014 Marcel Ziswiler
# SPDX-License-Identifier: GPL-2.0+
include $(srctree)/board/nvidia/common/common.mk
obj-y += apalis_t30.o

View File

@ -4,6 +4,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
include $(srctree)/board/nvidia/common/common.mk
obj-y += colibri_t20.o

View File

@ -1,6 +1,4 @@
# Copyright (c) 2013-2014 Stefan Agner
# SPDX-License-Identifier: GPL-2.0+
include $(srctree)/board/nvidia/common/common.mk
obj-y += colibri_t30.o