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>

diff --git a/Makefile b/Makefile
index 0f82e714a248832ff4fec5948e1e4aeb62353db3..b1900b110debc1eec3b5b083a67d6ab3bcd9b37e 100644 (file)
--- 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 579efe2623004a91a5397ab72cbef8538775417b..fb31ee42b2575520dbd707efd90a0fb9241d8ff9 100644 (file)
--- 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 579efe2623004a91a5397ab72cbef8538775417b..fb31ee42b2575520dbd707efd90a0fb9241d8ff9 100644 (file)
--- 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 579efe2623004a91a5397ab72cbef8538775417b..fb31ee42b2575520dbd707efd90a0fb9241d8ff9 100644 (file)
--- 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