summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--board/davinci/da8xxevm/Makefile (renamed from board/davinci/da830evm/Makefile)5
-rw-r--r--board/davinci/da8xxevm/common.c (renamed from board/davinci/da830evm/common.c)0
-rw-r--r--board/davinci/da8xxevm/common.h (renamed from board/davinci/da830evm/common.h)0
-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
6 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f0a8907745..15cc5acda3 100644
--- a/Makefile
+++ b/Makefile
@@ -2917,7 +2917,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 ee000571f5..56047dc63d 100644
--- a/board/davinci/da830evm/Makefile
+++ b/board/davinci/da8xxevm/Makefile
@@ -27,7 +27,10 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS := da830evm.o common.o
+COBJS-y += common.o
+COBJS-$(CONFIG_MACH_DAVINCI_DA830_EVM) += da830evm.o
+
+COBJS := $(COBJS-y)
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/davinci/da830evm/common.c b/board/davinci/da8xxevm/common.c
index 9cd5204c74..9cd5204c74 100644
--- a/board/davinci/da830evm/common.c
+++ b/board/davinci/da8xxevm/common.c
diff --git a/board/davinci/da830evm/common.h b/board/davinci/da8xxevm/common.h
index 7ae63a6d38..7ae63a6d38 100644
--- a/board/davinci/da830evm/common.h
+++ b/board/davinci/da8xxevm/common.h
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 57506d647a..57506d647a 100644
--- a/board/davinci/da830evm/da830evm.c
+++ b/board/davinci/da8xxevm/da830evm.c