Bladeren bron

ARM: tegra: collect SoC sources into mach-tegra

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>
Masahiro Yamada 9 jaren geleden
bovenliggende
commit
09f455dca7
63 gewijzigde bestanden met toevoegingen van 38 en 125 verwijderingen
  1. 1 3
      MAINTAINERS
  2. 1 1
      arch/arm/Kconfig
  3. 2 0
      arch/arm/Makefile
  4. 1 5
      arch/arm/cpu/Makefile
  5. 0 6
      arch/arm/cpu/arm720t/Makefile
  6. 0 11
      arch/arm/cpu/arm720t/tegra-common/Makefile
  7. 0 21
      arch/arm/cpu/arm720t/tegra114/Makefile
  8. 0 8
      arch/arm/cpu/arm720t/tegra124/Makefile
  9. 0 10
      arch/arm/cpu/arm720t/tegra20/Makefile
  10. 0 20
      arch/arm/cpu/arm720t/tegra30/Makefile
  11. 0 2
      arch/arm/cpu/armv7/Makefile
  12. 0 10
      arch/arm/cpu/armv7/tegra-common/Makefile
  13. 0 11
      arch/arm/cpu/armv7/tegra20/Makefile
  14. 4 4
      arch/arm/mach-tegra/Kconfig
  15. 12 0
      arch/arm/mach-tegra/Makefile
  16. 0 0
      arch/arm/mach-tegra/ap.c
  17. 0 0
      arch/arm/mach-tegra/board.c
  18. 0 0
      arch/arm/mach-tegra/cache.c
  19. 0 0
      arch/arm/mach-tegra/clock.c
  20. 0 0
      arch/arm/mach-tegra/cmd_enterrcm.c
  21. 0 0
      arch/arm/mach-tegra/cpu.c
  22. 0 0
      arch/arm/mach-tegra/cpu.h
  23. 0 0
      arch/arm/mach-tegra/lowlevel_init.S
  24. 0 0
      arch/arm/mach-tegra/pinmux-common.c
  25. 0 0
      arch/arm/mach-tegra/powergate.c
  26. 0 0
      arch/arm/mach-tegra/spl.c
  27. 0 0
      arch/arm/mach-tegra/sys_info.c
  28. 0 0
      arch/arm/mach-tegra/tegra114/Kconfig
  29. 2 3
      arch/arm/mach-tegra/tegra114/Makefile
  30. 0 0
      arch/arm/mach-tegra/tegra114/clock.c
  31. 1 1
      arch/arm/mach-tegra/tegra114/cpu.c
  32. 0 0
      arch/arm/mach-tegra/tegra114/funcmux.c
  33. 0 0
      arch/arm/mach-tegra/tegra114/pinmux.c
  34. 0 0
      arch/arm/mach-tegra/tegra124/Kconfig
  35. 2 0
      arch/arm/mach-tegra/tegra124/Makefile
  36. 0 0
      arch/arm/mach-tegra/tegra124/clock.c
  37. 1 1
      arch/arm/mach-tegra/tegra124/cpu.c
  38. 0 0
      arch/arm/mach-tegra/tegra124/funcmux.c
  39. 0 0
      arch/arm/mach-tegra/tegra124/pinmux.c
  40. 0 0
      arch/arm/mach-tegra/tegra124/xusb-padctl.c
  41. 0 0
      arch/arm/mach-tegra/tegra20/Kconfig
  42. 7 3
      arch/arm/mach-tegra/tegra20/Makefile
  43. 0 0
      arch/arm/mach-tegra/tegra20/clock.c
  44. 1 1
      arch/arm/mach-tegra/tegra20/cpu.c
  45. 0 0
      arch/arm/mach-tegra/tegra20/crypto.c
  46. 0 0
      arch/arm/mach-tegra/tegra20/crypto.h
  47. 0 0
      arch/arm/mach-tegra/tegra20/display.c
  48. 0 0
      arch/arm/mach-tegra/tegra20/emc.c
  49. 0 0
      arch/arm/mach-tegra/tegra20/funcmux.c
  50. 0 0
      arch/arm/mach-tegra/tegra20/pinmux.c
  51. 0 0
      arch/arm/mach-tegra/tegra20/pmu.c
  52. 0 0
      arch/arm/mach-tegra/tegra20/pwm.c
  53. 0 0
      arch/arm/mach-tegra/tegra20/warmboot.c
  54. 0 0
      arch/arm/mach-tegra/tegra20/warmboot_avp.c
  55. 0 0
      arch/arm/mach-tegra/tegra20/warmboot_avp.h
  56. 0 0
      arch/arm/mach-tegra/tegra30/Kconfig
  57. 2 3
      arch/arm/mach-tegra/tegra30/Makefile
  58. 0 0
      arch/arm/mach-tegra/tegra30/clock.c
  59. 1 1
      arch/arm/mach-tegra/tegra30/cpu.c
  60. 0 0
      arch/arm/mach-tegra/tegra30/funcmux.c
  61. 0 0
      arch/arm/mach-tegra/tegra30/pinmux.c
  62. 0 0
      arch/arm/mach-tegra/vpr.c
  63. 0 0
      arch/arm/mach-tegra/xusb-padctl.c

+ 1 - 3
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

+ 1 - 1
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"
 

+ 2 - 0
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))
 

+ 1 - 5
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

+ 0 - 6
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/

+ 0 - 11
arch/arm/cpu/arm720t/tegra-common/Makefile

@@ -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

+ 0 - 21
arch/arm/cpu/arm720t/tegra114/Makefile

@@ -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

+ 0 - 8
arch/arm/cpu/arm720t/tegra124/Makefile

@@ -1,8 +0,0 @@
-#
-# (C) Copyright 2013-2014
-# NVIDIA Corporation <www.nvidia.com>
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y	+= cpu.o

+ 0 - 10
arch/arm/cpu/arm720t/tegra20/Makefile

@@ -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

+ 0 - 20
arch/arm/cpu/arm720t/tegra30/Makefile

@@ -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

+ 0 - 2
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/

+ 0 - 10
arch/arm/cpu/armv7/tegra-common/Makefile

@@ -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

+ 0 - 11
arch/arm/cpu/armv7/tegra20/Makefile

@@ -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

+ 4 - 4
arch/arm/cpu/armv7/tegra-common/Kconfig → 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

+ 12 - 0
arch/arm/cpu/tegra-common/Makefile → 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/

+ 0 - 0
arch/arm/cpu/tegra-common/ap.c → arch/arm/mach-tegra/ap.c


+ 0 - 0
arch/arm/cpu/tegra-common/board.c → arch/arm/mach-tegra/board.c


+ 0 - 0
arch/arm/cpu/tegra-common/cache.c → arch/arm/mach-tegra/cache.c


+ 0 - 0
arch/arm/cpu/tegra-common/clock.c → arch/arm/mach-tegra/clock.c


+ 0 - 0
arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c → arch/arm/mach-tegra/cmd_enterrcm.c


+ 0 - 0
arch/arm/cpu/arm720t/tegra-common/cpu.c → arch/arm/mach-tegra/cpu.c


+ 0 - 0
arch/arm/cpu/arm720t/tegra-common/cpu.h → arch/arm/mach-tegra/cpu.h


+ 0 - 0
arch/arm/cpu/tegra-common/lowlevel_init.S → arch/arm/mach-tegra/lowlevel_init.S


+ 0 - 0
arch/arm/cpu/tegra-common/pinmux-common.c → arch/arm/mach-tegra/pinmux-common.c


+ 0 - 0
arch/arm/cpu/tegra-common/powergate.c → arch/arm/mach-tegra/powergate.c


+ 0 - 0
arch/arm/cpu/arm720t/tegra-common/spl.c → arch/arm/mach-tegra/spl.c


+ 0 - 0
arch/arm/cpu/tegra-common/sys_info.c → arch/arm/mach-tegra/sys_info.c


+ 0 - 0
arch/arm/cpu/armv7/tegra114/Kconfig → arch/arm/mach-tegra/tegra114/Kconfig


+ 2 - 3
arch/arm/cpu/tegra114-common/Makefile → 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

+ 0 - 0
arch/arm/cpu/tegra114-common/clock.c → arch/arm/mach-tegra/tegra114/clock.c


+ 1 - 1
arch/arm/cpu/arm720t/tegra114/cpu.c → 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)

+ 0 - 0
arch/arm/cpu/tegra114-common/funcmux.c → arch/arm/mach-tegra/tegra114/funcmux.c


+ 0 - 0
arch/arm/cpu/tegra114-common/pinmux.c → arch/arm/mach-tegra/tegra114/pinmux.c


+ 0 - 0
arch/arm/cpu/armv7/tegra124/Kconfig → arch/arm/mach-tegra/tegra124/Kconfig


+ 2 - 0
arch/arm/cpu/tegra124-common/Makefile → 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

+ 0 - 0
arch/arm/cpu/tegra124-common/clock.c → arch/arm/mach-tegra/tegra124/clock.c


+ 1 - 1
arch/arm/cpu/arm720t/tegra124/cpu.c → 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 */
 

+ 0 - 0
arch/arm/cpu/tegra124-common/funcmux.c → arch/arm/mach-tegra/tegra124/funcmux.c


+ 0 - 0
arch/arm/cpu/tegra124-common/pinmux.c → arch/arm/mach-tegra/tegra124/pinmux.c


+ 0 - 0
arch/arm/cpu/tegra124-common/xusb-padctl.c → arch/arm/mach-tegra/tegra124/xusb-padctl.c


+ 0 - 0
arch/arm/cpu/armv7/tegra20/Kconfig → arch/arm/mach-tegra/tegra20/Kconfig


+ 7 - 3
arch/arm/cpu/tegra20-common/Makefile → 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

+ 0 - 0
arch/arm/cpu/tegra20-common/clock.c → arch/arm/mach-tegra/tegra20/clock.c


+ 1 - 1
arch/arm/cpu/arm720t/tegra20/cpu.c → 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)
 {

+ 0 - 0
arch/arm/cpu/tegra20-common/crypto.c → arch/arm/mach-tegra/tegra20/crypto.c


+ 0 - 0
arch/arm/cpu/tegra20-common/crypto.h → arch/arm/mach-tegra/tegra20/crypto.h


+ 0 - 0
arch/arm/cpu/armv7/tegra20/display.c → arch/arm/mach-tegra/tegra20/display.c


+ 0 - 0
arch/arm/cpu/tegra20-common/emc.c → arch/arm/mach-tegra/tegra20/emc.c


+ 0 - 0
arch/arm/cpu/tegra20-common/funcmux.c → arch/arm/mach-tegra/tegra20/funcmux.c


+ 0 - 0
arch/arm/cpu/tegra20-common/pinmux.c → arch/arm/mach-tegra/tegra20/pinmux.c


+ 0 - 0
arch/arm/cpu/tegra20-common/pmu.c → arch/arm/mach-tegra/tegra20/pmu.c


+ 0 - 0
arch/arm/cpu/armv7/tegra20/pwm.c → arch/arm/mach-tegra/tegra20/pwm.c


+ 0 - 0
arch/arm/cpu/tegra20-common/warmboot.c → arch/arm/mach-tegra/tegra20/warmboot.c


+ 0 - 0
arch/arm/cpu/tegra20-common/warmboot_avp.c → arch/arm/mach-tegra/tegra20/warmboot_avp.c


+ 0 - 0
arch/arm/cpu/tegra20-common/warmboot_avp.h → arch/arm/mach-tegra/tegra20/warmboot_avp.h


+ 0 - 0
arch/arm/cpu/armv7/tegra30/Kconfig → arch/arm/mach-tegra/tegra30/Kconfig


+ 2 - 3
arch/arm/cpu/tegra30-common/Makefile → 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

+ 0 - 0
arch/arm/cpu/tegra30-common/clock.c → arch/arm/mach-tegra/tegra30/clock.c


+ 1 - 1
arch/arm/cpu/arm720t/tegra30/cpu.c → 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)

+ 0 - 0
arch/arm/cpu/tegra30-common/funcmux.c → arch/arm/mach-tegra/tegra30/funcmux.c


+ 0 - 0
arch/arm/cpu/tegra30-common/pinmux.c → arch/arm/mach-tegra/tegra30/pinmux.c


+ 0 - 0
arch/arm/cpu/tegra-common/vpr.c → arch/arm/mach-tegra/vpr.c


+ 0 - 0
arch/arm/cpu/tegra-common/xusb-padctl.c → arch/arm/mach-tegra/xusb-padctl.c