diff options
| author | Robert Rosengren <robert.rosengren@stericsson.com> | 2010-12-14 09:12:41 +0100 |
|---|---|---|
| committer | Michael BRANDT <michael.brandt@stericsson.com> | 2010-12-15 09:53:31 +0100 |
| commit | c0d5e1d2461f8135492a79f3e5259ac324ee1a96 (patch) | |
| tree | 485a730652f6ff122f269f3583130dbbd29a68df | |
| parent | a7d22caa0320025442cb8c275bd70d034f5eb308 (diff) | |
U8500: Move itp and cspsa into SoC directory
itp.c and cspsa_fp.c is SoC specific, not board specific.
Other db8500 based boards need it as well, therefore move it into
the SoC directory.
ST-Ericsson ID: WP275634
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I386c0d84e9f44f18ded0d9059fc2dae4c27974f2
Signed-off-by: Robert Rosengren <robert.rosengren@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/10894
Reviewed-by: QATOOLS
Reviewed-by: Michael BRANDT <michael.brandt@stericsson.com>
Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com>
Reviewed-by: Joakim AXELSSON <joakim.axelsson@stericsson.com>
| -rw-r--r-- | board/st/u8500/Makefile | 1 | ||||
| -rw-r--r-- | board/st/u8500/u8500.c | 2 | ||||
| -rw-r--r-- | cpu/arm_cortexa9/db8500/Makefile | 3 | ||||
| -rw-r--r-- | cpu/arm_cortexa9/db8500/cspsa_fp.c (renamed from board/st/u8500/cspsa_fp.c) | 2 | ||||
| -rw-r--r-- | cpu/arm_cortexa9/db8500/itp.c (renamed from board/st/u8500/itp.c) | 4 | ||||
| -rw-r--r-- | include/asm-arm/arch-db8500/cspsa_fp.h (renamed from board/st/u8500/cspsa_fp.h) | 0 | ||||
| -rw-r--r-- | include/asm-arm/arch-db8500/itp.h (renamed from board/st/u8500/itp.h) | 0 |
7 files changed, 7 insertions, 5 deletions
diff --git a/board/st/u8500/Makefile b/board/st/u8500/Makefile index 55de856b4..9c6da5a12 100644 --- a/board/st/u8500/Makefile +++ b/board/st/u8500/Makefile @@ -28,7 +28,6 @@ LIB = $(obj)lib$(BOARD).a COBJS := u8500.o u8500_i2c.o mmc_host.o mmc_utils.o ab8500vibra.o cmd_cdump.o SOBJS := mmc_fifo.o -COBJS-$(CONFIG_ITP_LOAD) += itp.o cspsa_fp.o COBJS-$(CONFIG_VIDEO_LOGO) += mcde_display.o mcde_hw.o mcde_display_image.o COBJS += $(COBJS-y) diff --git a/board/st/u8500/u8500.c b/board/st/u8500/u8500.c index 307b25fa4..51cb5e1f0 100644 --- a/board/st/u8500/u8500.c +++ b/board/st/u8500/u8500.c @@ -16,8 +16,8 @@ #include <asm/arch/hardware.h> #include <asm/arch/ab8500.h> #include <asm/arch/prcmu.h> +#include <asm/arch/itp.h> #include <tc35892.h> -#include "itp.h" #include <asm/arch/common.h> diff --git a/cpu/arm_cortexa9/db8500/Makefile b/cpu/arm_cortexa9/db8500/Makefile index 32be6e4fb..0832867a9 100644 --- a/cpu/arm_cortexa9/db8500/Makefile +++ b/cpu/arm_cortexa9/db8500/Makefile @@ -36,6 +36,9 @@ COBJS += interrupts.o COBJS += prcmu.o COBJS += timer.o +COBJS-$(CONFIG_ITP_LOAD) += itp.o cspsa_fp.o +COBJS += $(COBJS-y) + SRCS := $(START:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) START := $(addprefix $(obj),$(START)) diff --git a/board/st/u8500/cspsa_fp.c b/cpu/arm_cortexa9/db8500/cspsa_fp.c index 9517f2762..2b0a22af0 100644 --- a/board/st/u8500/cspsa_fp.c +++ b/cpu/arm_cortexa9/db8500/cspsa_fp.c @@ -13,7 +13,7 @@ * */ -#include "cspsa_fp.h" +#include <asm/arch/cspsa_fp.h> #include <malloc.h> #include <part.h> diff --git a/board/st/u8500/itp.c b/cpu/arm_cortexa9/db8500/itp.c index 929dd45ec..ae13dcbb1 100644 --- a/board/st/u8500/itp.c +++ b/cpu/arm_cortexa9/db8500/itp.c @@ -10,8 +10,8 @@ #include <part.h> #include <mmc.h> #include <asm/arch/ab8500.h> -#include "itp.h" -#include "cspsa_fp.h" +#include <asm/arch/itp.h> +#include <asm/arch/cspsa_fp.h> #define SEC_ROM_FORCE_CLEAN_MASK 0x0020 #define SEC_ROM_RET_OK 0x01 diff --git a/board/st/u8500/cspsa_fp.h b/include/asm-arm/arch-db8500/cspsa_fp.h index 13ddd1e69..13ddd1e69 100644 --- a/board/st/u8500/cspsa_fp.h +++ b/include/asm-arm/arch-db8500/cspsa_fp.h diff --git a/board/st/u8500/itp.h b/include/asm-arm/arch-db8500/itp.h index e1faf0db0..e1faf0db0 100644 --- a/board/st/u8500/itp.h +++ b/include/asm-arm/arch-db8500/itp.h |