* [U-Boot] [RFC PATCH] ARM: tegra: move NVIVIA common files to arch/arm/mach-tegra
@ 2015-04-10 4:53 Masahiro Yamada
2015-04-10 8:08 ` Marcel Ziswiler
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Masahiro Yamada @ 2015-04-10 4:53 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Simon Glass <sjg@chromium.org>
---
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
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 04cef0a..5081332 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -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/
diff --git a/board/nvidia/common/board.c b/arch/arm/mach-tegra/board2.c
similarity index 100%
rename from board/nvidia/common/board.c
rename to arch/arm/mach-tegra/board2.c
diff --git a/board/nvidia/common/emc.c b/arch/arm/mach-tegra/emc.c
similarity index 100%
rename from board/nvidia/common/emc.c
rename to arch/arm/mach-tegra/emc.c
diff --git a/board/nvidia/common/emc.h b/arch/arm/mach-tegra/emc.h
similarity index 100%
rename from board/nvidia/common/emc.h
rename to arch/arm/mach-tegra/emc.h
diff --git a/board/avionic-design/medcom-wide/Makefile b/board/avionic-design/medcom-wide/Makefile
index bcf7ccf..1351d1f 100644
--- a/board/avionic-design/medcom-wide/Makefile
+++ b/board/avionic-design/medcom-wide/Makefile
@@ -8,5 +8,3 @@
#
obj-y := ../common/tamonten.o
-
-include $(srctree)/board/nvidia/common/common.mk
diff --git a/board/avionic-design/plutux/Makefile b/board/avionic-design/plutux/Makefile
index bcf7ccf..1351d1f 100644
--- a/board/avionic-design/plutux/Makefile
+++ b/board/avionic-design/plutux/Makefile
@@ -8,5 +8,3 @@
#
obj-y := ../common/tamonten.o
-
-include $(srctree)/board/nvidia/common/common.mk
diff --git a/board/avionic-design/tec-ng/Makefile b/board/avionic-design/tec-ng/Makefile
index a556b92..8ec9b88 100644
--- a/board/avionic-design/tec-ng/Makefile
+++ b/board/avionic-design/tec-ng/Makefile
@@ -6,5 +6,3 @@
#
obj-y := ../common/tamonten-ng.o
-
-include $(srctree)/board/nvidia/common/common.mk
diff --git a/board/avionic-design/tec/Makefile b/board/avionic-design/tec/Makefile
index bcf7ccf..1351d1f 100644
--- a/board/avionic-design/tec/Makefile
+++ b/board/avionic-design/tec/Makefile
@@ -8,5 +8,3 @@
#
obj-y := ../common/tamonten.o
-
-include $(srctree)/board/nvidia/common/common.mk
diff --git a/board/compal/paz00/Makefile b/board/compal/paz00/Makefile
index e6a0b29..b5fde8d 100644
--- a/board/compal/paz00/Makefile
+++ b/board/compal/paz00/Makefile
@@ -15,5 +15,3 @@
#
obj-y := paz00.o
-
-include $(srctree)/board/nvidia/common/common.mk
diff --git a/board/compulab/trimslice/Makefile b/board/compulab/trimslice/Makefile
index 311eb92..5396b21 100644
--- a/board/compulab/trimslice/Makefile
+++ b/board/compulab/trimslice/Makefile
@@ -6,5 +6,3 @@
#
obj-y := trimslice.o
-
-include $(srctree)/board/nvidia/common/common.mk
diff --git a/board/nvidia/common/Makefile b/board/nvidia/common/Makefile
deleted file mode 100644
index e3b2651..0000000
--- a/board/nvidia/common/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (c) 2011 The Chromium OS Authors.
-# SPDX-License-Identifier: GPL-2.0+
-
-include $(src)/common.mk
diff --git a/board/nvidia/common/common.mk b/board/nvidia/common/common.mk
deleted file mode 100644
index 9a9b529..0000000
--- a/board/nvidia/common/common.mk
+++ /dev/null
@@ -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
diff --git a/board/toradex/apalis_t30/Makefile b/board/toradex/apalis_t30/Makefile
index a968e6b..0ea3d8f 100644
--- a/board/toradex/apalis_t30/Makefile
+++ b/board/toradex/apalis_t30/Makefile
@@ -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
diff --git a/board/toradex/colibri_t20/Makefile b/board/toradex/colibri_t20/Makefile
index 86f78d9..e5e71ac 100644
--- a/board/toradex/colibri_t20/Makefile
+++ b/board/toradex/colibri_t20/Makefile
@@ -4,6 +4,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
-include $(srctree)/board/nvidia/common/common.mk
-
obj-y += colibri_t20.o
diff --git a/board/toradex/colibri_t30/Makefile b/board/toradex/colibri_t30/Makefile
index 3d58a4b..4242902 100644
--- a/board/toradex/colibri_t30/Makefile
+++ b/board/toradex/colibri_t30/Makefile
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [RFC PATCH] ARM: tegra: move NVIVIA common files to arch/arm/mach-tegra
2015-04-10 4:53 [U-Boot] [RFC PATCH] ARM: tegra: move NVIVIA common files to arch/arm/mach-tegra Masahiro Yamada
@ 2015-04-10 8:08 ` Marcel Ziswiler
2015-04-10 10:57 ` Masahiro Yamada
2015-04-10 15:48 ` Stephen Warren
2 siblings, 0 replies; 4+ messages in thread
From: Marcel Ziswiler @ 2015-04-10 8:08 UTC (permalink / raw)
To: u-boot
On Fri, 2015-04-10 at 13:53 +0900, Masahiro Yamada wrote:
> 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!
I would vote to merge it all into one as a second step. The rest looks
fine to me.
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [RFC PATCH] ARM: tegra: move NVIVIA common files to arch/arm/mach-tegra
2015-04-10 4:53 [U-Boot] [RFC PATCH] ARM: tegra: move NVIVIA common files to arch/arm/mach-tegra Masahiro Yamada
2015-04-10 8:08 ` Marcel Ziswiler
@ 2015-04-10 10:57 ` Masahiro Yamada
2015-04-10 15:48 ` Stephen Warren
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2015-04-10 10:57 UTC (permalink / raw)
To: u-boot
2015-04-10 13:53 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> 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.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: Tom Warren <twarren@nvidia.com>
> Cc: Simon Glass <sjg@chromium.org>
I will fix the subject in v2.
s/NVIVIA/NVIDIA/
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [RFC PATCH] ARM: tegra: move NVIVIA common files to arch/arm/mach-tegra
2015-04-10 4:53 [U-Boot] [RFC PATCH] ARM: tegra: move NVIVIA common files to arch/arm/mach-tegra Masahiro Yamada
2015-04-10 8:08 ` Marcel Ziswiler
2015-04-10 10:57 ` Masahiro Yamada
@ 2015-04-10 15:48 ` Stephen Warren
2 siblings, 0 replies; 4+ messages in thread
From: Stephen Warren @ 2015-04-10 15:48 UTC (permalink / raw)
To: u-boot
On 04/09/2015 10:53 PM, Masahiro Yamada wrote:
> 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.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: Tom Warren <twarren@nvidia.com>
> Cc: Simon Glass <sjg@chromium.org>
> ---
>
> 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.
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-10 15:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-10 4:53 [U-Boot] [RFC PATCH] ARM: tegra: move NVIVIA common files to arch/arm/mach-tegra Masahiro Yamada
2015-04-10 8:08 ` Marcel Ziswiler
2015-04-10 10:57 ` Masahiro Yamada
2015-04-10 15:48 ` Stephen Warren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.