summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--board/davinci/dvevm/Makefile (renamed from board/davinci/dv-evm/Makefile)2
-rw-r--r--board/davinci/dvevm/board_init.S (renamed from board/davinci/dv-evm/board_init.S)0
-rw-r--r--board/davinci/dvevm/config.mk (renamed from board/davinci/dv-evm/config.mk)0
-rw-r--r--board/davinci/dvevm/dvevm.c (renamed from board/davinci/dv-evm/dv_board.c)0
-rw-r--r--board/davinci/dvevm/u-boot.lds (renamed from board/davinci/dv-evm/u-boot.lds)0
-rw-r--r--board/davinci/schmoogie/Makefile2
-rw-r--r--board/davinci/schmoogie/schmoogie.c (renamed from board/davinci/schmoogie/dv_board.c)0
-rw-r--r--board/davinci/sonata/Makefile2
-rw-r--r--board/davinci/sonata/sonata.c (renamed from board/davinci/sonata/dv_board.c)0
10 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0f82e714a2..b1900b110d 100644
--- a/Makefile
+++ b/Makefile
@@ -2495,7 +2495,7 @@ cp1026_config: unconfig
@board/integratorcp/split_by_variant.sh $@
davinci_dvevm_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm926ejs dv-evm davinci davinci
+ @$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci
davinci_schmoogie_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm926ejs schmoogie davinci davinci
diff --git a/board/davinci/dv-evm/Makefile b/board/davinci/dvevm/Makefile
index 579efe2623..fb31ee42b2 100644
--- a/board/davinci/dv-evm/Makefile
+++ b/board/davinci/dvevm/Makefile
@@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS := dv_board.o
+COBJS := $(BOARD).o
SOBJS := board_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/board/davinci/dv-evm/board_init.S b/board/davinci/dvevm/board_init.S
index 22d8adc18c..22d8adc18c 100644
--- a/board/davinci/dv-evm/board_init.S
+++ b/board/davinci/dvevm/board_init.S
diff --git a/board/davinci/dv-evm/config.mk b/board/davinci/dvevm/config.mk
index aa89d0ec8a..aa89d0ec8a 100644
--- a/board/davinci/dv-evm/config.mk
+++ b/board/davinci/dvevm/config.mk
diff --git a/board/davinci/dv-evm/dv_board.c b/board/davinci/dvevm/dvevm.c
index 151f8a9007..151f8a9007 100644
--- a/board/davinci/dv-evm/dv_board.c
+++ b/board/davinci/dvevm/dvevm.c
diff --git a/board/davinci/dv-evm/u-boot.lds b/board/davinci/dvevm/u-boot.lds
index a4fcd1a9bb..a4fcd1a9bb 100644
--- a/board/davinci/dv-evm/u-boot.lds
+++ b/board/davinci/dvevm/u-boot.lds
diff --git a/board/davinci/schmoogie/Makefile b/board/davinci/schmoogie/Makefile
index 579efe2623..fb31ee42b2 100644
--- a/board/davinci/schmoogie/Makefile
+++ b/board/davinci/schmoogie/Makefile
@@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS := dv_board.o
+COBJS := $(BOARD).o
SOBJS := board_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/board/davinci/schmoogie/dv_board.c b/board/davinci/schmoogie/schmoogie.c
index 99fd32629f..99fd32629f 100644
--- a/board/davinci/schmoogie/dv_board.c
+++ b/board/davinci/schmoogie/schmoogie.c
diff --git a/board/davinci/sonata/Makefile b/board/davinci/sonata/Makefile
index 579efe2623..fb31ee42b2 100644
--- a/board/davinci/sonata/Makefile
+++ b/board/davinci/sonata/Makefile
@@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS := dv_board.o
+COBJS := $(BOARD).o
SOBJS := board_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/board/davinci/sonata/dv_board.c b/board/davinci/sonata/sonata.c
index a6fe82593a..a6fe82593a 100644
--- a/board/davinci/sonata/dv_board.c
+++ b/board/davinci/sonata/sonata.c
OpenPOWER on IntegriCloud