We have some scripts imported from Linux Kernel:
setlocalversion, checkstack.pl, checkpatch.pl, cleanpatch
They are located under tools/ directory in U-Boot now.
But they were originally located under scripts/ directory
in Linux Kernel.
This commit moves them to the original location.
It is true that binutils-version.sh and dtc-version.sh
do not originate in Linux Kernel, but they should
be moved by analogy to gcc-version.sh.
Signed-off-by: Masahiro Yamada <yamad...@jp.panasonic.com>
---
I want use this patch as a prerequisite of my next series,
"Switch to the real Kbuild"
Note:
Patman uses checkpatch.pl internally.
Patman searches for checkpatch.pl under both tools/ and scripts/
directory. (and $HOME/bin too)
So, moving checkpatch.pl to scripts/ should not have impact
on patman, I think.
Simon,
Please correct me if I am wrong.
Makefile | 4 ++--
config.mk | 6 +++---
{tools => scripts}/binutils-version.sh | 0
{tools => scripts}/checkpatch.pl | 0
{tools => scripts}/checkstack.pl | 0
{tools => scripts}/cleanpatch | 0
{tools => scripts}/dtc-version.sh | 0
{tools => scripts}/gcc-version.sh | 0
{tools => scripts}/setlocalversion | 0
9 files changed, 5 insertions(+), 5 deletions(-)
rename {tools => scripts}/binutils-version.sh (100%)
mode change 100755 => 100644
rename {tools => scripts}/checkpatch.pl (100%)
rename {tools => scripts}/checkstack.pl (100%)
rename {tools => scripts}/cleanpatch (100%)
rename {tools => scripts}/dtc-version.sh (100%)
mode change 100755 => 100644
rename {tools => scripts}/gcc-version.sh (100%)
mode change 100755 => 100644
rename {tools => scripts}/setlocalversion (100%)
diff --git a/Makefile b/Makefile
index 3443bb9..a6cc44c 100644
--- a/Makefile
+++ b/Makefile
@@ -578,7 +578,7 @@ FINDFLAGS := -L
checkstack:
$(CROSS_COMPILE)objdump -d $(obj)u-boot \
`$(FIND) $(obj) -name u-boot-spl -print` | \
- perl $(src)tools/checkstack.pl $(ARCH)
+ perl $(src)scripts/checkstack.pl $(ARCH)
tags ctags:
ctags -w -o $(obj)ctags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \
@@ -718,7 +718,7 @@ checkarmreloc: $(obj)u-boot
$(VERSION_FILE):
@mkdir -p $(dir $(VERSION_FILE))
- @( localvers='$(shell $(TOPDIR)/tools/setlocalversion
$(TOPDIR))' ; \
+ @( localvers='$(shell $(TOPDIR)/scripts/setlocalversion
$(TOPDIR))' ; \
printf '#define PLAIN_VERSION "%s%s"\n' \
"$(U_BOOT_VERSION)" "$${localvers}" ; \
printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' \
diff --git a/config.mk b/config.mk
index 206de20..60e297a 100644
--- a/config.mk
+++ b/config.mk
@@ -125,9 +125,9 @@ endif
# cc-version
# Usage gcc-ver := $(call cc-version)
-cc-version = $(shell $(SHELL) $(SRCTREE)/tools/gcc-version.sh $(CC))
-binutils-version = $(shell $(SHELL) $(SRCTREE)/tools/binutils-version.sh $(AS))
-dtc-version = $(shell $(SHELL) $(SRCTREE)/tools/dtc-version.sh $(DTC))
+cc-version = $(shell $(SHELL) $(SRCTREE)/scripts/gcc-version.sh $(CC))
+binutils-version = $(shell $(SHELL) $(SRCTREE)/scripts/binutils-version.sh
$(AS))
+dtc-version = $(shell $(SHELL) $(SRCTREE)/scripts/dtc-version.sh $(DTC))
#
# Include the make variables (CC, etc...)
diff --git a/tools/binutils-version.sh b/scripts/binutils-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from tools/binutils-version.sh
rename to scripts/binutils-version.sh
diff --git a/tools/checkpatch.pl b/scripts/checkpatch.pl
similarity index 100%
rename from tools/checkpatch.pl
rename to scripts/checkpatch.pl
diff --git a/tools/checkstack.pl b/scripts/checkstack.pl
similarity index 100%
rename from tools/checkstack.pl
rename to scripts/checkstack.pl
diff --git a/tools/cleanpatch b/scripts/cleanpatch
similarity index 100%
rename from tools/cleanpatch
rename to scripts/cleanpatch
diff --git a/tools/dtc-version.sh b/scripts/dtc-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from tools/dtc-version.sh
rename to scripts/dtc-version.sh
diff --git a/tools/gcc-version.sh b/scripts/gcc-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from tools/gcc-version.sh
rename to scripts/gcc-version.sh
diff --git a/tools/setlocalversion b/scripts/setlocalversion
similarity index 100%
rename from tools/setlocalversion
rename to scripts/setlocalversion
--
1.8.3.2
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
