rimage: move rimage to sof firmware repo

This removes cyclic dependency between both repos. Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
thesofproject · Feb 13, 2018 · 72d797d · 72d797d
1 parent f6924b1
commit 72d797d
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 2,795 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = rimage rmbox topology
+SUBDIRS = rmbox topology
diff --git a/configure.ac b/configure.ac
@@ -2,9 +2,9 @@
 AC_PREREQ([2.69])
 AC_INIT([sof-tools], [1.0.1])
 AM_INIT_AUTOMAKE([foreign])
-AC_CONFIG_SRCDIR([rimage/rimage.c])
+AC_CONFIG_SRCDIR([rmbox/rmbox.c])
 AC_CONFIG_HEADERS([config.h])
-AC_CHECK_HEADER([sof/uapi/manifest.h])
+AC_CHECK_HEADER([sof/uapi/abi.h])
 
 AC_CANONICAL_HOST
 
@@ -13,17 +13,8 @@ AM_MAINTAINER_MODE([enable])
 
 AC_PROG_CC
 
-#check for openssl
-AC_CHECK_LIB([crypto], [OPENSSL_config], , [AC_MSG_ERROR([Need OpenSSL libcrypto])])
-
-PEM_KEY_PREFIX="/usr/local/share/rimage"
-AC_DEFINE_UNQUOTED([PEM_KEY_PREFIX], ["$PEM_KEY_PREFIX"], ["Path for PEM keys"])
-AC_SUBST(PEM_KEY_PREFIX)
-
 AC_OUTPUT([
 	Makefile
-	rimage/Makefile
-	rimage/keys/Makefile
 	rmbox/Makefile
 	topology/Makefile
 	topology/common/Makefile
@@ -36,7 +27,6 @@ AC_OUTPUT([
 echo "
 
 prefix:                        ${prefix}
-PEM:                           ${PEM_KEY_PREFIX}
 Compiler:                      ${CC}
 CFLAGS:                        ${CFLAGS}
 "
diff --git a/rimage/Makefile.am b/rimage/Makefile.am
diff --git a/rimage/cse.c b/rimage/cse.c
diff --git a/rimage/cse.h b/rimage/cse.h
diff --git a/rimage/css.c b/rimage/css.c
diff --git a/rimage/css.h b/rimage/css.h