diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/Makefile | 52 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/ap20.c (renamed from arch/arm/cpu/armv7/tegra2/ap20.c) | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/clock.c (renamed from arch/arm/cpu/armv7/tegra2/clock.c) | 0 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/lowlevel_init.S (renamed from arch/arm/cpu/armv7/tegra2/lowlevel_init.S) | 0 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/timer.c (renamed from arch/arm/cpu/armv7/tegra2/timer.c) | 0 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/Makefile | 7 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/warmboot.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/warmboot_avp.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/ap20.h (renamed from arch/arm/cpu/armv7/tegra2/ap20.h) | 0 |
11 files changed, 63 insertions, 9 deletions
@@ -304,6 +304,11 @@ ifeq ($(SOC),s5pc2xx) LIBS += $(CPUDIR)/s5p-common/libs5p-common.o endif +ifeq ($(SOC),tegra2) +LIBS += $(CPUDIR)/tegra-common/libtegra-common.o +endif + + LIBS := $(addprefix $(obj),$(sort $(LIBS))) .PHONY : $(LIBS) $(TIMESTAMP_FILE) diff --git a/arch/arm/cpu/armv7/tegra-common/Makefile b/arch/arm/cpu/armv7/tegra-common/Makefile new file mode 100644 index 00000000000..5c390304855 --- /dev/null +++ b/arch/arm/cpu/armv7/tegra-common/Makefile @@ -0,0 +1,52 @@ +# +# (C) Copyright 2000-2003 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +CFLAGS_arch/arm/cpu/armv7/tegra-common/ap20.o += -march=armv4t +CFLAGS_arch/arm/cpu/armv7/tegra-common/clock.o += -march=armv4t + +include $(TOPDIR)/config.mk + +LIB = $(obj)libtegra-common.o + +SOBJS-y := lowlevel_init.o +COBJS-y := ap20.o clock.o timer.o + +SOBJS := $(SOBJS-y) +COBJS := $(COBJS-y) + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) + +all: $(obj).depend $(LIB) + +$(LIB): $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/arch/arm/cpu/armv7/tegra2/ap20.c b/arch/arm/cpu/armv7/tegra-common/ap20.c index f9aa610aec1..7eae6705224 100644 --- a/arch/arm/cpu/armv7/tegra2/ap20.c +++ b/arch/arm/cpu/armv7/tegra-common/ap20.c @@ -21,7 +21,6 @@ * MA 02111-1307 USA */ -#include "ap20.h" #include <asm/io.h> #include <asm/arch/tegra.h> #include <asm/arch/bitfield.h> @@ -32,6 +31,7 @@ #include <asm/arch/scu.h> #include <common.h> #include <asm/arch/warmboot.h> +#include <asm/arch-tegra/ap20.h> #include "../../../../../board/nvidia/common/board.h" struct clk_pll_table { diff --git a/arch/arm/cpu/armv7/tegra2/clock.c b/arch/arm/cpu/armv7/tegra-common/clock.c index fd5393086fb..fd5393086fb 100644 --- a/arch/arm/cpu/armv7/tegra2/clock.c +++ b/arch/arm/cpu/armv7/tegra-common/clock.c diff --git a/arch/arm/cpu/armv7/tegra2/lowlevel_init.S b/arch/arm/cpu/armv7/tegra-common/lowlevel_init.S index 333f1b7c8e2..333f1b7c8e2 100644 --- a/arch/arm/cpu/armv7/tegra2/lowlevel_init.S +++ b/arch/arm/cpu/armv7/tegra-common/lowlevel_init.S diff --git a/arch/arm/cpu/armv7/tegra2/timer.c b/arch/arm/cpu/armv7/tegra-common/timer.c index 552c9adcbb1..552c9adcbb1 100644 --- a/arch/arm/cpu/armv7/tegra2/timer.c +++ b/arch/arm/cpu/armv7/tegra-common/timer.c diff --git a/arch/arm/cpu/armv7/tegra2/Makefile b/arch/arm/cpu/armv7/tegra2/Makefile index 5812da6cac6..4e0b22f4a68 100644 --- a/arch/arm/cpu/armv7/tegra2/Makefile +++ b/arch/arm/cpu/armv7/tegra2/Makefile @@ -26,17 +26,14 @@ # The AVP is ARMv4T architecture so we must use special compiler # flags for any files it might use. -CFLAGS_arch/arm/cpu/armv7/tegra2/ap20.o += -march=armv4t -CFLAGS_arch/arm/cpu/armv7/tegra2/clock.o += -march=armv4t CFLAGS_arch/arm/cpu/armv7/tegra2/warmboot_avp.o += -march=armv4t include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o -SOBJS-y := lowlevel_init.o -COBJS-y := ap20.o board.o clock.o display.o pinmux.o power.o pwfm.o \ - sys_info.o timer.o +SOBJS-y := +COBJS-y := board.o display.o pinmux.o power.o pwfm.o sys_info.o COBJS-$(CONFIG_TEGRA2_LP0) += warmboot.o COBJS-$(CONFIG_TEGRA2_LP0) += warmboot_avp.o diff --git a/arch/arm/cpu/armv7/tegra2/board.c b/arch/arm/cpu/armv7/tegra2/board.c index 0d71b6157f5..cc3d8dd86fb 100644 --- a/arch/arm/cpu/armv7/tegra2/board.c +++ b/arch/arm/cpu/armv7/tegra2/board.c @@ -23,7 +23,7 @@ #include <common.h> #include <asm/io.h> -#include "ap20.h" +#include <asm/arch-tegra/ap20.h> #include <asm/arch/sys_proto.h> #include <asm/arch/tegra.h> #include <asm/arch/pmc.h> diff --git a/arch/arm/cpu/armv7/tegra2/warmboot.c b/arch/arm/cpu/armv7/tegra2/warmboot.c index 8c2ddf7cdb2..3ee72c4ec1e 100644 --- a/arch/arm/cpu/armv7/tegra2/warmboot.c +++ b/arch/arm/cpu/armv7/tegra2/warmboot.c @@ -35,7 +35,7 @@ #include <asm/arch/gp_padctrl.h> #include <asm/arch/warmboot.h> #include <asm/arch/sdram_param.h> -#include "ap20.h" +#include <asm/arch-tegra/ap20.h> #define BCT_OFFSET 0x100 /* BCT starts at 0x100 */ #define BCT_SDRAM_PARAMS_OFFSET (BCT_OFFSET + 0x88) diff --git a/arch/arm/cpu/armv7/tegra2/warmboot_avp.c b/arch/arm/cpu/armv7/tegra2/warmboot_avp.c index 4a22caf06bc..a3db98907f4 100644 --- a/arch/arm/cpu/armv7/tegra2/warmboot_avp.c +++ b/arch/arm/cpu/armv7/tegra2/warmboot_avp.c @@ -30,7 +30,7 @@ #include <asm/arch/tegra.h> #include <asm/arch/flow.h> #include <asm/arch/warmboot.h> -#include "ap20.h" +#include <asm/arch-tegra/ap20.h> #include "warmboot_avp.h" #define DEBUG_RESET_CORESIGHT diff --git a/arch/arm/cpu/armv7/tegra2/ap20.h b/arch/arm/include/asm/arch-tegra/ap20.h index 4f7d7ce7148..4f7d7ce7148 100644 --- a/arch/arm/cpu/armv7/tegra2/ap20.h +++ b/arch/arm/include/asm/arch-tegra/ap20.h |