ARM: tegra: move NVIVIA 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.

---

arch/arm/mach-tegra/board.c already exists.
So, I renamed board/nvidia/common/board.c to arch/arm/mach-tegra/board2.c, which I think, not a good idea.

Comments please!

 arch/arm/mach-tegra/Makefile                                | 2 ++
 board/nvidia/common/board.c => arch/arm/mach-tegra/board2.c | 0
 {board/nvidia/common => arch/arm/mach-tegra}/emc.c          | 0
 {board/nvidia/common => arch/arm/mach-tegra}/emc.h          | 0
 board/avionic-design/medcom-wide/Makefile                   | 2 --
 board/avionic-design/plutux/Makefile                        | 2 --
 board/avionic-design/tec-ng/Makefile                        | 2 --
 board/avionic-design/tec/Makefile                           | 2 --
 board/compal/paz00/Makefile                                 | 2 --
 board/compulab/trimslice/Makefile                           | 2 --
 board/nvidia/common/Makefile                                | 4 ----
 board/nvidia/common/common.mk                               | 3 ---
 board/toradex/apalis_t30/Makefile                           | 2 --
 board/toradex/colibri_t20/Makefile                          | 2 --
 board/toradex/colibri_t30/Makefile                          | 2 --
 15 files changed, 2 insertions(+), 25 deletions(-)
 rename board/nvidia/common/board.c => arch/arm/mach-tegra/board2.c (100%)
 rename {board/nvidia/common => arch/arm/mach-tegra}/emc.c (100%)
 rename {board/nvidia/common => arch/arm/mach-tegra}/emc.h (100%)
 delete mode 100644 board/nvidia/common/Makefile
 delete mode 100644 board/nvidia/common/common.mk

index 04cef0a..5081332 100644
@@ -24,6 +24,8 @@ obj-y += powergate.o
 obj-y += xusb-padctl.o
 obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o
 obj-$(CONFIG_TEGRA124) += vpr.o
+obj-y += board2.o
+obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
 
 obj-$(CONFIG_TEGRA20) += tegra20/
 obj-$(CONFIG_TEGRA30) += tegra30/

similarity index 100%
rename from board/nvidia/common/board.c
rename to arch/arm/mach-tegra/board2.c

similarity index 100%
rename from board/nvidia/common/emc.c
rename to arch/arm/mach-tegra/emc.c

similarity index 100%
rename from board/nvidia/common/emc.h
rename to arch/arm/mach-tegra/emc.h

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

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

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

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

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

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

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

deleted file mode 100644
index 9a9b529..0000000
@@ -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

index a968e6b..0ea3d8f 100644
@@ -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

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

index 3d58a4b..4242902 100644
@@ -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

1.9.1

I would vote to merge it all into one as a second step. The rest looks fine to me.

2015-04-10 13:53 GMT+09:00 Masahiro Yamada <[email protected]>:

I will fix the subject in v2.

s/NVIVIA/NVIDIA/

Best Regards
Masahiro Yamada

Well, perhaps not optimal, but it isn't going to cause any kind of significant problem I think, and could easily be fixed up later. Perhaps merge the two files together if you want? I never understood the reasoning behind the split anyway.