This commit moves files as follows:
arch/arm/cpu/arm720t/tegra20/* -> arch/arm/mach-tegra/tegra20/* arch/arm/cpu/arm720t/tegra30/* -> arch/arm/mach-tegra/tegra30/* arch/arm/cpu/arm720t/tegra114/* -> arch/arm/mach-tegra/tegra114/* arch/arm/cpu/arm720t/tegra124* -> arch/arm/mach-tegra/tegra124/* arch/arm/cpu/arm720t/tegra-common/* -> arch/arm/mach-tegra/* arch/arm/cpu/armv7/tegra20/* -> arch/arm/mach-tegra/tegra20/* arch/arm/cpu/armv7/tegra30/* -> arch/arm/mach-tegra/tegra30/* arch/arm/cpu/armv7/tegra114/* -> arch/arm/mach-tegra/tegra114/* arch/arm/cpu/armv7/tegra124/* -> arch/arm/mach-tegra/tegra124/* arch/arm/cpu/armv7/tegra-common/* -> arch/arm/mach-tegra/* arch/arm/cpu/tegra20-common/* -> arch/arm/mach-tegra/tegra20/* arch/arm/cpu/tegra30-common/* -> arch/arm/mach-tegra/tegra30/* arch/arm/cpu/tegra114-common/* -> arch/arm/mach-tegra/tegra114/* arch/arm/cpu/tegra124-common/* -> arch/arm/mach-tegra/tegra124/* arch/arm/cpu/tegra-common/* -> arch/arm/mach-tegra/*
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Tested-by: Simon Glass sjg@chromium.org [ on nyan-big ] Cc: Stephen Warren swarren@nvidia.com Cc: Tom Warren twarren@nvidia.com ---
MAINTAINERS | 4 +--- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 2 ++ arch/arm/cpu/Makefile | 6 +----- arch/arm/cpu/arm720t/Makefile | 6 ------ arch/arm/cpu/arm720t/tegra-common/Makefile | 11 ----------- arch/arm/cpu/arm720t/tegra114/Makefile | 21 --------------------- arch/arm/cpu/arm720t/tegra124/Makefile | 8 -------- arch/arm/cpu/arm720t/tegra20/Makefile | 10 ---------- arch/arm/cpu/arm720t/tegra30/Makefile | 20 -------------------- arch/arm/cpu/armv7/Makefile | 2 -- arch/arm/cpu/armv7/tegra-common/Makefile | 10 ---------- arch/arm/cpu/armv7/tegra20/Makefile | 11 ----------- .../{cpu/armv7/tegra-common => mach-tegra}/Kconfig | 8 ++++---- arch/arm/{cpu/tegra-common => mach-tegra}/Makefile | 12 ++++++++++++ arch/arm/{cpu/tegra-common => mach-tegra}/ap.c | 0 arch/arm/{cpu/tegra-common => mach-tegra}/board.c | 0 arch/arm/{cpu/tegra-common => mach-tegra}/cache.c | 0 arch/arm/{cpu/tegra-common => mach-tegra}/clock.c | 0 .../tegra-common => mach-tegra}/cmd_enterrcm.c | 0 .../{cpu/arm720t/tegra-common => mach-tegra}/cpu.c | 0 .../{cpu/arm720t/tegra-common => mach-tegra}/cpu.h | 0 .../tegra-common => mach-tegra}/lowlevel_init.S | 0 .../tegra-common => mach-tegra}/pinmux-common.c | 0 .../{cpu/tegra-common => mach-tegra}/powergate.c | 0 .../{cpu/arm720t/tegra-common => mach-tegra}/spl.c | 0 .../arm/{cpu/tegra-common => mach-tegra}/sys_info.c | 0 arch/arm/{cpu/armv7 => mach-tegra}/tegra114/Kconfig | 0 .../tegra114}/Makefile | 5 ++--- .../tegra114-common => mach-tegra/tegra114}/clock.c | 0 arch/arm/{cpu/arm720t => mach-tegra}/tegra114/cpu.c | 2 +- .../tegra114}/funcmux.c | 0 .../tegra114}/pinmux.c | 0 arch/arm/{cpu/armv7 => mach-tegra}/tegra124/Kconfig | 0 .../tegra124}/Makefile | 2 ++ .../tegra124-common => mach-tegra/tegra124}/clock.c | 0 arch/arm/{cpu/arm720t => mach-tegra}/tegra124/cpu.c | 2 +- .../tegra124}/funcmux.c | 0 .../tegra124}/pinmux.c | 0 .../tegra124}/xusb-padctl.c | 0 arch/arm/{cpu/armv7 => mach-tegra}/tegra20/Kconfig | 0 .../tegra20-common => mach-tegra/tegra20}/Makefile | 10 +++++++--- .../tegra20-common => mach-tegra/tegra20}/clock.c | 0 arch/arm/{cpu/arm720t => mach-tegra}/tegra20/cpu.c | 2 +- .../tegra20-common => mach-tegra/tegra20}/crypto.c | 0 .../tegra20-common => mach-tegra/tegra20}/crypto.h | 0 .../arm/{cpu/armv7 => mach-tegra}/tegra20/display.c | 0 .../tegra20-common => mach-tegra/tegra20}/emc.c | 0 .../tegra20-common => mach-tegra/tegra20}/funcmux.c | 0 .../tegra20-common => mach-tegra/tegra20}/pinmux.c | 0 .../tegra20-common => mach-tegra/tegra20}/pmu.c | 0 arch/arm/{cpu/armv7 => mach-tegra}/tegra20/pwm.c | 0 .../tegra20}/warmboot.c | 0 .../tegra20}/warmboot_avp.c | 0 .../tegra20}/warmboot_avp.h | 0 arch/arm/{cpu/armv7 => mach-tegra}/tegra30/Kconfig | 0 .../tegra30-common => mach-tegra/tegra30}/Makefile | 5 ++--- .../tegra30-common => mach-tegra/tegra30}/clock.c | 0 arch/arm/{cpu/arm720t => mach-tegra}/tegra30/cpu.c | 2 +- .../tegra30-common => mach-tegra/tegra30}/funcmux.c | 0 .../tegra30-common => mach-tegra/tegra30}/pinmux.c | 0 arch/arm/{cpu/tegra-common => mach-tegra}/vpr.c | 0 .../{cpu/tegra-common => mach-tegra}/xusb-padctl.c | 0 63 files changed, 38 insertions(+), 125 deletions(-) delete mode 100644 arch/arm/cpu/arm720t/tegra-common/Makefile delete mode 100644 arch/arm/cpu/arm720t/tegra114/Makefile delete mode 100644 arch/arm/cpu/arm720t/tegra124/Makefile delete mode 100644 arch/arm/cpu/arm720t/tegra20/Makefile delete mode 100644 arch/arm/cpu/arm720t/tegra30/Makefile delete mode 100644 arch/arm/cpu/armv7/tegra-common/Makefile delete mode 100644 arch/arm/cpu/armv7/tegra20/Makefile rename arch/arm/{cpu/armv7/tegra-common => mach-tegra}/Kconfig (76%) rename arch/arm/{cpu/tegra-common => mach-tegra}/Makefile (61%) rename arch/arm/{cpu/tegra-common => mach-tegra}/ap.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/board.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/cache.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/clock.c (100%) rename arch/arm/{cpu/armv7/tegra-common => mach-tegra}/cmd_enterrcm.c (100%) rename arch/arm/{cpu/arm720t/tegra-common => mach-tegra}/cpu.c (100%) rename arch/arm/{cpu/arm720t/tegra-common => mach-tegra}/cpu.h (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/lowlevel_init.S (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/pinmux-common.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/powergate.c (100%) rename arch/arm/{cpu/arm720t/tegra-common => mach-tegra}/spl.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/sys_info.c (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra114/Kconfig (100%) rename arch/arm/{cpu/tegra114-common => mach-tegra/tegra114}/Makefile (89%) rename arch/arm/{cpu/tegra114-common => mach-tegra/tegra114}/clock.c (100%) rename arch/arm/{cpu/arm720t => mach-tegra}/tegra114/cpu.c (99%) rename arch/arm/{cpu/tegra114-common => mach-tegra/tegra114}/funcmux.c (100%) rename arch/arm/{cpu/tegra114-common => mach-tegra/tegra114}/pinmux.c (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra124/Kconfig (100%) rename arch/arm/{cpu/tegra124-common => mach-tegra/tegra124}/Makefile (84%) rename arch/arm/{cpu/tegra124-common => mach-tegra/tegra124}/clock.c (100%) rename arch/arm/{cpu/arm720t => mach-tegra}/tegra124/cpu.c (99%) rename arch/arm/{cpu/tegra124-common => mach-tegra/tegra124}/funcmux.c (100%) rename arch/arm/{cpu/tegra124-common => mach-tegra/tegra124}/pinmux.c (100%) rename arch/arm/{cpu/tegra124-common => mach-tegra/tegra124}/xusb-padctl.c (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra20/Kconfig (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/Makefile (77%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/clock.c (100%) rename arch/arm/{cpu/arm720t => mach-tegra}/tegra20/cpu.c (98%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/crypto.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/crypto.h (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra20/display.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/emc.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/funcmux.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/pinmux.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/pmu.c (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra20/pwm.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/warmboot.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/warmboot_avp.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/warmboot_avp.h (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra30/Kconfig (100%) rename arch/arm/{cpu/tegra30-common => mach-tegra/tegra30}/Makefile (89%) rename arch/arm/{cpu/tegra30-common => mach-tegra/tegra30}/clock.c (100%) rename arch/arm/{cpu/arm720t => mach-tegra}/tegra30/cpu.c (99%) rename arch/arm/{cpu/tegra30-common => mach-tegra/tegra30}/funcmux.c (100%) rename arch/arm/{cpu/tegra30-common => mach-tegra/tegra30}/pinmux.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/vpr.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/xusb-padctl.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS index a558bd4..63085fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -146,9 +146,7 @@ ARM TEGRA M: Tom Warren twarren@nvidia.com S: Maintained T: git git://git.denx.de/u-boot-tegra.git -F: arch/arm/cpu/arm720t/tegra*/ -F: arch/arm/cpu/armv7/tegra*/ -F: arch/arm/cpu/tegra*/ +F: arch/arm/mach-tegra/ F: arch/arm/include/asm/arch-tegra*/
ARM TI diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 06c3468..adecafc 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -742,7 +742,7 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
-source "arch/arm/cpu/armv7/tegra-common/Kconfig" +source "arch/arm/mach-tegra/Kconfig"
source "arch/arm/cpu/armv7/uniphier/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f4e9af6..f1ae929 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -5,6 +5,8 @@ # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 +# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA +machine-$(CONFIG_TEGRA) += tegra
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index ba4f390..6bea3d3 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -1,5 +1 @@ -obj-$(CONFIG_TEGRA20) += tegra20-common/ -obj-$(CONFIG_TEGRA30) += tegra30-common/ -obj-$(CONFIG_TEGRA114) += tegra114-common/ -obj-$(CONFIG_TEGRA124) += tegra124-common/ -obj-$(CONFIG_TEGRA) += tegra-common/ +obj- += dummy.o diff --git a/arch/arm/cpu/arm720t/Makefile b/arch/arm/cpu/arm720t/Makefile index 9f61ea2..243a123 100644 --- a/arch/arm/cpu/arm720t/Makefile +++ b/arch/arm/cpu/arm720t/Makefile @@ -7,9 +7,3 @@
extra-y = start.o obj-y = interrupts.o cpu.o - -obj-$(CONFIG_TEGRA) += tegra-common/ -obj-$(CONFIG_TEGRA20) += tegra20/ -obj-$(CONFIG_TEGRA30) += tegra30/ -obj-$(CONFIG_TEGRA114) += tegra114/ -obj-$(CONFIG_TEGRA124) += tegra124/ diff --git a/arch/arm/cpu/arm720t/tegra-common/Makefile b/arch/arm/cpu/arm720t/tegra-common/Makefile deleted file mode 100644 index a9c2b67..0000000 --- a/arch/arm/cpu/arm720t/tegra-common/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_SPL_BUILD) += spl.o -obj-y += cpu.o diff --git a/arch/arm/cpu/arm720t/tegra114/Makefile b/arch/arm/cpu/arm720t/tegra114/Makefile deleted file mode 100644 index ea3e55e..0000000 --- a/arch/arm/cpu/arm720t/tegra114/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# - -#obj-y += cpu.o t11x.o -obj-y += cpu.o diff --git a/arch/arm/cpu/arm720t/tegra124/Makefile b/arch/arm/cpu/arm720t/tegra124/Makefile deleted file mode 100644 index 61abf45..0000000 --- a/arch/arm/cpu/arm720t/tegra124/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2013-2014 -# NVIDIA Corporation <www.nvidia.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += cpu.o diff --git a/arch/arm/cpu/arm720t/tegra20/Makefile b/arch/arm/cpu/arm720t/tegra20/Makefile deleted file mode 100644 index 12243fa..0000000 --- a/arch/arm/cpu/arm720t/tegra20/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += cpu.o diff --git a/arch/arm/cpu/arm720t/tegra30/Makefile b/arch/arm/cpu/arm720t/tegra30/Makefile deleted file mode 100644 index 6ff4c55..0000000 --- a/arch/arm/cpu/arm720t/tegra30/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# - -obj-y += cpu.o diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 6dbca26..91e6923 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -32,7 +32,6 @@ obj-$(CONFIG_IPROC) += iproc-common/ obj-$(CONFIG_KONA) += kona-common/ obj-$(CONFIG_OMAP_COMMON) += omap-common/ obj-$(CONFIG_SYS_ARCH_TIMER) += arch_timer.o -obj-$(CONFIG_TEGRA) += tegra-common/
ifneq (,$(filter s5pc1xx exynos,$(SOC))) obj-y += s5p-common/ @@ -57,7 +56,6 @@ obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/ obj-$(CONFIG_SOCFPGA) += socfpga/ obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ -obj-$(CONFIG_TEGRA20) += tegra20/ obj-$(CONFIG_U8500) += u8500/ obj-$(CONFIG_ARCH_UNIPHIER) += uniphier/ obj-$(CONFIG_VF610) += vf610/ diff --git a/arch/arm/cpu/armv7/tegra-common/Makefile b/arch/arm/cpu/armv7/tegra-common/Makefile deleted file mode 100644 index 463c260..0000000 --- a/arch/arm/cpu/armv7/tegra-common/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o diff --git a/arch/arm/cpu/armv7/tegra20/Makefile b/arch/arm/cpu/armv7/tegra20/Makefile deleted file mode 100644 index 9b4295c..0000000 --- a/arch/arm/cpu/armv7/tegra20/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_PWM_TEGRA) += pwm.o -obj-$(CONFIG_VIDEO_TEGRA) += display.o diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig b/arch/arm/mach-tegra/Kconfig similarity index 76% rename from arch/arm/cpu/armv7/tegra-common/Kconfig rename to arch/arm/mach-tegra/Kconfig index ee32469..3a8e2b1 100644 --- a/arch/arm/cpu/armv7/tegra-common/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -44,9 +44,9 @@ config DM_I2C config DM_GPIO default y if !SPL_BUILD
-source "arch/arm/cpu/armv7/tegra20/Kconfig" -source "arch/arm/cpu/armv7/tegra30/Kconfig" -source "arch/arm/cpu/armv7/tegra114/Kconfig" -source "arch/arm/cpu/armv7/tegra124/Kconfig" +source "arch/arm/mach-tegra/tegra20/Kconfig" +source "arch/arm/mach-tegra/tegra30/Kconfig" +source "arch/arm/mach-tegra/tegra114/Kconfig" +source "arch/arm/mach-tegra/tegra124/Kconfig"
endif diff --git a/arch/arm/cpu/tegra-common/Makefile b/arch/arm/mach-tegra/Makefile similarity index 61% rename from arch/arm/cpu/tegra-common/Makefile rename to arch/arm/mach-tegra/Makefile index a78869e..04cef0a 100644 --- a/arch/arm/cpu/tegra-common/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -7,6 +7,13 @@ # SPDX-License-Identifier: GPL-2.0+ #
+ifdef CONFIG_SPL_BUILD +obj-y += spl.o +obj-y += cpu.o +else +obj-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o +endif + obj-y += ap.o obj-y += board.o obj-y += cache.o @@ -17,3 +24,8 @@ obj-y += powergate.o obj-y += xusb-padctl.o obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o obj-$(CONFIG_TEGRA124) += vpr.o + +obj-$(CONFIG_TEGRA20) += tegra20/ +obj-$(CONFIG_TEGRA30) += tegra30/ +obj-$(CONFIG_TEGRA114) += tegra114/ +obj-$(CONFIG_TEGRA124) += tegra124/ diff --git a/arch/arm/cpu/tegra-common/ap.c b/arch/arm/mach-tegra/ap.c similarity index 100% rename from arch/arm/cpu/tegra-common/ap.c rename to arch/arm/mach-tegra/ap.c diff --git a/arch/arm/cpu/tegra-common/board.c b/arch/arm/mach-tegra/board.c similarity index 100% rename from arch/arm/cpu/tegra-common/board.c rename to arch/arm/mach-tegra/board.c diff --git a/arch/arm/cpu/tegra-common/cache.c b/arch/arm/mach-tegra/cache.c similarity index 100% rename from arch/arm/cpu/tegra-common/cache.c rename to arch/arm/mach-tegra/cache.c diff --git a/arch/arm/cpu/tegra-common/clock.c b/arch/arm/mach-tegra/clock.c similarity index 100% rename from arch/arm/cpu/tegra-common/clock.c rename to arch/arm/mach-tegra/clock.c diff --git a/arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c similarity index 100% rename from arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c rename to arch/arm/mach-tegra/cmd_enterrcm.c diff --git a/arch/arm/cpu/arm720t/tegra-common/cpu.c b/arch/arm/mach-tegra/cpu.c similarity index 100% rename from arch/arm/cpu/arm720t/tegra-common/cpu.c rename to arch/arm/mach-tegra/cpu.c diff --git a/arch/arm/cpu/arm720t/tegra-common/cpu.h b/arch/arm/mach-tegra/cpu.h similarity index 100% rename from arch/arm/cpu/arm720t/tegra-common/cpu.h rename to arch/arm/mach-tegra/cpu.h diff --git a/arch/arm/cpu/tegra-common/lowlevel_init.S b/arch/arm/mach-tegra/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/tegra-common/lowlevel_init.S rename to arch/arm/mach-tegra/lowlevel_init.S diff --git a/arch/arm/cpu/tegra-common/pinmux-common.c b/arch/arm/mach-tegra/pinmux-common.c similarity index 100% rename from arch/arm/cpu/tegra-common/pinmux-common.c rename to arch/arm/mach-tegra/pinmux-common.c diff --git a/arch/arm/cpu/tegra-common/powergate.c b/arch/arm/mach-tegra/powergate.c similarity index 100% rename from arch/arm/cpu/tegra-common/powergate.c rename to arch/arm/mach-tegra/powergate.c diff --git a/arch/arm/cpu/arm720t/tegra-common/spl.c b/arch/arm/mach-tegra/spl.c similarity index 100% rename from arch/arm/cpu/arm720t/tegra-common/spl.c rename to arch/arm/mach-tegra/spl.c diff --git a/arch/arm/cpu/tegra-common/sys_info.c b/arch/arm/mach-tegra/sys_info.c similarity index 100% rename from arch/arm/cpu/tegra-common/sys_info.c rename to arch/arm/mach-tegra/sys_info.c diff --git a/arch/arm/cpu/armv7/tegra114/Kconfig b/arch/arm/mach-tegra/tegra114/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/tegra114/Kconfig rename to arch/arm/mach-tegra/tegra114/Kconfig diff --git a/arch/arm/cpu/tegra114-common/Makefile b/arch/arm/mach-tegra/tegra114/Makefile similarity index 89% rename from arch/arm/cpu/tegra114-common/Makefile rename to arch/arm/mach-tegra/tegra114/Makefile index d959b57..7489f5f 100644 --- a/arch/arm/cpu/tegra114-common/Makefile +++ b/arch/arm/mach-tegra/tegra114/Makefile @@ -1,9 +1,6 @@ # # Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. # -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# # This program is free software; you can redistribute it and/or modify it # under the terms and conditions of the GNU General Public License, # version 2, as published by the Free Software Foundation. @@ -17,4 +14,6 @@ # along with this program. If not, see http://www.gnu.org/licenses/. #
+obj-$(CONFIG_SPL_BUILD) += cpu.o + obj-y += clock.o funcmux.o pinmux.o diff --git a/arch/arm/cpu/tegra114-common/clock.c b/arch/arm/mach-tegra/tegra114/clock.c similarity index 100% rename from arch/arm/cpu/tegra114-common/clock.c rename to arch/arm/mach-tegra/tegra114/clock.c diff --git a/arch/arm/cpu/arm720t/tegra114/cpu.c b/arch/arm/mach-tegra/tegra114/cpu.c similarity index 99% rename from arch/arm/cpu/arm720t/tegra114/cpu.c rename to arch/arm/mach-tegra/tegra114/cpu.c index 5ed3bb9..18dc1af 100644 --- a/arch/arm/cpu/arm720t/tegra114/cpu.c +++ b/arch/arm/mach-tegra/tegra114/cpu.c @@ -22,7 +22,7 @@ #include <asm/arch/tegra.h> #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> -#include "../tegra-common/cpu.h" +#include "../cpu.h"
/* Tegra114-specific CPU init code */ static void enable_cpu_power_rail(void) diff --git a/arch/arm/cpu/tegra114-common/funcmux.c b/arch/arm/mach-tegra/tegra114/funcmux.c similarity index 100% rename from arch/arm/cpu/tegra114-common/funcmux.c rename to arch/arm/mach-tegra/tegra114/funcmux.c diff --git a/arch/arm/cpu/tegra114-common/pinmux.c b/arch/arm/mach-tegra/tegra114/pinmux.c similarity index 100% rename from arch/arm/cpu/tegra114-common/pinmux.c rename to arch/arm/mach-tegra/tegra114/pinmux.c diff --git a/arch/arm/cpu/armv7/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/tegra124/Kconfig rename to arch/arm/mach-tegra/tegra124/Kconfig diff --git a/arch/arm/cpu/tegra124-common/Makefile b/arch/arm/mach-tegra/tegra124/Makefile similarity index 84% rename from arch/arm/cpu/tegra124-common/Makefile rename to arch/arm/mach-tegra/tegra124/Makefile index 7b59fb1..ef2da29 100644 --- a/arch/arm/cpu/tegra124-common/Makefile +++ b/arch/arm/mach-tegra/tegra124/Makefile @@ -5,6 +5,8 @@ # SPDX-License-Identifier: GPL-2.0+ #
+obj-$(CONFIG_SPL_BUILD) += cpu.o + obj-y += clock.o obj-y += funcmux.o obj-y += pinmux.o diff --git a/arch/arm/cpu/tegra124-common/clock.c b/arch/arm/mach-tegra/tegra124/clock.c similarity index 100% rename from arch/arm/cpu/tegra124-common/clock.c rename to arch/arm/mach-tegra/tegra124/clock.c diff --git a/arch/arm/cpu/arm720t/tegra124/cpu.c b/arch/arm/mach-tegra/tegra124/cpu.c similarity index 99% rename from arch/arm/cpu/arm720t/tegra124/cpu.c rename to arch/arm/mach-tegra/tegra124/cpu.c index 6ff6aeb..974f203 100644 --- a/arch/arm/cpu/arm720t/tegra124/cpu.c +++ b/arch/arm/mach-tegra/tegra124/cpu.c @@ -15,7 +15,7 @@ #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/ap.h> -#include "../tegra-common/cpu.h" +#include "../cpu.h"
/* Tegra124-specific CPU init code */
diff --git a/arch/arm/cpu/tegra124-common/funcmux.c b/arch/arm/mach-tegra/tegra124/funcmux.c similarity index 100% rename from arch/arm/cpu/tegra124-common/funcmux.c rename to arch/arm/mach-tegra/tegra124/funcmux.c diff --git a/arch/arm/cpu/tegra124-common/pinmux.c b/arch/arm/mach-tegra/tegra124/pinmux.c similarity index 100% rename from arch/arm/cpu/tegra124-common/pinmux.c rename to arch/arm/mach-tegra/tegra124/pinmux.c diff --git a/arch/arm/cpu/tegra124-common/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c similarity index 100% rename from arch/arm/cpu/tegra124-common/xusb-padctl.c rename to arch/arm/mach-tegra/tegra124/xusb-padctl.c diff --git a/arch/arm/cpu/armv7/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/tegra20/Kconfig rename to arch/arm/mach-tegra/tegra20/Kconfig diff --git a/arch/arm/cpu/tegra20-common/Makefile b/arch/arm/mach-tegra/tegra20/Makefile similarity index 77% rename from arch/arm/cpu/tegra20-common/Makefile rename to arch/arm/mach-tegra/tegra20/Makefile index 0e4b3fc..d48f9bb 100644 --- a/arch/arm/cpu/tegra20-common/Makefile +++ b/arch/arm/mach-tegra/tegra20/Makefile @@ -1,12 +1,16 @@ # # (C) Copyright 2010,2011 Nvidia Corporation. # -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# # SPDX-License-Identifier: GPL-2.0+ #
+ifdef CONFIG_SPL_BUILD +obj-y += cpu.o +else +obj-$(CONFIG_PWM_TEGRA) += pwm.o +obj-$(CONFIG_VIDEO_TEGRA) += display.o +endif + # The AVP is ARMv4T architecture so we must use special compiler # flags for any startup files it might use. CFLAGS_warmboot_avp.o += -march=armv4t diff --git a/arch/arm/cpu/tegra20-common/clock.c b/arch/arm/mach-tegra/tegra20/clock.c similarity index 100% rename from arch/arm/cpu/tegra20-common/clock.c rename to arch/arm/mach-tegra/tegra20/clock.c diff --git a/arch/arm/cpu/arm720t/tegra20/cpu.c b/arch/arm/mach-tegra/tegra20/cpu.c similarity index 98% rename from arch/arm/cpu/arm720t/tegra20/cpu.c rename to arch/arm/mach-tegra/tegra20/cpu.c index 2533899..67f49d7 100644 --- a/arch/arm/cpu/arm720t/tegra20/cpu.c +++ b/arch/arm/mach-tegra/tegra20/cpu.c @@ -18,7 +18,7 @@ #include <asm/io.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/pmc.h> -#include "../tegra-common/cpu.h" +#include "../cpu.h"
static void enable_cpu_power_rail(void) { diff --git a/arch/arm/cpu/tegra20-common/crypto.c b/arch/arm/mach-tegra/tegra20/crypto.c similarity index 100% rename from arch/arm/cpu/tegra20-common/crypto.c rename to arch/arm/mach-tegra/tegra20/crypto.c diff --git a/arch/arm/cpu/tegra20-common/crypto.h b/arch/arm/mach-tegra/tegra20/crypto.h similarity index 100% rename from arch/arm/cpu/tegra20-common/crypto.h rename to arch/arm/mach-tegra/tegra20/crypto.h diff --git a/arch/arm/cpu/armv7/tegra20/display.c b/arch/arm/mach-tegra/tegra20/display.c similarity index 100% rename from arch/arm/cpu/armv7/tegra20/display.c rename to arch/arm/mach-tegra/tegra20/display.c diff --git a/arch/arm/cpu/tegra20-common/emc.c b/arch/arm/mach-tegra/tegra20/emc.c similarity index 100% rename from arch/arm/cpu/tegra20-common/emc.c rename to arch/arm/mach-tegra/tegra20/emc.c diff --git a/arch/arm/cpu/tegra20-common/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c similarity index 100% rename from arch/arm/cpu/tegra20-common/funcmux.c rename to arch/arm/mach-tegra/tegra20/funcmux.c diff --git a/arch/arm/cpu/tegra20-common/pinmux.c b/arch/arm/mach-tegra/tegra20/pinmux.c similarity index 100% rename from arch/arm/cpu/tegra20-common/pinmux.c rename to arch/arm/mach-tegra/tegra20/pinmux.c diff --git a/arch/arm/cpu/tegra20-common/pmu.c b/arch/arm/mach-tegra/tegra20/pmu.c similarity index 100% rename from arch/arm/cpu/tegra20-common/pmu.c rename to arch/arm/mach-tegra/tegra20/pmu.c diff --git a/arch/arm/cpu/armv7/tegra20/pwm.c b/arch/arm/mach-tegra/tegra20/pwm.c similarity index 100% rename from arch/arm/cpu/armv7/tegra20/pwm.c rename to arch/arm/mach-tegra/tegra20/pwm.c diff --git a/arch/arm/cpu/tegra20-common/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c similarity index 100% rename from arch/arm/cpu/tegra20-common/warmboot.c rename to arch/arm/mach-tegra/tegra20/warmboot.c diff --git a/arch/arm/cpu/tegra20-common/warmboot_avp.c b/arch/arm/mach-tegra/tegra20/warmboot_avp.c similarity index 100% rename from arch/arm/cpu/tegra20-common/warmboot_avp.c rename to arch/arm/mach-tegra/tegra20/warmboot_avp.c diff --git a/arch/arm/cpu/tegra20-common/warmboot_avp.h b/arch/arm/mach-tegra/tegra20/warmboot_avp.h similarity index 100% rename from arch/arm/cpu/tegra20-common/warmboot_avp.h rename to arch/arm/mach-tegra/tegra20/warmboot_avp.h diff --git a/arch/arm/cpu/armv7/tegra30/Kconfig b/arch/arm/mach-tegra/tegra30/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/tegra30/Kconfig rename to arch/arm/mach-tegra/tegra30/Kconfig diff --git a/arch/arm/cpu/tegra30-common/Makefile b/arch/arm/mach-tegra/tegra30/Makefile similarity index 89% rename from arch/arm/cpu/tegra30-common/Makefile rename to arch/arm/mach-tegra/tegra30/Makefile index d2d616e..bc250de 100644 --- a/arch/arm/cpu/tegra30-common/Makefile +++ b/arch/arm/mach-tegra/tegra30/Makefile @@ -1,9 +1,6 @@ # # Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. # -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# # This program is free software; you can redistribute it and/or modify it # under the terms and conditions of the GNU General Public License, # version 2, as published by the Free Software Foundation. @@ -17,4 +14,6 @@ # along with this program. If not, see http://www.gnu.org/licenses/. #
+obj-$(CONFIG_SPL_BUILD) += cpu.o + obj-y += clock.o funcmux.o pinmux.o diff --git a/arch/arm/cpu/tegra30-common/clock.c b/arch/arm/mach-tegra/tegra30/clock.c similarity index 100% rename from arch/arm/cpu/tegra30-common/clock.c rename to arch/arm/mach-tegra/tegra30/clock.c diff --git a/arch/arm/cpu/arm720t/tegra30/cpu.c b/arch/arm/mach-tegra/tegra30/cpu.c similarity index 99% rename from arch/arm/cpu/arm720t/tegra30/cpu.c rename to arch/arm/mach-tegra/tegra30/cpu.c index 9003902..c76e74c 100644 --- a/arch/arm/cpu/arm720t/tegra30/cpu.c +++ b/arch/arm/mach-tegra/tegra30/cpu.c @@ -22,7 +22,7 @@ #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/tegra_i2c.h> -#include "../tegra-common/cpu.h" +#include "../cpu.h"
/* Tegra30-specific CPU init code */ void tegra_i2c_ll_write_addr(uint addr, uint config) diff --git a/arch/arm/cpu/tegra30-common/funcmux.c b/arch/arm/mach-tegra/tegra30/funcmux.c similarity index 100% rename from arch/arm/cpu/tegra30-common/funcmux.c rename to arch/arm/mach-tegra/tegra30/funcmux.c diff --git a/arch/arm/cpu/tegra30-common/pinmux.c b/arch/arm/mach-tegra/tegra30/pinmux.c similarity index 100% rename from arch/arm/cpu/tegra30-common/pinmux.c rename to arch/arm/mach-tegra/tegra30/pinmux.c diff --git a/arch/arm/cpu/tegra-common/vpr.c b/arch/arm/mach-tegra/vpr.c similarity index 100% rename from arch/arm/cpu/tegra-common/vpr.c rename to arch/arm/mach-tegra/vpr.c diff --git a/arch/arm/cpu/tegra-common/xusb-padctl.c b/arch/arm/mach-tegra/xusb-padctl.c similarity index 100% rename from arch/arm/cpu/tegra-common/xusb-padctl.c rename to arch/arm/mach-tegra/xusb-padctl.c