summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudhakar Rajashekhara <sudhakar.raj@ti.com>2010-01-15 15:12:37 +0530
committerSudhakar Rajashekhara <sudhakar.raj@ti.com>2010-01-19 13:30:19 +0530
commitf4708ecae2d647276b1c8b6af07ed3b2b0677b20 (patch)
treee578699810c14c100b5f1a05fd3d0acd411d6614
parent04765ff12c17f4c2b922f7cc4e085ce74ce1204b (diff)
da8xx: Prepare for da850
Since da850 is similar to da830 in many aspects, keep da850 specific files under da830 folder and rename the da830 folder to da8xx. Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
-rw-r--r--Makefile2
-rw-r--r--board/davinci/da8xxevm/Makefile (renamed from board/davinci/da830evm/Makefile)4
-rw-r--r--board/davinci/da8xxevm/config.mk (renamed from board/davinci/da830evm/config.mk)0
-rw-r--r--board/davinci/da8xxevm/da830evm.c (renamed from board/davinci/da830evm/da830evm.c)0
4 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 536ccb3e32..b430a73c5b 100644
--- a/Makefile
+++ b/Makefile
@@ -2934,7 +2934,7 @@ cp1026_config: unconfig
@board/armltd/integrator/split_by_variant.sh cp $@
da830evm_config: unconfig
- @$(MKCONFIG) $(@:_config=) arm arm926ejs da830evm davinci davinci
+ @$(MKCONFIG) $(@:_config=) arm arm926ejs da8xxevm davinci davinci
davinci_dvevm_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci
diff --git a/board/davinci/da830evm/Makefile b/board/davinci/da8xxevm/Makefile
index 02636fa775..20f4915382 100644
--- a/board/davinci/da830evm/Makefile
+++ b/board/davinci/da8xxevm/Makefile
@@ -27,7 +27,9 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS := da830evm.o
+COBJS-$(CONFIG_MACH_DAVINCI_DA830_EVM) += da830evm.o
+
+COBJS := $(sort $(COBJS-y))
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/davinci/da830evm/config.mk b/board/davinci/da8xxevm/config.mk
index 6da29a979f..6da29a979f 100644
--- a/board/davinci/da830evm/config.mk
+++ b/board/davinci/da8xxevm/config.mk
diff --git a/board/davinci/da830evm/da830evm.c b/board/davinci/da8xxevm/da830evm.c
index ddce94d2f8..ddce94d2f8 100644
--- a/board/davinci/da830evm/da830evm.c
+++ b/board/davinci/da8xxevm/da830evm.c