rename colibri_t20

Now with most of the U-Boot side cleaned-up ready for merging actually
make sure it can be used from within the tegra-uboot-flasher flasher.
As a first step rename colibri-t20 to colibri_t20 as used anywhere else
(apart from the Yocto stuff I agree).

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
Tested-by: Marcel Ziswiler <marcel@ziswiler.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>

16 files changed, 60 insertions, 60 deletions

diff --git a/tegra20/toradex/colibri-t20/colibri-t20_512_v11_nand.img.cfg b/tegra20/toradex/colibri-t20/colibri-t20_512_v11_nand.img.cfg
deleted file mode 100644
index 9ae818d..0000000
--- a/tegra20/toradex/colibri-t20/colibri-t20_512_v11_nand.img.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2013, Lucas Stach
-#
-# This software is provided 'as-is', without any express or implied
-# warranty. In no event will the authors be held liable for any damages
-# arising from the use of this software.
-#
-# Permission is granted to anyone to use this software for any purpose,
-# including commercial applications, and to alter it and redistribute it
-# freely, subject to the following restrictions:
-#
-# 1. The origin of this software must not be misrepresented; you must not
-#    claim that you wrote the original software. If you use this software
-#    in a product, an acknowledgment in the product documentation would be
-#    appreciated but is not required.
-# 2. Altered source versions must be plainly marked as such, and must not be
-#    misrepresented as being the original software.
-# 3. This notice may not be removed or altered from any source distribution.
-
-Version       = 0x00020001;
-Bctcopy       = 1;
-Bctfile       = colibri-t20_512_v11_nand.bct;
-BootLoader    = u-boot.bin,0x00108000,0x00108000,Complete;
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_512_v12_nand.img.cfg b/tegra20/toradex/colibri-t20/colibri-t20_512_v12_nand.img.cfg
deleted file mode 100644
index e1e1694..0000000
--- a/tegra20/toradex/colibri-t20/colibri-t20_512_v12_nand.img.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2013, Lucas Stach
-#
-# This software is provided 'as-is', without any express or implied
-# warranty. In no event will the authors be held liable for any damages
-# arising from the use of this software.
-#
-# Permission is granted to anyone to use this software for any purpose,
-# including commercial applications, and to alter it and redistribute it
-# freely, subject to the following restrictions:
-#
-# 1. The origin of this software must not be misrepresented; you must not
-#    claim that you wrote the original software. If you use this software
-#    in a product, an acknowledgment in the product documentation would be
-#    appreciated but is not required.
-# 2. Altered source versions must be plainly marked as such, and must not be
-#    misrepresented as being the original software.
-# 3. This notice may not be removed or altered from any source distribution.
-
-Version       = 0x00020001;
-Bctcopy       = 1;
-Bctfile       = colibri-t20_512_v12_nand.bct;
-BootLoader    = u-boot.bin,0x00108000,0x00108000,Complete;
diff --git a/tegra20/toradex/colibri-t20/Makefile b/tegra20/toradex/colibri_t20/Makefile
index c6c8b7b..41f3c1d 100644
--- a/tegra20/toradex/colibri-t20/Makefile
+++ b/tegra20/toradex/colibri_t20/Makefile
@@ -22,19 +22,19 @@ include ../../../build/pre.mk
 soc := t20
 
 bcts := \
-	colibri-t20_256_hsmmc.bct \
-	colibri-t20_512_hsmmc.bct \
-	colibri-t20_256_v11_nand.bct \
-	colibri-t20_256_v12_nand.bct \
-	colibri-t20_512_v11_nand.bct \
-	colibri-t20_512_v12_nand.bct
+	colibri_t20-256-hsmmc.bct \
+	colibri_t20-512-hsmmc.bct \
+	colibri_t20-256-v11-nand.bct \
+	colibri_t20-256-v12-nand.bct \
+	colibri_t20-512-v11-nand.bct \
+	colibri_t20-512-v12-nand.bct
 
 images := \
-	colibri-t20_256_hsmmc.img \
-	colibri-t20_512_hsmmc.img \
-	colibri-t20_256_v11_nand.img \
-	colibri-t20_256_v12_nand.img \
-	colibri-t20_512_v11_nand.img \
-	colibri-t20_512_v12_nand.img
+	colibri_t20-256-hsmmc.img \
+	colibri_t20-512-hsmmc.img \
+	colibri_t20-256-v11-nand.img \
+	colibri_t20-256-v12-nand.img \
+	colibri_t20-512-v11-nand.img \
+	colibri_t20-512-v12-nand.img
 
 include ../../../build/post.mk
diff --git a/tegra20/toradex/colibri-t20/build.sh b/tegra20/toradex/colibri_t20/build.sh
index 7dc6a05..7dc6a05 100755
--- a/tegra20/toradex/colibri-t20/build.sh
+++ b/tegra20/toradex/colibri_t20/build.sh
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_256_hsmmc.bct.cfg b/tegra20/toradex/colibri_t20/colibri_t20-256-hsmmc.bct.cfg
index aeb7cdf..aeb7cdf 100644
--- a/tegra20/toradex/colibri-t20/colibri-t20_256_hsmmc.bct.cfg
+++ b/tegra20/toradex/colibri_t20/colibri_t20-256-hsmmc.bct.cfg
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_512_hsmmc.img.cfg b/tegra20/toradex/colibri_t20/colibri_t20-256-hsmmc.img.cfg
index e97e3e2..e52bed7 100644
--- a/tegra20/toradex/colibri-t20/colibri-t20_512_hsmmc.img.cfg
+++ b/tegra20/toradex/colibri_t20/colibri_t20-256-hsmmc.img.cfg
@@ -18,5 +18,5 @@
 
 Version       = 0x00020001;
 Bctcopy       = 1;
-Bctfile       = colibri-t20_512_hsmmc.bct;
+Bctfile       = colibri_t20-256-hsmmc.bct;
 BootLoader    = u-boot.bin,0x00108000,0x00108000,Complete;
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_256_v11_nand.bct.cfg b/tegra20/toradex/colibri_t20/colibri_t20-256-v11-nand.bct.cfg
index 2ec736b..2ec736b 100644
--- a/tegra20/toradex/colibri-t20/colibri-t20_256_v11_nand.bct.cfg
+++ b/tegra20/toradex/colibri_t20/colibri_t20-256-v11-nand.bct.cfg
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_256_v12_nand.img.cfg b/tegra20/toradex/colibri_t20/colibri_t20-256-v11-nand.img.cfg
index 09e2445..345fb8a 100644
--- a/tegra20/toradex/colibri-t20/colibri-t20_256_v12_nand.img.cfg
+++ b/tegra20/toradex/colibri_t20/colibri_t20-256-v11-nand.img.cfg
@@ -18,5 +18,5 @@
 
 Version       = 0x00020001;
 Bctcopy       = 1;
-Bctfile       = colibri-t20_256_v12_nand.bct;
+Bctfile       = colibri_t20-256-v11-nand.bct;
 BootLoader    = u-boot.bin,0x00108000,0x00108000,Complete;
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_256_v12_nand.bct.cfg b/tegra20/toradex/colibri_t20/colibri_t20-256-v12-nand.bct.cfg
index 86ee537..86ee537 100644
--- a/tegra20/toradex/colibri-t20/colibri-t20_256_v12_nand.bct.cfg
+++ b/tegra20/toradex/colibri_t20/colibri_t20-256-v12-nand.bct.cfg
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_256_v11_nand.img.cfg b/tegra20/toradex/colibri_t20/colibri_t20-256-v12-nand.img.cfg
index ad3e2a5..523b4a1 100644
--- a/tegra20/toradex/colibri-t20/colibri-t20_256_v11_nand.img.cfg
+++ b/tegra20/toradex/colibri_t20/colibri_t20-256-v12-nand.img.cfg
@@ -18,5 +18,5 @@
 
 Version       = 0x00020001;
 Bctcopy       = 1;
-Bctfile       = colibri-t20_256_v11_nand.bct;
+Bctfile       = colibri_t20-256-v12-nand.bct;
 BootLoader    = u-boot.bin,0x00108000,0x00108000,Complete;
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_512_hsmmc.bct.cfg b/tegra20/toradex/colibri_t20/colibri_t20-512-hsmmc.bct.cfg
index 3bbce03..3bbce03 100644
--- a/tegra20/toradex/colibri-t20/colibri-t20_512_hsmmc.bct.cfg
+++ b/tegra20/toradex/colibri_t20/colibri_t20-512-hsmmc.bct.cfg
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_256_hsmmc.img.cfg b/tegra20/toradex/colibri_t20/colibri_t20-512-hsmmc.img.cfg
index 541a02d..86c2697 100644
--- a/tegra20/toradex/colibri-t20/colibri-t20_256_hsmmc.img.cfg
+++ b/tegra20/toradex/colibri_t20/colibri_t20-512-hsmmc.img.cfg
@@ -18,5 +18,5 @@
 
 Version       = 0x00020001;
 Bctcopy       = 1;
-Bctfile       = colibri-t20_256_hsmmc.bct;
+Bctfile       = colibri_t20-512-hsmmc.bct;
 BootLoader    = u-boot.bin,0x00108000,0x00108000,Complete;
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_512_v11_nand.bct.cfg b/tegra20/toradex/colibri_t20/colibri_t20-512-v11-nand.bct.cfg
index a8d0e58..a8d0e58 100644
--- a/tegra20/toradex/colibri-t20/colibri-t20_512_v11_nand.bct.cfg
+++ b/tegra20/toradex/colibri_t20/colibri_t20-512-v11-nand.bct.cfg
diff --git a/tegra20/toradex/colibri_t20/colibri_t20-512-v11-nand.img.cfg b/tegra20/toradex/colibri_t20/colibri_t20-512-v11-nand.img.cfg
new file mode 100644
index 0000000..bee8660
--- /dev/null
+++ b/tegra20/toradex/colibri_t20/colibri_t20-512-v11-nand.img.cfg
@@ -0,0 +1,22 @@
+# Copyright (c) 2013, Lucas Stach
+#
+# This software is provided 'as-is', without any express or implied
+# warranty. In no event will the authors be held liable for any damages
+# arising from the use of this software.
+#
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute it
+# freely, subject to the following restrictions:
+#
+# 1. The origin of this software must not be misrepresented; you must not
+#    claim that you wrote the original software. If you use this software
+#    in a product, an acknowledgment in the product documentation would be
+#    appreciated but is not required.
+# 2. Altered source versions must be plainly marked as such, and must not be
+#    misrepresented as being the original software.
+# 3. This notice may not be removed or altered from any source distribution.
+
+Version       = 0x00020001;
+Bctcopy       = 1;
+Bctfile       = colibri_t20-512-v11-nand.bct;
+BootLoader    = u-boot.bin,0x00108000,0x00108000,Complete;
diff --git a/tegra20/toradex/colibri-t20/colibri-t20_512_v12_nand.bct.cfg b/tegra20/toradex/colibri_t20/colibri_t20-512-v12-nand.bct.cfg
index a37ea65..a37ea65 100644
--- a/tegra20/toradex/colibri-t20/colibri-t20_512_v12_nand.bct.cfg
+++ b/tegra20/toradex/colibri_t20/colibri_t20-512-v12-nand.bct.cfg
diff --git a/tegra20/toradex/colibri_t20/colibri_t20-512-v12-nand.img.cfg b/tegra20/toradex/colibri_t20/colibri_t20-512-v12-nand.img.cfg
new file mode 100644
index 0000000..54d8ceb
--- /dev/null
+++ b/tegra20/toradex/colibri_t20/colibri_t20-512-v12-nand.img.cfg
@@ -0,0 +1,22 @@
+# Copyright (c) 2013, Lucas Stach
+#
+# This software is provided 'as-is', without any express or implied
+# warranty. In no event will the authors be held liable for any damages
+# arising from the use of this software.
+#
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute it
+# freely, subject to the following restrictions:
+#
+# 1. The origin of this software must not be misrepresented; you must not
+#    claim that you wrote the original software. If you use this software
+#    in a product, an acknowledgment in the product documentation would be
+#    appreciated but is not required.
+# 2. Altered source versions must be plainly marked as such, and must not be
+#    misrepresented as being the original software.
+# 3. This notice may not be removed or altered from any source distribution.
+
+Version       = 0x00020001;
+Bctcopy       = 1;
+Bctfile       = colibri_t20-512-v12-nand.bct;
+BootLoader    = u-boot.bin,0x00108000,0x00108000,Complete;