tools: moving rimage and logger to tools directory

.gitignore

@@ -62,7 +62,7 @@ sof-*
 boot_ldr-*
 boot_module
 module
-rimage/rimage
+tools/rimage/rimage
 
 tap-driver.sh
 test-driver

Makefile.am

@@ -1,5 +1,5 @@
-if BUILD_RIMAGE
-SUBDIRS = rimage
+if BUILD_TOOLS
+SUBDIRS = tools
 else
 SUBDIRS = doc src test
 endif
@@ -65,7 +65,7 @@ doc-dummy:
 doc: doc-dummy
 	$(MAKE) -C doc doc
 
-if !BUILD_RIMAGE
+if !BUILD_TOOLS
 all-local:
 	rm -f $(top_srcdir)/src/include/version.h
 endif

README.md

@@ -15,10 +15,11 @@ See [docs](https://thesofproject.github.io/latest/index.html)
 
 1. Run `autogen.sh`
 
-2. Build and install the rimage ELF image creator and signing tool
+2. Build and install sof tools: rimage (ELF image creator and signing tool) and
+logger
 
 ```
-./configure --enable-rimage
+./configure --enable-tools
 make
 sudo make install
 ```

configure.ac

@@ -85,14 +85,14 @@ fi
 AM_CONDITIONAL(BUILD_LIB, test "$have_library" = "yes")
 
 # check if we are building tools
-AC_ARG_ENABLE(rimage, [AS_HELP_STRING([--enable-rimage],[build rimage tool])], have_rimage=$enableval, have_rimage=no)
+AC_ARG_ENABLE(tools, [AS_HELP_STRING([--enable-tools],[build sof tools])], have_tools=$enableval, have_tools=no)
 IMPLICIT_FALLTHROUGH_FLAG=""
-if test "$have_rimage" = "yes"; then
-	AC_DEFINE([CONFIG_RIMAGE], [1], [Configure to build rimage])
+if test "$have_tools" = "yes"; then
+	AC_DEFINE([CONFIG_TOOLS], [1], [Configure to build sof tools])
 	AM_CFLAGS="-O2 -g -Wall -Werror -Wl,-EL -Wmissing-prototypes"
 	IMPLICIT_FALLTHROUGH_FLAG="-Wimplicit-fallthrough=3"
 fi
-AM_CONDITIONAL(BUILD_RIMAGE, test "$have_rimage" = "yes")
+AM_CONDITIONAL(BUILD_TOOLS, test "$have_tools" = "yes")
 
 # check if we are building docs
 AC_ARG_ENABLE(doc, [AS_HELP_STRING([--enable-doc],[build doc])], have_doc=$enableval, have_doc=no)
@@ -152,7 +152,7 @@ case "$with_arch" in
 	AC_DEFINE([CONFIG_HOST], [1], [Configure for Host])
     ;;
     *)
-	if test "$have_rimage" = "no" && test "$have_doc" = "no" ; then
+	if test "$have_tools" = "no" && test "$have_doc" = "no" ; then
 		AC_MSG_ERROR([DSP architecture not specified])
 	fi
     ;;
@@ -390,7 +390,7 @@ case "$with_platform" in
 	AC_DEFINE([CONFIG_MEM_WND], [1], [Configure Memory Windows])
     ;;
     *)
-	if test "$have_rimage" = "no" && test "$have_doc" = "no"; then
+	if test "$have_tools" = "no" && test "$have_doc" = "no"; then
 		if test "$ARCH" = "host"; then
 			PLATFORM="host"
 			AC_SUBST(PLATFORM)
@@ -504,7 +504,7 @@ AC_CHECK_TOOL([OBJDUMP], [objdump], [])
 
 # Check for openssl - used by rimage
 AC_CHECK_LIB([crypto], [OPENSSL_config], , [have_openssl="no"])
-if test "$have_rimage" = "yes"; then
+if test "$have_tools" = "yes"; then
 	if test "$have_openssl" = "no"; then
 		AC_MSG_ERROR([Need OpenSSL libcrypto for rimage code signing])
 	fi
@@ -537,8 +537,10 @@ AM_EXTRA_RECURSIVE_TARGETS([vminstall])
 
 AC_CONFIG_FILES([
 	Makefile
-	rimage/Makefile
-	rimage/keys/Makefile
+	tools/Makefile
+	tools/logger/Makefile
+	tools/rimage/Makefile
+	tools/rimage/keys/Makefile
 	doc/Makefile
 	src/Makefile
 	src/tasks/Makefile

scripts/rimage-build.sh

@@ -16,13 +16,13 @@ done
 # make sure rimage is built and aligned with code
 if [[ "x$BUILD_LOCAL" == "x" ]]
 then
-	./configure --enable-rimage
+	./configure --enable-tools
 	make
 	sudo make install
 else
 	echo "BUILD in local folder!"
 	rm -rf $pwd/local/
-	./configure --enable-rimage --prefix=$pwd/local
+	./configure --enable-tools --prefix=$pwd/local
 	make
 	make install
 fi

scripts/tools-build.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+./autogen.sh
+
+pwd=`pwd`
+
+# parse the args
+for args in $@
+do
+	if [[ "$args" == "-l" ]]
+		then
+		BUILD_LOCAL=1
+	fi
+done
+
+# make sure rimage is built and aligned with code
+if [[ "x$BUILD_LOCAL" == "x" ]]
+then
+	./configure --enable-tools
+	make
+	sudo make install
+else
+	echo "BUILD in local folder!"
+	rm -rf $pwd/local/
+	./configure --enable-tools --prefix=$pwd/local
+	make
+	make install
+fi

scripts/xtensa-build-all.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SUPPORTED_PLATFORMS=(byt cht bdw hsw apl cnl sue icl skl kbl)
-BUILD_RIMAGE=0
+BUILD_TOOLS=0
 BUILD_DEBUG=no
 BUILD_JOBS=1
 BUILD_JOBS_NEXT=0
@@ -11,7 +11,7 @@ pwd=`pwd`
 if [ "$#" -eq 0 ]
 then
 	echo "usage: xtensa-build.sh [options] platform(s)"
-	echo "       [-l] Build rimage locally"
+	echo "       [-l] Build tools locally"
 	echo "       [-a] Build all platforms"
 	echo "       [-d] Enable debug build"
 	echo "       [-j [n]] Set number of make build jobs. Infinite jobs with no arg."
@@ -23,7 +23,7 @@ else
 		if [[ "$args" == "-l" ]]
 			then
 			BUILD_LOCAL=1
-			BUILD_RIMAGE=1
+			BUILD_TOOLS=1
 
 			PATH=$pwd/local/bin:$PATH
 
@@ -74,18 +74,18 @@ set -e
 # run autogen.sh
 ./autogen.sh
 
-# make sure rimage is built and aligned with code
-if [[ "x$BUILD_RIMAGE" == "x1" ]]
+# make sure tools is built and aligned with code
+if [[ "x$BUILD_TOOLS" == "x1" ]]
 then
 	if [[ "x$BUILD_LOCAL" == "x" ]]
 	then
-		./configure --enable-rimage
+		./configure --enable-tools
 		make -j ${BUILD_JOBS}
 		sudo make install
 	else
 		echo "BUILD in local folder!"
 		rm -rf $pwd/local/
-		./configure --enable-rimage --prefix=$pwd/local
+		./configure --enable-tools --prefix=$pwd/local
 		make -j ${BUILD_JOBS}
 		make install
 		PATH=$pwd/local/bin:$PATH

tools/Makefile.am

@@ -0,0 +1,3 @@
+if BUILD_TOOLS
+SUBDIRS = rimage logger
+endif

tools/logger/Makefile.am

@@ -0,0 +1,8 @@
+bin_PROGRAMS = sof-logger
+
+sof_logger_SOURCES = \
+	logger.c \
+	convert.c
+
+sof_logger_INCDIR = \
+	-I $(SRC_DIR)/include