From 158557001afe167dcb848bb14ba0f2f20aeb25a1 Mon Sep 17 00:00:00 2001 From: Sudhakar Rajashekhara Date: Tue, 8 Jun 2010 11:01:58 +0530 Subject: [PATCH] TI: DaVinci: Prepare for da850 support DA850/OMAP-L138 is a new SoC from Texas Instruments (http://focus.ti.com/docs/prod/folders/print/omap-l138.html). This SoC is similar to DA830/OMAP-L137 in many aspects. Hence rename the da830 specific files and folders to da8xx to accommodate DA850/OMAP-L138. Signed-off-by: Sudhakar Rajashekhara Acked-by: Ben Gardiner Reviewed-by: Wolfgang Denk Signed-off-by: Sandeep Paulraj --- Makefile | 2 +- board/davinci/{da830evm => da8xxevm}/Makefile | 5 ++++- board/davinci/{da830evm => da8xxevm}/common.c | 0 board/davinci/{da830evm => da8xxevm}/common.h | 0 board/davinci/{da830evm => da8xxevm}/config.mk | 0 board/davinci/{da830evm => da8xxevm}/da830evm.c | 0 6 files changed, 5 insertions(+), 2 deletions(-) rename board/davinci/{da830evm => da8xxevm}/Makefile (93%) rename board/davinci/{da830evm => da8xxevm}/common.c (100%) rename board/davinci/{da830evm => da8xxevm}/common.h (100%) rename board/davinci/{da830evm => da8xxevm}/config.mk (100%) rename board/davinci/{da830evm => da8xxevm}/da830evm.c (100%) 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 similarity index 93% rename from board/davinci/da830evm/Makefile rename to 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 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 -- 2.25.1