]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
ARM: tegra: collect SoC sources into mach-tegra
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Fri, 20 Feb 2015 08:04:04 +0000 (17:04 +0900)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 1 Sep 2015 11:53:53 +0000 (13:53 +0200)
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>
63 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/cpu/Makefile
arch/arm/cpu/arm720t/Makefile
arch/arm/cpu/arm720t/tegra-common/Makefile [deleted file]
arch/arm/cpu/arm720t/tegra114/Makefile [deleted file]
arch/arm/cpu/arm720t/tegra124/Makefile [deleted file]
arch/arm/cpu/arm720t/tegra20/Makefile [deleted file]
arch/arm/cpu/arm720t/tegra30/Makefile [deleted file]
arch/arm/cpu/armv7/Makefile
arch/arm/cpu/armv7/tegra-common/Makefile [deleted file]
arch/arm/cpu/armv7/tegra20/Makefile [deleted file]
arch/arm/mach-tegra/Kconfig [moved from arch/arm/cpu/armv7/tegra-common/Kconfig with 76% similarity]
arch/arm/mach-tegra/Makefile [moved from arch/arm/cpu/tegra-common/Makefile with 61% similarity]
arch/arm/mach-tegra/ap.c [moved from arch/arm/cpu/tegra-common/ap.c with 100% similarity]
arch/arm/mach-tegra/board.c [moved from arch/arm/cpu/tegra-common/board.c with 100% similarity]
arch/arm/mach-tegra/cache.c [moved from arch/arm/cpu/tegra-common/cache.c with 100% similarity]
arch/arm/mach-tegra/clock.c [moved from arch/arm/cpu/tegra-common/clock.c with 100% similarity]
arch/arm/mach-tegra/cmd_enterrcm.c [moved from arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c with 100% similarity]
arch/arm/mach-tegra/cpu.c [moved from arch/arm/cpu/arm720t/tegra-common/cpu.c with 100% similarity]
arch/arm/mach-tegra/cpu.h [moved from arch/arm/cpu/arm720t/tegra-common/cpu.h with 100% similarity]
arch/arm/mach-tegra/lowlevel_init.S [moved from arch/arm/cpu/tegra-common/lowlevel_init.S with 100% similarity]
arch/arm/mach-tegra/pinmux-common.c [moved from arch/arm/cpu/tegra-common/pinmux-common.c with 100% similarity]
arch/arm/mach-tegra/powergate.c [moved from arch/arm/cpu/tegra-common/powergate.c with 100% similarity]
arch/arm/mach-tegra/spl.c [moved from arch/arm/cpu/arm720t/tegra-common/spl.c with 100% similarity]
arch/arm/mach-tegra/sys_info.c [moved from arch/arm/cpu/tegra-common/sys_info.c with 100% similarity]
arch/arm/mach-tegra/tegra114/Kconfig [moved from arch/arm/cpu/armv7/tegra114/Kconfig with 100% similarity]
arch/arm/mach-tegra/tegra114/Makefile [moved from arch/arm/cpu/tegra114-common/Makefile with 89% similarity]
arch/arm/mach-tegra/tegra114/clock.c [moved from arch/arm/cpu/tegra114-common/clock.c with 100% similarity]
arch/arm/mach-tegra/tegra114/cpu.c [moved from arch/arm/cpu/arm720t/tegra114/cpu.c with 99% similarity]
arch/arm/mach-tegra/tegra114/funcmux.c [moved from arch/arm/cpu/tegra114-common/funcmux.c with 100% similarity]
arch/arm/mach-tegra/tegra114/pinmux.c [moved from arch/arm/cpu/tegra114-common/pinmux.c with 100% similarity]
arch/arm/mach-tegra/tegra124/Kconfig [moved from arch/arm/cpu/armv7/tegra124/Kconfig with 100% similarity]
arch/arm/mach-tegra/tegra124/Makefile [moved from arch/arm/cpu/tegra124-common/Makefile with 84% similarity]
arch/arm/mach-tegra/tegra124/clock.c [moved from arch/arm/cpu/tegra124-common/clock.c with 100% similarity]
arch/arm/mach-tegra/tegra124/cpu.c [moved from arch/arm/cpu/arm720t/tegra124/cpu.c with 99% similarity]
arch/arm/mach-tegra/tegra124/funcmux.c [moved from arch/arm/cpu/tegra124-common/funcmux.c with 100% similarity]
arch/arm/mach-tegra/tegra124/pinmux.c [moved from arch/arm/cpu/tegra124-common/pinmux.c with 100% similarity]
arch/arm/mach-tegra/tegra124/xusb-padctl.c [moved from arch/arm/cpu/tegra124-common/xusb-padctl.c with 100% similarity]
arch/arm/mach-tegra/tegra20/Kconfig [moved from arch/arm/cpu/armv7/tegra20/Kconfig with 100% similarity]
arch/arm/mach-tegra/tegra20/Makefile [moved from arch/arm/cpu/tegra20-common/Makefile with 77% similarity]
arch/arm/mach-tegra/tegra20/clock.c [moved from arch/arm/cpu/tegra20-common/clock.c with 100% similarity]
arch/arm/mach-tegra/tegra20/cpu.c [moved from arch/arm/cpu/arm720t/tegra20/cpu.c with 98% similarity]
arch/arm/mach-tegra/tegra20/crypto.c [moved from arch/arm/cpu/tegra20-common/crypto.c with 100% similarity]
arch/arm/mach-tegra/tegra20/crypto.h [moved from arch/arm/cpu/tegra20-common/crypto.h with 100% similarity]
arch/arm/mach-tegra/tegra20/display.c [moved from arch/arm/cpu/armv7/tegra20/display.c with 100% similarity]
arch/arm/mach-tegra/tegra20/emc.c [moved from arch/arm/cpu/tegra20-common/emc.c with 100% similarity]
arch/arm/mach-tegra/tegra20/funcmux.c [moved from arch/arm/cpu/tegra20-common/funcmux.c with 100% similarity]
arch/arm/mach-tegra/tegra20/pinmux.c [moved from arch/arm/cpu/tegra20-common/pinmux.c with 100% similarity]
arch/arm/mach-tegra/tegra20/pmu.c [moved from arch/arm/cpu/tegra20-common/pmu.c with 100% similarity]
arch/arm/mach-tegra/tegra20/pwm.c [moved from arch/arm/cpu/armv7/tegra20/pwm.c with 100% similarity]
arch/arm/mach-tegra/tegra20/warmboot.c [moved from arch/arm/cpu/tegra20-common/warmboot.c with 100% similarity]
arch/arm/mach-tegra/tegra20/warmboot_avp.c [moved from arch/arm/cpu/tegra20-common/warmboot_avp.c with 100% similarity]
arch/arm/mach-tegra/tegra20/warmboot_avp.h [moved from arch/arm/cpu/tegra20-common/warmboot_avp.h with 100% similarity]
arch/arm/mach-tegra/tegra30/Kconfig [moved from arch/arm/cpu/armv7/tegra30/Kconfig with 100% similarity]
arch/arm/mach-tegra/tegra30/Makefile [moved from arch/arm/cpu/tegra30-common/Makefile with 89% similarity]
arch/arm/mach-tegra/tegra30/clock.c [moved from arch/arm/cpu/tegra30-common/clock.c with 100% similarity]
arch/arm/mach-tegra/tegra30/cpu.c [moved from arch/arm/cpu/arm720t/tegra30/cpu.c with 99% similarity]
arch/arm/mach-tegra/tegra30/funcmux.c [moved from arch/arm/cpu/tegra30-common/funcmux.c with 100% similarity]
arch/arm/mach-tegra/tegra30/pinmux.c [moved from arch/arm/cpu/tegra30-common/pinmux.c with 100% similarity]
arch/arm/mach-tegra/vpr.c [moved from arch/arm/cpu/tegra-common/vpr.c with 100% similarity]
arch/arm/mach-tegra/xusb-padctl.c [moved from arch/arm/cpu/tegra-common/xusb-padctl.c with 100% similarity]

index a558bd4fcb4a6eaee2e5e793126ad91787c3941f..63085fc16db531f95b1f6858ef7e738c6de7d113 100644 (file)
@@ -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
index b04d5e2b866a85d76037f0ae8897572c30d81030..c0e1ed3bdc61f3bf4a0a1e508c161226da62e5b2 100644 (file)
@@ -828,7 +828,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"
 
index eb3a0a82d20baec0e8b9e86704a8dfa1736054a1..a0db66bf7205a15663957f0967a83958dcc3e338 100644 (file)
@@ -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))
 
index ba4f3900f70c527505914d41712fecbc408150fc..6bea3d3a2dd76c4129a4b99c793a11651747e214 100644 (file)
@@ -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
index 9f61ea25167d6bfc98ed01f2176cc628a03b9bf4..243a123378198b701c428e93e632fc75b494ef36 100644 (file)
@@ -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 (file)
index a9c2b67..0000000
+++ /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 (file)
index ea3e55e..0000000
+++ /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 (file)
index 61abf45..0000000
+++ /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 (file)
index 12243fa..0000000
+++ /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 (file)
index 6ff4c55..0000000
+++ /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
index b758184b0120e1e76863f7012934436fff8f6954..1b927b64f5d3cdfff2b9f381f532232f59479835 100644 (file)
@@ -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_SOC_VF610) += vf610/
diff --git a/arch/arm/cpu/armv7/tegra-common/Makefile b/arch/arm/cpu/armv7/tegra-common/Makefile
deleted file mode 100644 (file)
index 463c260..0000000
+++ /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 (file)
index 9b4295c..0000000
+++ /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
similarity index 76%
rename from arch/arm/cpu/armv7/tegra-common/Kconfig
rename to arch/arm/mach-tegra/Kconfig
index ee3246929a34222dd14a2a3ff504806871d85c73..3a8e2b19d67c73b4cb81931712007bd97c55c358 100644 (file)
@@ -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
similarity index 61%
rename from arch/arm/cpu/tegra-common/Makefile
rename to arch/arm/mach-tegra/Makefile
index a78869ee2329a6ca5019f91c9168cac83fba61cf..04cef0a252abbdf04a1ec48e024ca77a15e38ad8 100644 (file)
@@ -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/
similarity index 89%
rename from arch/arm/cpu/tegra114-common/Makefile
rename to arch/arm/mach-tegra/tegra114/Makefile
index d959b575cea345a8829fdfd25cadd7bc19190a75..7489f5f146d7fff03508791723d940f3e9764823 100644 (file)
@@ -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
similarity index 99%
rename from arch/arm/cpu/arm720t/tegra114/cpu.c
rename to arch/arm/mach-tegra/tegra114/cpu.c
index 5ed3bb9d9aba3453d85f617a9606bb166a6a31b5..18dc1af1b44bde423a05adc2c8ee2487deb78963 100644 (file)
@@ -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)
similarity index 84%
rename from arch/arm/cpu/tegra124-common/Makefile
rename to arch/arm/mach-tegra/tegra124/Makefile
index 7b59fb121614002dd2a48345994a4f8d41754c4a..ef2da29f3085c4c3e4da20a4115e2685d9ccb661 100644 (file)
@@ -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
similarity index 99%
rename from arch/arm/cpu/arm720t/tegra124/cpu.c
rename to arch/arm/mach-tegra/tegra124/cpu.c
index 6ff6aeb5463a1ad2622f3f1be3e4056050778fe9..974f203f12b6ee8fd7b231d7ef398f8f20efe925 100644 (file)
@@ -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 */
 
similarity index 77%
rename from arch/arm/cpu/tegra20-common/Makefile
rename to arch/arm/mach-tegra/tegra20/Makefile
index 0e4b3fc1ddbf3752284fb2d522b003d6ac6a9927..d48f9bb32536e5873cab11b91d5ce1097b9a5677 100644 (file)
@@ -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
similarity index 98%
rename from arch/arm/cpu/arm720t/tegra20/cpu.c
rename to arch/arm/mach-tegra/tegra20/cpu.c
index 253389955fb2a7b045c09e08e633c2fed80b9093..67f49d7756153867d6bf2410038c9ca61ec8aa21 100644 (file)
@@ -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)
 {
similarity index 89%
rename from arch/arm/cpu/tegra30-common/Makefile
rename to arch/arm/mach-tegra/tegra30/Makefile
index d2d616e8a4b51bc09db2790a2c2d5857b9eddb3a..bc250deba826e58bb1fcda221e4ca2bf4ad075ec 100644 (file)
@@ -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
similarity index 99%
rename from arch/arm/cpu/arm720t/tegra30/cpu.c
rename to arch/arm/mach-tegra/tegra30/cpu.c
index 9003902e3ff704c6244ff1cc0e804fd577c3ad1b..c76e74c65f6a5d9986a3ac39d446d7a390eb4f8d 100644 (file)
@@ -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)