Move files that are going to be common between T20 and T30 into 'tegra-common' subdirs in AVP (arm720t), CPU (armv7), and shared (arch/arm/cpu/.) areas. Any files that are left behind in '/tegra20' will be copied to '/tegra30' subdirs and modified for that SoC. The 'common' files should need only minor changes.
Include files (arch/arm/include/asm/arch-tegra/tegra20) will be done in a follow-on patch.
Builds fine w/MAKEALL -s tegra20. Checkpatch.pl is clean.
Signed-off-by: Tom Warren twarren@nvidia.com --- Makefile | 2 ++ .../cpu/arm720t/{tegra20 => tegra-common}/Makefile | 3 +-- .../cpu/arm720t/{tegra20 => tegra-common}/board.h | 0 .../cpu/arm720t/{tegra20 => tegra-common}/cpu.h | 0 .../cpu/arm720t/{tegra20 => tegra-common}/spl.c | 0 arch/arm/cpu/arm720t/tegra20/Makefile | 1 - arch/arm/cpu/arm720t/tegra20/cpu.c | 2 +- .../cpu/armv7/{tegra20 => tegra-common}/Makefile | 3 +-- .../armv7/{tegra20 => tegra-common}/cmd_enterrcm.c | 0 arch/arm/cpu/armv7/tegra20/Makefile | 1 - .../cpu/{arm720t/tegra20 => tegra-common}/Makefile | 10 +++++----- .../{tegra20-common/ap20.c => tegra-common/ap.c} | 0 .../cpu/{tegra20-common => tegra-common}/board.c | 0 .../lowlevel_init.S | 0 .../{tegra20-common => tegra-common}/sys_info.c | 0 .../cpu/{tegra20-common => tegra-common}/timer.c | 0 arch/arm/cpu/tegra20-common/Makefile | 3 +-- spl/Makefile | 2 ++ 18 files changed, 13 insertions(+), 14 deletions(-) copy arch/arm/cpu/arm720t/{tegra20 => tegra-common}/Makefile (97%) rename arch/arm/cpu/arm720t/{tegra20 => tegra-common}/board.h (100%) rename arch/arm/cpu/arm720t/{tegra20 => tegra-common}/cpu.h (100%) rename arch/arm/cpu/arm720t/{tegra20 => tegra-common}/spl.c (100%) copy arch/arm/cpu/armv7/{tegra20 => tegra-common}/Makefile (95%) rename arch/arm/cpu/armv7/{tegra20 => tegra-common}/cmd_enterrcm.c (100%) copy arch/arm/cpu/{arm720t/tegra20 => tegra-common}/Makefile (86%) rename arch/arm/cpu/{tegra20-common/ap20.c => tegra-common/ap.c} (100%) rename arch/arm/cpu/{tegra20-common => tegra-common}/board.c (100%) rename arch/arm/cpu/{tegra20-common => tegra-common}/lowlevel_init.S (100%) rename arch/arm/cpu/{tegra20-common => tegra-common}/sys_info.c (100%) rename arch/arm/cpu/{tegra20-common => tegra-common}/timer.c (100%)
diff --git a/Makefile b/Makefile index fe2f98c..584d398 100644 --- a/Makefile +++ b/Makefile @@ -318,6 +318,8 @@ LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o endif ifeq ($(SOC),tegra20) LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o +LIBS-y += arch/$(ARCH)/cpu/tegra-common/libcputegra-common.o +LIBS-y += $(CPUDIR)/tegra-common/libtegra-common.o endif
LIBS := $(addprefix $(obj),$(sort $(LIBS-y))) diff --git a/arch/arm/cpu/arm720t/tegra20/Makefile b/arch/arm/cpu/arm720t/tegra-common/Makefile similarity index 97% copy from arch/arm/cpu/arm720t/tegra20/Makefile copy to arch/arm/cpu/arm720t/tegra-common/Makefile index 6e48475..febd2e3 100644 --- a/arch/arm/cpu/arm720t/tegra20/Makefile +++ b/arch/arm/cpu/arm720t/tegra-common/Makefile @@ -25,9 +25,8 @@
include $(TOPDIR)/config.mk
-LIB = $(obj)lib$(SOC).o +LIB = $(obj)libtegra-common.o
-COBJS-y += cpu.o COBJS-$(CONFIG_SPL_BUILD) += spl.o
SRCS := $(COBJS-y:.o=.c) diff --git a/arch/arm/cpu/arm720t/tegra20/board.h b/arch/arm/cpu/arm720t/tegra-common/board.h similarity index 100% rename from arch/arm/cpu/arm720t/tegra20/board.h rename to arch/arm/cpu/arm720t/tegra-common/board.h diff --git a/arch/arm/cpu/arm720t/tegra20/cpu.h b/arch/arm/cpu/arm720t/tegra-common/cpu.h similarity index 100% rename from arch/arm/cpu/arm720t/tegra20/cpu.h rename to arch/arm/cpu/arm720t/tegra-common/cpu.h diff --git a/arch/arm/cpu/arm720t/tegra20/spl.c b/arch/arm/cpu/arm720t/tegra-common/spl.c similarity index 100% rename from arch/arm/cpu/arm720t/tegra20/spl.c rename to arch/arm/cpu/arm720t/tegra-common/spl.c diff --git a/arch/arm/cpu/arm720t/tegra20/Makefile b/arch/arm/cpu/arm720t/tegra20/Makefile index 6e48475..8958e65 100644 --- a/arch/arm/cpu/arm720t/tegra20/Makefile +++ b/arch/arm/cpu/arm720t/tegra20/Makefile @@ -28,7 +28,6 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o
COBJS-y += cpu.o -COBJS-$(CONFIG_SPL_BUILD) += spl.o
SRCS := $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y)) diff --git a/arch/arm/cpu/arm720t/tegra20/cpu.c b/arch/arm/cpu/arm720t/tegra20/cpu.c index ddf8d97..8b72938 100644 --- a/arch/arm/cpu/arm720t/tegra20/cpu.c +++ b/arch/arm/cpu/arm720t/tegra20/cpu.c @@ -29,7 +29,7 @@ #include <asm/arch/pinmux.h> #include <asm/arch/scu.h> #include <common.h> -#include "cpu.h" +#include "../tegra-common/cpu.h"
/* Returns 1 if the current CPU executing is a Cortex-A9, else 0 */ int ap20_cpu_is_cortexa9(void) diff --git a/arch/arm/cpu/armv7/tegra20/Makefile b/arch/arm/cpu/armv7/tegra-common/Makefile similarity index 95% copy from arch/arm/cpu/armv7/tegra20/Makefile copy to arch/arm/cpu/armv7/tegra-common/Makefile index 5f4035d..f4961fa 100644 --- a/arch/arm/cpu/armv7/tegra20/Makefile +++ b/arch/arm/cpu/armv7/tegra-common/Makefile @@ -25,9 +25,8 @@
include $(TOPDIR)/config.mk
-LIB = $(obj)lib$(SOC).o +LIB = $(obj)libtegra-common.o
-COBJS-$(CONFIG_USB_EHCI_TEGRA) += usb.o COBJS-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o
COBJS := $(COBJS-y) diff --git a/arch/arm/cpu/armv7/tegra20/cmd_enterrcm.c b/arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c similarity index 100% rename from arch/arm/cpu/armv7/tegra20/cmd_enterrcm.c rename to arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c diff --git a/arch/arm/cpu/armv7/tegra20/Makefile b/arch/arm/cpu/armv7/tegra20/Makefile index 5f4035d..09a0314 100644 --- a/arch/arm/cpu/armv7/tegra20/Makefile +++ b/arch/arm/cpu/armv7/tegra20/Makefile @@ -28,7 +28,6 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o
COBJS-$(CONFIG_USB_EHCI_TEGRA) += usb.o -COBJS-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o
COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/arch/arm/cpu/arm720t/tegra20/Makefile b/arch/arm/cpu/tegra-common/Makefile similarity index 86% copy from arch/arm/cpu/arm720t/tegra20/Makefile copy to arch/arm/cpu/tegra-common/Makefile index 6e48475..38e90d3 100644 --- a/arch/arm/cpu/arm720t/tegra20/Makefile +++ b/arch/arm/cpu/tegra-common/Makefile @@ -25,13 +25,13 @@
include $(TOPDIR)/config.mk
-LIB = $(obj)lib$(SOC).o +LIB = $(obj)libcputegra-common.o
-COBJS-y += cpu.o -COBJS-$(CONFIG_SPL_BUILD) += spl.o +SOBJS += lowlevel_init.o +COBJS-y += ap.o board.o sys_info.o timer.o
-SRCS := $(COBJS-y:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS-y)) +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
all: $(obj).depend $(LIB)
diff --git a/arch/arm/cpu/tegra20-common/ap20.c b/arch/arm/cpu/tegra-common/ap.c similarity index 100% rename from arch/arm/cpu/tegra20-common/ap20.c rename to arch/arm/cpu/tegra-common/ap.c diff --git a/arch/arm/cpu/tegra20-common/board.c b/arch/arm/cpu/tegra-common/board.c similarity index 100% rename from arch/arm/cpu/tegra20-common/board.c rename to arch/arm/cpu/tegra-common/board.c diff --git a/arch/arm/cpu/tegra20-common/lowlevel_init.S b/arch/arm/cpu/tegra-common/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/tegra20-common/lowlevel_init.S rename to arch/arm/cpu/tegra-common/lowlevel_init.S diff --git a/arch/arm/cpu/tegra20-common/sys_info.c b/arch/arm/cpu/tegra-common/sys_info.c similarity index 100% rename from arch/arm/cpu/tegra20-common/sys_info.c rename to arch/arm/cpu/tegra-common/sys_info.c diff --git a/arch/arm/cpu/tegra20-common/timer.c b/arch/arm/cpu/tegra-common/timer.c similarity index 100% rename from arch/arm/cpu/tegra20-common/timer.c rename to arch/arm/cpu/tegra-common/timer.c diff --git a/arch/arm/cpu/tegra20-common/Makefile b/arch/arm/cpu/tegra20-common/Makefile index 9e91e5c..8184e5e 100644 --- a/arch/arm/cpu/tegra20-common/Makefile +++ b/arch/arm/cpu/tegra20-common/Makefile @@ -31,8 +31,7 @@ CFLAGS_arch/arm/cpu/tegra20-common/warmboot_avp.o += -march=armv4t
LIB = $(obj)lib$(SOC)-common.o
-SOBJS += lowlevel_init.o -COBJS-y += ap20.o board.o clock.o funcmux.o pinmux.o sys_info.o timer.o +COBJS-y += clock.o funcmux.o pinmux.o COBJS-$(CONFIG_TEGRA_LP0) += warmboot.o crypto.o warmboot_avp.o COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o COBJS-$(CONFIG_TEGRA_PMU) += pmu.o diff --git a/spl/Makefile b/spl/Makefile index 476a5e6..f98bc23 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -63,6 +63,8 @@ endif
ifeq ($(SOC),tegra20) LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o +LIBS-y += arch/$(ARCH)/cpu/tegra-common/libcputegra-common.o +LIBS-y += $(CPUDIR)/tegra-common/libtegra-common.o endif
# Add GCC lib