summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2014-02-11 12:55:32 +0100
committerStefano Babic <sbabic@denx.de>2014-02-11 12:55:32 +0100
commit17998eff9021b7b579c0387e934d8c52603fe247 (patch)
treeedc3ef069db4cdaf9c718ae60e095caf42cd1d0d /tools
parent6ba45cc0f8b46533965219cfd90864a60ec1009b (diff)
parente97f9d817e600cd6f43d1d0da76f5787e33a5c56 (diff)
downloadu-boot-imx-17998eff9021b7b579c0387e934d8c52603fe247.zip
u-boot-imx-17998eff9021b7b579c0387e934d8c52603fe247.tar.gz
u-boot-imx-17998eff9021b7b579c0387e934d8c52603fe247.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'tools')
-rw-r--r--tools/.gitignore1
-rw-r--r--tools/kermit/README (renamed from tools/scripts/README)2
-rw-r--r--tools/kermit/dot.kermrc (renamed from tools/scripts/dot.kermrc)0
-rw-r--r--tools/kermit/flash_param (renamed from tools/scripts/flash_param)0
-rw-r--r--tools/kermit/send_cmd (renamed from tools/scripts/send_cmd)0
-rw-r--r--tools/kermit/send_image (renamed from tools/scripts/send_image)0
6 files changed, 2 insertions, 1 deletions
diff --git a/tools/.gitignore b/tools/.gitignore
index 930fa2e..cd2f041 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -10,6 +10,7 @@
/mxsboot
/ncb
/proftool
+/relocate-rela
/ubsha1
/xway-swap-bytes
/*.exe
diff --git a/tools/scripts/README b/tools/kermit/README
index dbc4425..c3b491a 100644
--- a/tools/scripts/README
+++ b/tools/kermit/README
@@ -8,7 +8,7 @@
This directory contains scripts that help to perform certain actions
that need to be done frequently when working with U-Boot.
-They are meant as EXAMPLE code, so it is very likely that you will
+They are meant as EXAMPLE code, so it is very likely that you will
have to modify them before use.
diff --git a/tools/scripts/dot.kermrc b/tools/kermit/dot.kermrc
index 0fc6c15..0fc6c15 100644
--- a/tools/scripts/dot.kermrc
+++ b/tools/kermit/dot.kermrc
diff --git a/tools/scripts/flash_param b/tools/kermit/flash_param
index 847f99e..847f99e 100644
--- a/tools/scripts/flash_param
+++ b/tools/kermit/flash_param
diff --git a/tools/scripts/send_cmd b/tools/kermit/send_cmd
index 4131331..4131331 100644
--- a/tools/scripts/send_cmd
+++ b/tools/kermit/send_cmd
diff --git a/tools/scripts/send_image b/tools/kermit/send_image
index 9b89d6b..9b89d6b 100644
--- a/tools/scripts/send_image
+++ b/tools/kermit/send_image