Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagn...@jcrosoft.com>
---
Makefile | 6 +++---
board/armltd/.gitignore | 2 ++
board/{ => armltd}/integratorap/Makefile | 0
board/{ => armltd}/integratorap/config.mk | 0
board/{ => armltd}/integratorap/flash.c | 0
board/{ => armltd}/integratorap/integratorap.c | 0
board/{ => armltd}/integratorap/lowlevel_init.S | 0
.../{ => armltd}/integratorap/split_by_variant.sh | 6 +++---
.../{ => armltd}/integratorap/u-boot.lds.template | 0
board/{ => armltd}/integratorcp/Makefile | 0
board/{ => armltd}/integratorcp/config.mk | 0
board/{ => armltd}/integratorcp/flash.c | 0
board/{ => armltd}/integratorcp/integratorcp.c | 0
board/{ => armltd}/integratorcp/lowlevel_init.S | 0
.../{ => armltd}/integratorcp/split_by_variant.sh | 6 +++---
.../{ => armltd}/integratorcp/u-boot.lds.template | 0
board/{ => armltd}/versatile/Makefile | 0
board/{ => armltd}/versatile/config.mk | 0
board/{ => armltd}/versatile/lowlevel_init.S | 0
board/{ => armltd}/versatile/split_by_variant.sh | 2 +-
board/{ => armltd}/versatile/u-boot.lds | 0
board/{ => armltd}/versatile/versatile.c | 0
22 files changed, 12 insertions(+), 10 deletions(-)
create mode 100644 board/armltd/.gitignore
rename board/{ => armltd}/integratorap/Makefile (100%)
rename board/{ => armltd}/integratorap/config.mk (100%)
rename board/{ => armltd}/integratorap/flash.c (100%)
rename board/{ => armltd}/integratorap/integratorap.c (100%)
rename board/{ => armltd}/integratorap/lowlevel_init.S (100%)
rename board/{ => armltd}/integratorap/split_by_variant.sh (92%)
rename board/{ => armltd}/integratorap/u-boot.lds.template (100%)
rename board/{ => armltd}/integratorcp/Makefile (100%)
rename board/{ => armltd}/integratorcp/config.mk (100%)
rename board/{ => armltd}/integratorcp/flash.c (100%)
rename board/{ => armltd}/integratorcp/integratorcp.c (100%)
rename board/{ => armltd}/integratorcp/lowlevel_init.S (100%)
rename board/{ => armltd}/integratorcp/split_by_variant.sh (92%)
rename board/{ => armltd}/integratorcp/u-boot.lds.template (100%)
rename board/{ => armltd}/versatile/Makefile (100%)
rename board/{ => armltd}/versatile/config.mk (100%)
rename board/{ => armltd}/versatile/lowlevel_init.S (100%)
rename board/{ => armltd}/versatile/split_by_variant.sh (94%)
rename board/{ => armltd}/versatile/u-boot.lds (100%)
rename board/{ => armltd}/versatile/versatile.c (100%)
diff --git a/Makefile b/Makefile
index 3c55457..f3b6235 100644
--- a/Makefile
+++ b/Makefile
@@ -2660,7 +2660,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 \
@@ -2672,7 +2672,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
@@ -2822,7 +2822,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
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 8c54250..51dc53f 100755
--- 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 3f0a447..34422fd 100755
--- 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/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 ccded7e..475e5a3 100755
--- 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
--
1.5.6.5
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
