From 89d51d022a63be1a851eda983c8cbce1a044f65f Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Date: Wed, 27 Aug 2008 21:35:52 +0200
Subject: [PATCH] ARM DaVinci: Standardize names of directories/files
ARM DaVinci: Standardize names of directories/files.
Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
Makefile | 2 +-
board/davinci/{dv-evm => dvevm}/Makefile | 2 +-
board/davinci/{dv-evm => dvevm}/board_init.S | 0
board/davinci/{dv-evm => dvevm}/config.mk | 0
board/davinci/{dv-evm/dv_board.c => dvevm/dvevm.c} | 0
board/davinci/{dv-evm => dvevm}/u-boot.lds | 0
board/davinci/schmoogie/Makefile | 2 +-
board/davinci/schmoogie/{dv_board.c => schmoogie.c} | 0
board/davinci/sonata/Makefile | 2 +-
board/davinci/sonata/{dv_board.c => sonata.c} | 0
10 files changed, 4 insertions(+), 4 deletions(-)
rename board/davinci/{dv-evm => dvevm}/Makefile (98%)
rename board/davinci/{dv-evm => dvevm}/board_init.S (100%)
rename board/davinci/{dv-evm => dvevm}/config.mk (100%)
rename board/davinci/{dv-evm/dv_board.c => dvevm/dvevm.c} (100%)
rename board/davinci/{dv-evm => dvevm}/u-boot.lds (100%)
rename board/davinci/schmoogie/{dv_board.c => schmoogie.c} (100%)
rename board/davinci/sonata/{dv_board.c => sonata.c} (100%)
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
similarity index 98%
rename from board/davinci/dv-evm/Makefile
rename to 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
similarity index 100%
rename from board/davinci/dv-evm/board_init.S
rename to board/davinci/dvevm/board_init.S
diff --git a/board/davinci/dv-evm/config.mk b/board/davinci/dvevm/config.mk
similarity index 100%
rename from board/davinci/dv-evm/config.mk
rename to board/davinci/dvevm/config.mk
diff --git a/board/davinci/dv-evm/dv_board.c b/board/davinci/dvevm/dvevm.c
similarity index 100%
rename from board/davinci/dv-evm/dv_board.c
rename to board/davinci/dvevm/dvevm.c
diff --git a/board/davinci/dv-evm/u-boot.lds b/board/davinci/dvevm/u-boot.lds
similarity index 100%
rename from board/davinci/dv-evm/u-boot.lds
rename to 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
similarity index 100%
rename from board/davinci/schmoogie/dv_board.c
rename to 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
similarity index 100%
rename from board/davinci/sonata/dv_board.c
rename to board/davinci/sonata/sonata.c
--
2.39.5