diff --git a/Makefile b/Makefile
index f0a890774..15cc5acda 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
similarity index 93%
rename from board/davinci/da830evm/Makefile
rename to board/davinci/da8xxevm/Makefile
index ee000571f..56047dc63 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
similarity index 100%
rename from board/davinci/da830evm/common.c
rename to board/davinci/da8xxevm/common.c
diff --git a/board/davinci/da830evm/common.h b/board/davinci/da8xxevm/common.h
similarity index 100%
rename from board/davinci/da830evm/common.h
rename to board/davinci/da8xxevm/common.h
diff --git a/board/davinci/da830evm/config.mk b/board/davinci/da8xxevm/config.mk
similarity index 100%
rename from board/davinci/da830evm/config.mk
rename to board/davinci/da8xxevm/config.mk
diff --git a/board/davinci/da830evm/da830evm.c b/board/davinci/da8xxevm/da830evm.c
similarity index 100%
rename from board/davinci/da830evm/da830evm.c
rename to board/davinci/da8xxevm/da830evm.c