diff options
| author | Puneet Saxena <puneets@nvidia.com> | 2012-01-20 15:22:14 +0530 |
|---|---|---|
| committer | Puneet Saxena <puneets@nvidia.com> | 2012-02-07 01:58:44 -0800 |
| commit | e8ce66609ca4111eeb590f4840f76bc9a131496f (patch) | |
| tree | 466cfe974f439f73255600512d85e825b3d15852 | |
| parent | 4c33e9b356e622f1e3d60324080011588b6a50ca (diff) | |
tegra: Move display.c & pwfm.c from tegra2 to tegra-common
Move pwfm.c and display.c under common folder tegra-common.
BUG=chromium-os:23496
TEST=Built ok for Cardhu, Waluigi and Seaboard. Tested on Waluigi.
Change-Id: I23c5f02270dde7bfdd6e1d26ed9984385986194e
Signed-off-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/14694
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/display.c (renamed from arch/arm/cpu/armv7/tegra2/display.c) | 0 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/pwfm.c (renamed from arch/arm/cpu/armv7/tegra2/pwfm.c) | 0 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/Makefile | 2 |
4 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/tegra-common/Makefile b/arch/arm/cpu/armv7/tegra-common/Makefile index 226d190447..9e8446ef22 100644 --- a/arch/arm/cpu/armv7/tegra-common/Makefile +++ b/arch/arm/cpu/armv7/tegra-common/Makefile @@ -32,6 +32,7 @@ LIB = $(obj)libtegra-common.o SOBJS-y := lowlevel_init.o COBJS-y := ap20.o board.o clock.o power.o timer.o +COBJS-$(CONFIG_VIDEO_TEGRA) += display.o pwfm.o SOBJS := $(SOBJS-y) COBJS := $(COBJS-y) diff --git a/arch/arm/cpu/armv7/tegra2/display.c b/arch/arm/cpu/armv7/tegra-common/display.c index a653f3aa27..a653f3aa27 100644 --- a/arch/arm/cpu/armv7/tegra2/display.c +++ b/arch/arm/cpu/armv7/tegra-common/display.c diff --git a/arch/arm/cpu/armv7/tegra2/pwfm.c b/arch/arm/cpu/armv7/tegra-common/pwfm.c index 5ef4363082..5ef4363082 100644 --- a/arch/arm/cpu/armv7/tegra2/pwfm.c +++ b/arch/arm/cpu/armv7/tegra-common/pwfm.c diff --git a/arch/arm/cpu/armv7/tegra2/Makefile b/arch/arm/cpu/armv7/tegra2/Makefile index ff2168483d..76457d9cf6 100644 --- a/arch/arm/cpu/armv7/tegra2/Makefile +++ b/arch/arm/cpu/armv7/tegra2/Makefile @@ -33,7 +33,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o SOBJS-y := -COBJS-y := board.o display.o pinmux.o pwfm.o sys_info.o +COBJS-y := board.o pinmux.o sys_info.o COBJS-$(CONFIG_TEGRA2_LP0) += warmboot.o COBJS-$(CONFIG_TEGRA2_LP0) += warmboot_avp.o |