move ARM Ltd. to vendor dir

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/Makefile b/Makefile
index 8ae000f70388738302f2213a0dd3c088510744e2..5b1e56872eadc257747f76ba61002373b8cfba82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2713,7 +2713,7 @@ ap720t_config             \
 ap920t_config          \
 ap926ejs_config                \
 ap946es_config: unconfig
-       @board/integratorap/split_by_variant.sh $@
+       @board/armltd/integratorap/split_by_variant.sh $@
 
 integratorcp_config    \
 cp_config              \
@@ -2725,7 +2725,7 @@ cp966_config              \
 cp922_config           \
 cp922_XA10_config      \
 cp1026_config: unconfig
-       @board/integratorcp/split_by_variant.sh $@
+       @board/armltd/integratorcp/split_by_variant.sh $@
 
 davinci_dvevm_config : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci
@@ -2867,7 +2867,7 @@ cm41xx_config     :       unconfig
 versatile_config       \
 versatileab_config     \
 versatilepb_config :   unconfig
-       @board/versatile/split_by_variant.sh $@
+       @board/armltd/versatile/split_by_variant.sh $@
 
 voiceblue_config:      unconfig
        @$(MKCONFIG) $(@:_config=) arm arm925t voiceblue

diff --git a/board/armltd/.gitignore b/board/armltd/.gitignore
new file mode 100644 (file)
index 0000000..a3df156
--- /dev/null
+++ b/board/armltd/.gitignore
@@ -0,0 +1,2 @@
+/integratorap/u-boot.lds
+/integratorcp/u-boot.lds

diff --git a/board/integratorap/Makefile b/board/armltd/integratorap/Makefile
similarity index 100%
rename from board/integratorap/Makefile
rename to board/armltd/integratorap/Makefile

diff --git a/board/integratorap/config.mk b/board/armltd/integratorap/config.mk
similarity index 100%
rename from board/integratorap/config.mk
rename to board/armltd/integratorap/config.mk

diff --git a/board/integratorap/flash.c b/board/armltd/integratorap/flash.c
similarity index 100%
rename from board/integratorap/flash.c
rename to board/armltd/integratorap/flash.c

diff --git a/board/integratorap/integratorap.c b/board/armltd/integratorap/integratorap.c
similarity index 100%
rename from board/integratorap/integratorap.c
rename to board/armltd/integratorap/integratorap.c

diff --git a/board/integratorap/lowlevel_init.S b/board/armltd/integratorap/lowlevel_init.S
similarity index 100%
rename from board/integratorap/lowlevel_init.S
rename to board/armltd/integratorap/lowlevel_init.S

diff --git a/board/integratorap/split_by_variant.sh b/board/armltd/integratorap/split_by_variant.sh
similarity index 92%
rename from board/integratorap/split_by_variant.sh
rename to board/armltd/integratorap/split_by_variant.sh
index 8c54250ec4a8c2ba4a0e663c5bd3098e8a6881e9..51dc53f1bd6a231100ce896d7f1a5c161d47683e 100755 (executable)
--- a/board/integratorap/split_by_variant.sh
+++ b/board/armltd/integratorap/split_by_variant.sh
@@ -105,15 +105,15 @@ then
 fi
 
 mkdir -p ${obj}include
-mkdir -p ${obj}board/integratorap
+mkdir -p ${obj}board/armltd/integratorap
 mv tmp.fil ${obj}include/config.h
 # ---------------------------------------------------------
 #      Ensure correct core object loaded first in U-Boot image
 # ---------------------------------------------------------
-sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/integratorap/u-boot.lds.template > ${obj}board/integratorap/u-boot.lds
+sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/armltd/integratorap/u-boot.lds.template > ${obj}board/armltd/integratorap/u-boot.lds
 # ---------------------------------------------------------
 # Complete the configuration
 # ---------------------------------------------------------
-$MKCONFIG -a integratorap arm $cpu integratorap;
+$MKCONFIG -a integratorap arm $cpu integratorap armltd;
 echo "Variant:: $variant with core $cpu"
 

diff --git a/board/integratorap/u-boot.lds.template b/board/armltd/integratorap/u-boot.lds.template
similarity index 100%
rename from board/integratorap/u-boot.lds.template
rename to board/armltd/integratorap/u-boot.lds.template

diff --git a/board/integratorcp/Makefile b/board/armltd/integratorcp/Makefile
similarity index 100%
rename from board/integratorcp/Makefile
rename to board/armltd/integratorcp/Makefile

diff --git a/board/integratorcp/config.mk b/board/armltd/integratorcp/config.mk
similarity index 100%
rename from board/integratorcp/config.mk
rename to board/armltd/integratorcp/config.mk

diff --git a/board/integratorcp/flash.c b/board/armltd/integratorcp/flash.c
similarity index 100%
rename from board/integratorcp/flash.c
rename to board/armltd/integratorcp/flash.c

diff --git a/board/integratorcp/integratorcp.c b/board/armltd/integratorcp/integratorcp.c
similarity index 100%
rename from board/integratorcp/integratorcp.c
rename to board/armltd/integratorcp/integratorcp.c

diff --git a/board/integratorcp/lowlevel_init.S b/board/armltd/integratorcp/lowlevel_init.S
similarity index 100%
rename from board/integratorcp/lowlevel_init.S
rename to board/armltd/integratorcp/lowlevel_init.S

diff --git a/board/integratorcp/split_by_variant.sh b/board/armltd/integratorcp/split_by_variant.sh
similarity index 92%
rename from board/integratorcp/split_by_variant.sh
rename to board/armltd/integratorcp/split_by_variant.sh
index 3f0a447e447bdff6e6607605d1ceef43883df7ec..34422fd2f602da4ecc35f124dcfc78659b3bd595 100755 (executable)
--- a/board/integratorcp/split_by_variant.sh
+++ b/board/armltd/integratorcp/split_by_variant.sh
@@ -100,15 +100,15 @@ then
 fi
 
 mkdir -p ${obj}include
-mkdir -p ${obj}board/integratorcp
+mkdir -p ${obj}board/armltd/integratorcp
 mv tmp.fil ${obj}include/config.h
 # ---------------------------------------------------------
 #  Ensure correct core object loaded first in U-Boot image
 # ---------------------------------------------------------
-sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/integratorcp/u-boot.lds.template > ${obj}board/integratorcp/u-boot.lds
+sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/armltd/integratorcp/u-boot.lds.template > ${obj}board/armltd/integratorcp/u-boot.lds
 # ---------------------------------------------------------
 # Complete the configuration
 # ---------------------------------------------------------
-$MKCONFIG -a integratorcp arm $cpu integratorcp;
+$MKCONFIG -a integratorcp arm $cpu integratorcp armltd;
 echo "Variant:: $variant with core $cpu"
 

diff --git a/board/integratorcp/u-boot.lds.template b/board/armltd/integratorcp/u-boot.lds.template
similarity index 100%
rename from board/integratorcp/u-boot.lds.template
rename to board/armltd/integratorcp/u-boot.lds.template

diff --git a/board/versatile/Makefile b/board/armltd/versatile/Makefile
similarity index 100%
rename from board/versatile/Makefile
rename to board/armltd/versatile/Makefile

diff --git a/board/versatile/config.mk b/board/armltd/versatile/config.mk
similarity index 100%
rename from board/versatile/config.mk
rename to board/armltd/versatile/config.mk

diff --git a/board/versatile/flash.c b/board/armltd/versatile/flash.c
similarity index 100%
rename from board/versatile/flash.c
rename to board/armltd/versatile/flash.c

diff --git a/board/versatile/lowlevel_init.S b/board/armltd/versatile/lowlevel_init.S
similarity index 100%
rename from board/versatile/lowlevel_init.S
rename to board/armltd/versatile/lowlevel_init.S

diff --git a/board/versatile/split_by_variant.sh b/board/armltd/versatile/split_by_variant.sh
similarity index 94%
rename from board/versatile/split_by_variant.sh
rename to board/armltd/versatile/split_by_variant.sh
index ccded7e8cfc88c75853ca5eda2feeeb9d8bff572..475e5a33b3eb780f73c1de72df29dd43c53049a4 100755 (executable)
--- a/board/versatile/split_by_variant.sh
+++ b/board/armltd/versatile/split_by_variant.sh
@@ -38,5 +38,5 @@ fi
 # ---------------------------------------------------------
 # Complete the configuration
 # ---------------------------------------------------------
-$MKCONFIG -a versatile arm arm926ejs versatile NULL versatile
+$MKCONFIG -a versatile arm arm926ejs versatile armltd versatile
 echo "Variant:: $variant"

diff --git a/board/versatile/u-boot.lds b/board/armltd/versatile/u-boot.lds
similarity index 100%
rename from board/versatile/u-boot.lds
rename to board/armltd/versatile/u-boot.lds

diff --git a/board/versatile/versatile.c b/board/armltd/versatile/versatile.c
similarity index 100%
rename from board/versatile/versatile.c
rename to board/armltd/versatile/versatile.c