diff --git a/.gitmodules b/.gitmodules
index da3426a76e3d..7b140195191d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,19 +1,4 @@
-[submodule "rimage"]
-	path = rimage
-# This is a _relative_ submodule URL. In some use cases it's better than
-# an _absolute_ submodule URL, in other cases it's not. One size does
-# unfortunately not fit all.
-#
-# Among other pages, http://blog.tremily.us/posts/Relative_submodules/
-# has a good comparison
-#
-# If you use Zephyr you must also look at the comments in sof/west.yml.
-#
-# If you want to fork or mirror sof.git _without_ doing the same for
-# rimage.git then your automation may want you to change and git commit
-# an absolute URL in your branch. No need to git commit for interactive
-# use; a local and temporary edit of this file is enough for interactive
-# use because .gitmodules is used only once to --init[ialize]
-# .git/config the first time. Then .gitmodules is never used again after
-# cloning.
-	url = ../rimage
+[submodule "tomlc99"]
+	path = tools/rimage/tomlc99
+	url = https://github.com/thesofproject/tomlc99.git
+	branch = master
diff --git a/rimage b/rimage
deleted file mode 160000
index 4fb9fe00575b..000000000000
--- a/rimage
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4fb9fe00575bc2e9f14570803d811987fb27f010
diff --git a/tools/rimage/.checkpatch.conf b/tools/rimage/.checkpatch.conf
new file mode 100644
index 000000000000..98ddafcb3fb1
--- /dev/null
+++ b/tools/rimage/.checkpatch.conf
@@ -0,0 +1,6 @@
+--codespell
+--codespellfile scripts/spelling.txt
+--ignore C99_COMMENT_TOLERANCE
+--no-tree
+--strict
+-g
diff --git a/tools/rimage/.github/workflows/build.yml b/tools/rimage/.github/workflows/build.yml
new file mode 100644
index 000000000000..2102fae4f8f0
--- /dev/null
+++ b/tools/rimage/.github/workflows/build.yml
@@ -0,0 +1,25 @@
+---
+# Basic build test
+
+name: build
+
+# yamllint disable-line rule:truthy
+on: [pull_request, push, workflow_dispatch]
+
+env:
+  CMAKE_C_FLAGS: "-Werror -Wall -Wmissing-prototypes\
+    -Wimplicit-fallthrough=3 -Wpointer-arith"
+
+jobs:
+  build-test:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with: {fetch-depth: 50, submodules: recursive}
+
+      - name: install tools
+        run: sudo apt update && sudo apt install -y ninja-build
+
+      - name: build
+        run: cmake -B build/ -G Ninja
+      - run: cmake --build build/
diff --git a/tools/rimage/.github/workflows/cppcheck.yml b/tools/rimage/.github/workflows/cppcheck.yml
new file mode 100644
index 000000000000..211e4004692c
--- /dev/null
+++ b/tools/rimage/.github/workflows/cppcheck.yml
@@ -0,0 +1,30 @@
+---
+# SPDX-License-Identifier: BSD-3-Clause
+# Tools that can save round-trips to github and a lot of time:
+#
+# yamllint -f parsable this.yml
+# pip3 install ruamel.yaml.cmd
+# yaml merge-expand this.yml exp.yml && diff -w -u this.yml exp.yml
+#
+# github.com also has a powerful web editor that can be used without
+# committing.
+
+name: cppcheck
+
+# yamllint disable-line rule:truthy
+on: [pull_request, push]
+
+jobs:
+  cppcheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with: {fetch-depth: 50, submodules: recursive}
+
+      - name: apt install cppcheck
+        run: sudo apt update && sudo apt-get -y install cppcheck
+
+        # TODO enable more types of checks as they are fixed
+      - name: run cppcheck
+        run: cppcheck --platform=unix32 --force --max-configs=1024
+                      --inconclusive --quiet --inline-suppr .
diff --git a/tools/rimage/.github/workflows/pull-request.yml b/tools/rimage/.github/workflows/pull-request.yml
new file mode 100644
index 000000000000..c0400490b276
--- /dev/null
+++ b/tools/rimage/.github/workflows/pull-request.yml
@@ -0,0 +1,42 @@
+---
+# SPDX-License-Identifier: BSD-3-Clause
+# Tools that can save round-trips to github and a lot of time:
+#
+# yamllint -f parsable this.yml
+# pip3 install ruamel.yaml.cmd
+# yaml merge-expand this.yml exp.yml && diff -w -u this.yml exp.yml
+#
+# github.com also has a powerful web editor that can be used without
+# committing.
+
+name: codestyle
+
+# yamllint disable-line rule:truthy
+on: [pull_request]
+
+jobs:
+  yamllint:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 50
+          submodules: recursive
+
+      - name: run yamllint
+        run: yamllint .github/workflows/*.yml
+  checkpatch:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: ${{ env.PR_FETCH_DEPTH }}
+
+      - name: install codespell
+        run: sudo apt update && sudo apt install -y codespell
+
+      - name: checkpatch.pl PR review
+        uses: webispy/checkpatch-action@v9
+        env:
+          CHECKPATCH_COMMAND: ./scripts/checkpatch.pl
diff --git a/tools/rimage/.gitignore b/tools/rimage/.gitignore
new file mode 100644
index 000000000000..7693903fddf6
--- /dev/null
+++ b/tools/rimage/.gitignore
@@ -0,0 +1,2 @@
+build/
+.checkpatch-camelcase.git.*
diff --git a/tools/rimage/CMakeLists.txt b/tools/rimage/CMakeLists.txt
new file mode 100644
index 000000000000..8e0a5da7d267
--- /dev/null
+++ b/tools/rimage/CMakeLists.txt
@@ -0,0 +1,67 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+cmake_minimum_required(VERSION 3.10)
+
+project(SOF_RIMAGE C)
+
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  message(STATUS "No CMAKE_BUILD_TYPE, defaulting to Debug")
+  set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE)
+endif()
+
+add_executable(rimage
+	src/file_simple.c
+	src/cse.c
+	src/css.c
+	src/plat_auth.c
+	src/hash.c
+	src/pkcs1_5.c
+	src/manifest.c
+	src/ext_manifest.c
+	src/rimage.c
+	src/toml_utils.c
+	src/adsp_config.c
+	src/misc_utils.c
+	src/file_utils.c
+	src/elf_file.c
+	src/module.c
+	tomlc99/toml.c
+)
+
+set_property(TARGET rimage PROPERTY C_STANDARD 99)
+
+target_compile_options(rimage PRIVATE
+	-Wall -Werror -Wmissing-prototypes -Wimplicit-fallthrough
+)
+
+if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 9.1)
+	target_compile_options(rimage PRIVATE -Wno-char-subscripts)
+endif()
+
+# Windows builds use MSYS2 https://www.msys2.org/ to get linux tools and headers.
+# MSYS_INSTALL_DIR variable points to MSYS2 installation directory.
+# You may pass it as environmental or cmake configure variable.
+if(${CMAKE_HOST_WIN32})
+	cmake_minimum_required(VERSION 3.20)
+	if(DEFINED ENV{MSYS_INSTALL_DIR} AND NOT MSYS_INSTALL_DIR)
+		set(MSYS_INSTALL_DIR $ENV{MSYS_INSTALL_DIR})
+	endif()
+
+	if(MSYS_INSTALL_DIR)
+		cmake_path(IS_ABSOLUTE MSYS_INSTALL_DIR IS_MSYS_INSTALL_DIR_ABSOLUTE)
+		if(NOT IS_MSYS_INSTALL_DIR_ABSOLUTE)
+			message(FATAL_ERROR "Please provide absolute path to MSYS2 installation
+				setting MSYS_INSTALL_DIR env variable")
+		endif()
+		# Include standard posix headers. Requires pacman openssl-devel package.
+		cmake_path(APPEND MSYS_INSTALL_DIR "usr" "include" OUTPUT_VARIABLE MSYS_SYSTEM_INCLUDE_PATH)
+		target_include_directories(rimage PRIVATE "${MSYS_SYSTEM_INCLUDE_PATH}")
+	endif()
+endif()
+
+target_link_libraries(rimage PRIVATE crypto)
+
+target_include_directories(rimage PRIVATE
+	src/include/
+	tomlc99/
+)
diff --git a/tools/rimage/LICENSE b/tools/rimage/LICENSE
new file mode 100644
index 000000000000..468893dff94b
--- /dev/null
+++ b/tools/rimage/LICENSE
@@ -0,0 +1,97 @@
+/* 
+ * BSD 3 Clause
+ * Copyright (c) 2016, Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+// Copyright (c) 2003-2014 Cadence Design Systems, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Files with 2-Clause BSD licence:
+
+src/include/rimage/elf.h
+
+/*
+ * Derived from:
+ * $FreeBSD: src/sys/sys/elf32.h,v 1.8.14.1 2005/12/30 22:13:58 marcel Exp $
+ * $FreeBSD: src/sys/sys/elf64.h,v 1.10.14.1 2005/12/30 22:13:58 marcel Exp $
+ * $FreeBSD: src/sys/sys/elf_common.h,v 1.15.8.1 2005/12/30 22:13:58 marcel Exp $
+ * $FreeBSD: src/sys/alpha/include/elf.h,v 1.14 2003/09/25 01:10:22 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/elf.h,v 1.18 2004/08/03 08:21:48 dfr Exp $
+ * $FreeBSD: src/sys/arm/include/elf.h,v 1.5.2.1 2006/06/30 21:42:52 cognet Exp $
+ * $FreeBSD: src/sys/i386/include/elf.h,v 1.16 2004/08/02 19:12:17 dfr Exp $
+ * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.7 2004/11/02 09:47:01 ssouhlal Exp $
+ * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.12 2003/09/25 01:10:26 peter Exp $
+ *
+ * Copyright (c) 1996-1998 John D. Polstra.  All rights reserved.
+ * Copyright (c) 2001 David E. O'Brien
+ * Portions Copyright 2009 The Go Authors.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
diff --git a/tools/rimage/README.md b/tools/rimage/README.md
new file mode 100644
index 000000000000..64fe71e11ce5
--- /dev/null
+++ b/tools/rimage/README.md
@@ -0,0 +1,105 @@
+# rimage
+
+`rimage` is a DSP firmware image creation and signing tool targeting
+the DSP on certain Intel System-on-Chip (SoC). This is used by
+the [Sound Open Firmware (SOF)](https://github.com/thesofproject/sof)
+to generate binary image files.
+
+## Building
+
+Most SOF users never build `rimage` directly but as an ExternalProject
+defined by CMake in SOF. This makes sure they always use an up-to-date
+version of rimage and configuration files that have been fully tested.
+
+If needed, `rimage` can be built manually with the usual CMake commands:
+
+```shell
+$ cmake -B build/
+$ make  -C build/ help # lists all targets
+$ make  -C build/
+```
+
+The `build/rimage` executable can then be copied to a directory in the
+PATH. Zephyr users can run `west config rimage.path
+/path/to/rimage/build/rimage`; Zephyr documentation and `west sign -h`
+have more details.
+
+## Testing rimage changes with SOF Continuous Integration
+
+This section is about leveraging SOF validation to test rimage changes
+_before_ submitting them to the rimage repository.
+
+Nothing here is actually specific to SOF and rimage; you can apply the
+same test logic to any submodule and parent on Github. In fact the same
+logic applies to submodule alternatives. Github is the only requirement.
+
+### Get familiar with git submodules
+
+This is unfortunately not optional for SOF and rimage.
+
+For various reasons submodules seem to confuse many git users. Maybe
+because the versions of the submodules are not directly visible in some
+configuration file like with most alternatives? Either way, an
+unfortunate prerequisite before doing any rimage work is to get familiar
+with git submodules in general. As submodules are built-in there are
+many resources about them on the Internet. One possible starting point
+is https://git-scm.com/book/en/v2/Git-Tools-Submodules but feel free
+to use any other good tutorial instead. Make sure you actually practice
+a tutorial; don't just read it. Practicing on a temporary and throw-away
+copy of SOF + rimage is a great idea.
+
+Obviously, you also need to be familiar with regular Github pull
+requests.
+
+### Run SOF tests on unmerged rimage commits
+
+First, push the rimage commits you want to be tested to any branch of
+your rimage fork on Github.  Do _not_ submit an rimage pull request yet.
+
+Note your rimage fork must have been created using the actual "fork"
+button on Github so Github is aware of the connection with the upstream
+rimage repo. In the top-left corner you should see `forked from
+thesofproject/rimage` under the name of your fork. If not then search
+the Internet for "re-attach detached github fork".
+
+Then, **pretend** these rimage commits have already been accepted and
+merged (they have been neither) and submit to SOF a draft pull request
+that updates the main SOF branch with your brand new rimage commits to
+test. The only SOF commit in this SOF TEST pull request is an SOF commit
+that updates the rimage pointer to the SHA of your last rimage
+commit. If you're not sure how to do this then you must go back to the
+previous section and practice submodules more.
+
+Submit this SOF pull request as a Github _draft_ so reviewers are _not_
+notified. Starting every pull request as a draft is always a good idea
+but in this case this particular SOF pull request can be especially
+confusing because it points at commits in a different repo and commits
+that are not merged yet. So you _really_ don't want to bother busy
+reviewers (here's a secret: some of the reviewers don't like submodules
+either). You can freely switch back and forth between draft and ready
+status and should indeed switch to draft if you forgot at submission
+time but you can never "un-notify" reviewers.
+
+Github has very good support for submodules and will display your SOF
+TEST pull request better than what the git command line can show. For
+instance Github will list your rimage changes directly in the SOF Pull
+Request. So if something looks unexpected on Github then it means you
+did something wrong. Stop immediately (except for switching to draft if
+you forgot) and ask the closest git guru for help.
+
+Search for "Submodule" in the build logs and make sure the last of your
+new rimage commits has been checked out.
+
+Iterate and force-push your rimage branch and your SOF TEST pull request
+until all the SOF tests pass. Then you can submit your rimage pull
+request as usual. In the comments section of the rimage pull request,
+point at your test results on the SOF side to impress the rimage
+reviewers and get your rimage changes merged faster.
+
+Finally, after your rimage changes have been merged, you can if you want
+submit one final SOF pull request that points to the final rimage
+SHA. Or, if your rimage change is not urgently needed, you can just wait
+for someone else to do it later. If you do it, copy the rimage git log
+--oneline in the SOF commit message. Find some good (and less good)
+rimage commit message examples at
+https://github.com/thesofproject/sof/commits/main/rimage
diff --git a/tools/rimage/config/apl.toml b/tools/rimage/config/apl.toml
new file mode 100644
index 000000000000..e100c78a754c
--- /dev/null
+++ b/tools/rimage/config/apl.toml
@@ -0,0 +1,57 @@
+version = [1, 8]
+
+[adsp]
+name = "apl"
+image_size = "0x0A0000"        # (8 + 2) bank * 64KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0xBEFE0000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xA000A000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x58"
+length = "0x378"
+[[cse.entry]]
+name = "cavs0015.met"
+offset = "0x400"
+length = "0x60"
+[[cse.entry]]
+name = "cavs0015"
+offset = "0x480"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "cavs0015.met"
+
+[partition_info]
+name = "ADSP"
+[[partition_info.module]]
+name = "cavs0015.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x2000"
diff --git a/tools/rimage/config/bdw.toml b/tools/rimage/config/bdw.toml
new file mode 100644
index 000000000000..6b642fcd882e
--- /dev/null
+++ b/tools/rimage/config/bdw.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "bdw"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0"
+size = "0x50000"
+host_offset = "0x000A0000"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0x00400000"
+size = "0xA0000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/bsw.toml b/tools/rimage/config/bsw.toml
new file mode 100644
index 000000000000..6746ca6cff34
--- /dev/null
+++ b/tools/rimage/config/bsw.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "bsw"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0xFF2C0000"
+size = "0x14000"
+host_offset = "0x0C0000"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0xFF300000"
+size = "0x28000"
+host_offset = "0x100000"
diff --git a/tools/rimage/config/byt.toml b/tools/rimage/config/byt.toml
new file mode 100644
index 000000000000..4afd1c0dd523
--- /dev/null
+++ b/tools/rimage/config/byt.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "byt"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0xFF2C0000"
+size = "0x14000"
+host_offset = "0x0C0000"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0xFF300000"
+size = "0x28000"
+host_offset = "0x100000"
diff --git a/tools/rimage/config/cht.toml b/tools/rimage/config/cht.toml
new file mode 100644
index 000000000000..2ed88370d16a
--- /dev/null
+++ b/tools/rimage/config/cht.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "cht"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0xFF2C0000"
+size = "0x14000"
+host_offset = "0x0C0000"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0xFF300000"
+size = "0x28000"
+host_offset = "0x100000"
diff --git a/tools/rimage/config/cnl.toml b/tools/rimage/config/cnl.toml
new file mode 100644
index 000000000000..ccf33fb68e2a
--- /dev/null
+++ b/tools/rimage/config/cnl.toml
@@ -0,0 +1,61 @@
+version = [1, 8]
+
+[adsp]
+name = "cnl"
+image_size = "0x300000"	# (47 + 1) bank * 64KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0xBEFE0000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xB0038000"
+size = "0x100000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xBE040000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x58"
+length = "0x378"
+[[cse.entry]]
+name = "cavs0015.met"
+offset = "0x400"
+length = "0x60"
+[[cse.entry]]
+name = "cavs0015"
+offset = "0x480"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "cavs0015.met"
+
+[partition_info]
+name = "ADSP"
+[[partition_info.module]]
+name = "cavs0015.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x30000"
diff --git a/tools/rimage/config/hsw.toml b/tools/rimage/config/hsw.toml
new file mode 100644
index 000000000000..2f96a675b89d
--- /dev/null
+++ b/tools/rimage/config/hsw.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "hsw"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0"
+size = "0x60000"
+host_offset = "0x80000"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0x00400000"
+size = "0x80000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/icl.toml b/tools/rimage/config/icl.toml
new file mode 100644
index 000000000000..f6e0fc9cb209
--- /dev/null
+++ b/tools/rimage/config/icl.toml
@@ -0,0 +1,61 @@
+version = [1, 8]
+
+[adsp]
+name = "icl"
+image_size = "0x300000"	# (47 + 1) bank * 64KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0xBEFE0000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xB0038000"
+size = "0x100000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xBE040000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x58"
+length = "0x378"
+[[cse.entry]]
+name = "cavs0015.met"
+offset = "0x400"
+length = "0x60"
+[[cse.entry]]
+name = "cavs0015"
+offset = "0x480"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "cavs0015.met"
+
+[partition_info]
+name = "ADSP"
+[[partition_info.module]]
+name = "cavs0015.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x30000"
diff --git a/tools/rimage/config/imx8.toml b/tools/rimage/config/imx8.toml
new file mode 100644
index 000000000000..865be902e840
--- /dev/null
+++ b/tools/rimage/config/imx8.toml
@@ -0,0 +1,20 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "imx8"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0x596F8000"
+size = "0x800"
+host_offset = "0x10000"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0x596E8000"
+size = "0x8000"
+host_offset = "0x0"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0x92400000"
+size = "0x800000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/imx8m.toml b/tools/rimage/config/imx8m.toml
new file mode 100644
index 000000000000..5b7ba20870bd
--- /dev/null
+++ b/tools/rimage/config/imx8m.toml
@@ -0,0 +1,20 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "imx8m"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0x3b6F8000"
+size = "0x800"
+host_offset = "0x10000"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0x3B6E8000"
+size = "0x8000"
+host_offset = "0x0"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0x92400000"
+size = "0x800000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/imx8ulp.toml b/tools/rimage/config/imx8ulp.toml
new file mode 100644
index 000000000000..7fd4c16a52f3
--- /dev/null
+++ b/tools/rimage/config/imx8ulp.toml
@@ -0,0 +1,20 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "imx8ulp"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0x21170000"
+size = "0x10000"
+host_offset = "0x0"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0x21180000"
+size = "0x10000"
+host_offset = "0x10000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0x1a000000"
+size = "0x800000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/imx8x.toml b/tools/rimage/config/imx8x.toml
new file mode 100644
index 000000000000..ea9059c174ae
--- /dev/null
+++ b/tools/rimage/config/imx8x.toml
@@ -0,0 +1,20 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "imx8x"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0x596F8000"
+size = "0x800"
+host_offset = "0x10000"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0x596e8000"
+size = "0x8000"
+host_offset = "0x0"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0x92400000"
+size = "0x800000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/jsl.toml b/tools/rimage/config/jsl.toml
new file mode 100644
index 000000000000..bec0e6bd3a7e
--- /dev/null
+++ b/tools/rimage/config/jsl.toml
@@ -0,0 +1,61 @@
+version = [1, 8]
+
+[adsp]
+name = "icl"
+image_size = "0x110000"	# (16 + 1) bank * 64KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0xBEFE0000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xB0038000"
+size = "0x100000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xBE040000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x58"
+length = "0x378"
+[[cse.entry]]
+name = "cavs0015.met"
+offset = "0x400"
+length = "0x60"
+[[cse.entry]]
+name = "cavs0015"
+offset = "0x480"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "cavs0015.met"
+
+[partition_info]
+name = "ADSP"
+[[partition_info.module]]
+name = "cavs0015.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x30000"
diff --git a/tools/rimage/config/kbl.toml b/tools/rimage/config/kbl.toml
new file mode 100644
index 000000000000..f1c83d594905
--- /dev/null
+++ b/tools/rimage/config/kbl.toml
@@ -0,0 +1,30 @@
+version = [1, 5]
+
+[adsp]
+name = "kbl"
+image_size = "0x200000" # (30 + 2) bank * 64KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0xBEFE0000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xA000A000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[css]
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0"
+hw_buf_base_addr = "0xBE500000"
+hw_buf_length = "0x4A000"
diff --git a/tools/rimage/config/lnl.toml b/tools/rimage/config/lnl.toml
new file mode 100644
index 000000000000..9c245b9ca8e9
--- /dev/null
+++ b/tools/rimage/config/lnl.toml
@@ -0,0 +1,571 @@
+version = [3, 0]
+
+[adsp]
+name = "lnl"
+image_size = "0x2C0000" # (22) bank * 128KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0x1FF80000"
+size = "0x400"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xA104A000"
+size = "0x2000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xa00f0000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x40000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xA0000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x5c"
+length = "0x4b8"
+[[cse.entry]]
+name = "ADSP.met"
+offset = "0x4c0"
+length = "0x70"
+[[cse.entry]]
+name = "ADSP"
+offset = "0x540"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+partition_usage = "0x23"
+[[signed_pkg.module]]
+name = "ADSP.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x40000"
+
+[module]
+count = 24
+	[[module.entry]]
+	name = "BRNGUP"
+	uuid = "2B79E4F3-4675-F649-89DF-3BC194A91AEB"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0"
+	auto_start = "0"
+
+	[[module.entry]]
+	name = "BASEFW"
+	uuid = "0E398C32-5ADE-BA4B-93B1-C50432280EE4"
+	affinity_mask = "3"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0"
+	auto_start = "0"
+
+	[[module.entry]]
+	name = "MIXIN"
+	uuid = "39656EB2-3B71-4049-8D3F-F92CD5C43C09"
+	affinity_mask = "0x1"
+	instance_count = "30"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0,   0,   0xfeef, 0xc,  0x8,   0x45ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [ 0, 0, 0, 0, 296, 644000, 45, 60, 0, 0, 0,
+				1, 0, 0, 0, 296, 669900, 48, 64, 0, 0, 0,
+				2, 0, 0, 0, 296, 934000, 96, 128, 0, 0, 0,
+				3, 0, 0, 0, 296, 1137000, 96, 128, 0, 0, 0,
+				4, 0, 0, 0, 296, 1482000, 48, 64, 0, 0, 0,
+				5, 0, 0, 0, 296, 1746000, 96, 128, 0, 0, 0,
+				6, 0, 0, 0, 296, 2274000, 192, 256, 0, 0, 0,
+				7, 0, 0, 0, 296, 2700000, 48, 64, 0, 0, 0,
+				8, 0, 0, 0, 296, 2964000, 96, 128, 0, 0, 0,
+				9, 0, 0, 0, 296, 3492000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "MIXOUT"
+	uuid = "3C56505A-24D7-418F-BDDC-C1F5A3AC2AE0"
+	affinity_mask = "0x1"
+	instance_count = "30"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "2"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 520, 649600, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 520, 966300, 96, 128, 0, 0, 0,
+				2, 0, 0, 0, 520, 2101000, 48, 64, 0, 0, 0,
+				3, 0, 0, 0, 520, 2500800, 192, 256, 0, 0, 0,
+				4, 0, 0, 0, 520, 2616700, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 520, 2964500, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 520, 4202000, 96, 128, 0, 0, 0,
+				7, 0, 0, 0, 520, 3730000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "COPIER"
+	uuid = "9BA00C83-CA12-4A83-943C-1FA2E82F9DDA"
+	affinity_mask = "0x1"
+	instance_count = "32"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "3"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [ 0, 0, 0, 0, 280, 640100, 45, 60, 0, 0, 0,
+				1, 0, 0, 0, 280, 1106300, 192, 192, 0, 0, 0,
+				2, 0, 0, 0, 280, 1573000, 45, 45, 0, 0, 0,
+				3, 0, 0, 0, 280, 2040600, 192, 256, 0, 0, 0,
+				4, 0, 0, 0, 280, 2507500, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 280, 2999000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 280, 3501000, 45, 60, 0, 0, 0,
+				7, 0, 0, 0, 280, 3927000, 192, 256, 0, 0, 0,
+				8, 0, 0, 0, 280, 4424000, 192, 256, 0, 0, 0,
+				9, 0, 0, 0, 280, 4941000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "PEAKVOL"
+	uuid = "8A171323-94A3-4E1D-AFE9-FE5DBAA4C393"
+	affinity_mask = "0x1"
+	instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "4"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 480, 3786000, 192, 256, 0, 0, 0,
+				3, 0, 0, 0, 480, 4333000, 48, 64, 0, 0, 0,
+				4, 0, 0, 0, 480, 4910000, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 480, 5441000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 480, 6265000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "GAIN"
+	uuid = "61BCA9A8-18D0-4A18-8E7B-2639219804B7"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 416, 1786000, 192, 256, 0, 0, 0,
+				3, 0, 0, 0, 416, 2333000, 48, 64, 0, 0, 0,
+				4, 0, 0, 0, 416, 2910000, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 416, 3441000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 416, 4265000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "ASRC"
+	uuid = "66B4402D-B468-42F2-81A7-B37121863DD4"
+	affinity_mask = "0x3"
+	instance_count = "2"
+	domain_types = "0"
+
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	pin = [0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x45ff]
+
+	mod_cfg = [0, 0, 0, 0, 20480, 4065600, 24, 22, 0, 0, 0,
+				1, 0, 0, 0, 20480, 5616000, 8, 25, 0, 0, 0,
+				2, 0, 0, 0, 20480, 7319200, 24, 27, 0, 0, 0,
+				3, 0, 0, 0, 20480, 9155300, 8, 27, 0, 0, 0,
+				4, 0, 0, 0, 20480, 10972600, 48, 54, 0, 0, 0,
+				5, 0, 0, 0, 20480, 12661000, 16, 36, 0, 0, 0,
+				6, 0, 0, 0, 20480, 14448500, 48, 96, 0, 0, 0,
+				7, 0, 0, 0, 20480, 16145000, 19, 68, 0, 0, 0,
+				8, 0, 0, 0, 20480, 17861300, 45, 102, 0, 0, 0,
+				9, 0, 0, 0, 20480, 21425900, 8, 36, 0, 0, 0,
+				10, 0, 0, 0, 20480, 22771000, 32, 102, 0, 0, 0,
+				11, 0, 0, 0, 20480, 23439000, 48, 27, 0, 0, 0,
+				12, 0, 0, 0, 20480, 33394000, 48, 51, 0, 0, 0,
+				13, 0, 0, 0, 20480, 36140000, 16, 96, 0, 0, 0,
+				14, 0, 0, 0, 20480, 38003000, 16, 68, 0, 0, 0,
+				15, 0, 0, 0, 20480, 39787000, 45, 51, 0, 0, 0]
+
+	[[module.entry]]
+	name = "SRC"
+	uuid = "E61BB28D-149A-4C1F-B709-46823EF5F5AE"
+	affinity_mask = "0x1"
+	#instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "7"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xffff, 0xc, 0x8, 0x05ff,
+			1, 0, 0xf6c9, 0xc, 0x8, 0x05ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 12832, 1365500, 0, 0, 0, 1365, 0,
+				1, 0, 0, 0, 12832, 2302300, 0, 0, 0, 2302, 0,
+				2, 0, 0, 0, 12832, 3218200, 0, 0, 0, 3218, 0,
+				3, 0, 0, 0, 12832, 4169700, 0, 0, 0, 4169, 0,
+				4, 0, 0, 0, 12832, 5095100, 0, 0, 0, 5095, 0,
+				5, 0, 0, 0, 12832, 6014800, 0, 0, 0, 6014, 0,
+				6, 0, 0, 0, 12832, 6963500, 0, 0, 0, 6963, 0,
+				7, 0, 0, 0, 12832, 7791000, 0, 0, 0, 7791, 0,
+				8, 0, 0, 0, 12832, 8843000, 0, 0, 0, 8843, 0,
+				9, 0, 0, 0, 12832, 9755100, 0, 0, 0, 9755, 0,
+				10, 0, 0, 0, 12832, 10726500, 0, 0, 0, 10726, 0,
+				11, 0, 0, 0, 12832, 11624100, 0, 0, 0, 11624, 0,
+				12, 0, 0, 0, 12832, 12518700, 0, 0, 0, 12518, 0,
+				13, 0, 0, 0, 12832, 13555000, 0, 0, 0, 13555, 0,
+				14, 0, 0, 0, 12832, 14144500, 0, 0, 0, 14144, 0,
+				15, 0, 0, 0, 12832, 15809800, 0, 0, 0, 15809, 0,
+				16, 0, 0, 0, 12832, 16749000, 0, 0, 0, 16749, 0,
+				17, 0, 0, 0, 12832, 18433500, 0, 0, 0, 18433, 0,
+				18, 0, 0, 0, 12832, 19425900, 0, 0, 0, 19425, 0,
+				19, 0, 0, 0, 12832, 20396900, 0, 0, 0, 20396, 0,
+				20, 0, 0, 0, 12832, 20881000, 0, 0, 0, 20881, 0,
+				21, 0, 0, 0, 12832, 23431000, 0, 0, 0, 23431, 0,
+				22, 0, 0, 0, 12832, 30471000, 0, 0, 0, 30471, 0]
+
+	[[module.entry]]
+	name = "MICSEL"
+	uuid = "32FE92C1-1E17-4FC2-9758-C7F3542E980A"
+	affinity_mask = "0x1"
+	instance_count = "8"
+	domain_types = "0"
+	load_type = "0"
+	init_config = "1"
+	module_type = "0xC"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xe, 0xa, 0x45ff, 1, 0, 0xfeef, 0xe, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 960, 488500, 16, 16, 0, 0, 0,
+			1, 0, 0, 0, 960, 964500, 16, 16, 0, 0, 0,
+			2, 0, 0, 0, 960, 2003000, 16, 16, 0, 0, 0]
+
+	[[module.entry]]
+	name = "UPDWMIX"
+	uuid = "42F8060C-832F-4DBF-B247-51E961997B34"
+	affinity_mask = "0x1"
+	instance_count = "15"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "5"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xffff, 0xc, 0x8, 0x05ff,
+			1, 0, 0xffff, 0xc, 0x8, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 216, 706000, 12, 16, 0, 0, 0,
+				1, 0, 0, 0, 216, 1271000, 8, 8, 0, 0, 0,
+				2, 0, 0, 0, 216, 1839000, 89, 118, 0, 0, 0,
+				3, 0, 0, 0, 216, 2435000, 48, 64, 0, 0, 0,
+				4, 0, 0, 0, 216, 3343000, 192, 192, 0, 0, 0,
+				5, 0, 0, 0, 216, 3961000, 177, 177, 0, 0, 0,
+				6, 0, 0, 0, 216, 4238000, 192, 256, 0, 0, 0,
+				7, 0, 0, 0, 216, 6691000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "PROBE"
+	uuid = "7CAD0808-AB10-CD23-EF45-12AB34CD56EF"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 100000, 48, 48, 0, 1000, 0]
+
+ 	[[module.entry]]
+	name = "MUX"
+	uuid = "64ce6e35-857a-4878-ace8-e2a2f42e3069"
+	affinity_mask = "0x1"
+	instance_count = "15"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "6"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 280, 460700, 16, 16, 0, 0, 0]
+
+	[[module.entry]]
+	name = "KDTEST"
+	uuid = "EBA8D51F-7827-47B5-82EE-DE6E7743AF67"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "8"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 480, 1114000, 64, 64, 0, 0, 0]
+
+	[[module.entry]]
+	name = "KPB"
+	uuid = "A8A0CB32-4A77-4DB1-85C7-53D7EE07BCE6"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0xB"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 14400, 1114000, 16, 16, 0, 0, 0]
+
+	# smart amp test module config
+	[[module.entry]]
+	name = "SMATEST"
+	uuid = "167A961E-8AE4-11EA-89F1-000C29CE1635"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	init_config = "1"
+	module_type = "0xD"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# eq iir module config
+	[[module.entry]]
+	name = "EQIIR"
+	uuid = "5150C0E6-27F9-4EC8-8351-C705B642D12F"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+		1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# eq fir module config
+	[[module.entry]]
+	name = "EQFIR"
+	uuid = "43A90CE7-f3A5-41Df-AC06-BA98651AE6A3"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+		1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# Aria module config
+	[[module.entry]]
+	name = "ARIA"
+	uuid = "99F7166D-372C-43EF-81F6-22007AA15F03"
+	affinity_mask = "0x1"
+	instance_count = "8"
+	domain_types = "0"
+	load_type = "0"
+	init_config = "1"
+	module_type = "30"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 260, 1063000, 16, 21, 0, 0, 0,
+				1, 0, 0, 0, 260, 1873500, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 260, 2680000, 32, 42, 0, 0, 0,
+				3, 0, 0, 0, 260, 3591000, 64, 85, 0, 0, 0,
+				4, 0, 0, 0, 260, 4477000, 96, 128, 0, 0, 0,
+				5, 0, 0, 0, 260, 7195000, 192, 192, 0, 0, 0]
+
+	# DRC module config
+	[[module.entry]]
+	name = "DRC"
+	uuid = "B36EE4DA-006F-47F9-A06D-FECBE2D8B6CE"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# Crossover module config
+	# Note: Crossover has init_config set to 1 to let kernel know that the base_cfg_ext needs to
+	# be appended to the IPC payload. The Extension is needed to know the output pin indices.
+	[[module.entry]]
+	name = "XOVER"
+	uuid = "948C9AD1-806A-4131-AD6C-B2BDA9E35A9F"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	init_config = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# Multiband-DRC module config
+	[[module.entry]]
+	name = "MB_DRC"
+	uuid = "0D9F2256-8E4F-47B3-8448-239A334F1191"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# DCblock module config
+	[[module.entry]]
+	name = "DCBLOCK"
+	uuid = "B809EFAF-5681-42B1-9ED6-04BB012DD384"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# TDFB module config
+	[[module.entry]]
+	name = "TDFB"
+	uuid = "DD511749-D9FA-455C-B3A7-13585693F1AF"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
diff --git a/tools/rimage/config/mt8186.toml b/tools/rimage/config/mt8186.toml
new file mode 100644
index 000000000000..80b011b4bfd4
--- /dev/null
+++ b/tools/rimage/config/mt8186.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "mt8186"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0x4e100000"
+size = "0x00100000"
+host_offset = "0x0"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0x60000000"
+size = "0x00600000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/mt8188.toml b/tools/rimage/config/mt8188.toml
new file mode 100644
index 000000000000..0dcc4b4b3244
--- /dev/null
+++ b/tools/rimage/config/mt8188.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # parse_adsp_config_v1_0()
+
+[adsp]
+name = "mt8188"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0x4e100000"
+size = "0x00080000"
+host_offset = "0x0"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0x60000000"
+size = "0x00600000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/mt8195.toml b/tools/rimage/config/mt8195.toml
new file mode 100644
index 000000000000..5c8abc92557a
--- /dev/null
+++ b/tools/rimage/config/mt8195.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "mt8195"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0x40000000"
+size = "0x00040000"
+host_offset = "0x0"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0x60000000"
+size = "0x00600000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/mtl.toml b/tools/rimage/config/mtl.toml
new file mode 100644
index 000000000000..2d2742c91c83
--- /dev/null
+++ b/tools/rimage/config/mtl.toml
@@ -0,0 +1,632 @@
+version = [3, 0]
+
+[adsp]
+name = "mtl"
+image_size = "0x2C0000" # (22) bank * 128KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0x1FF80000"
+size = "0x400"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xA104A000"
+size = "0x2000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xa00f0000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x40000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xA0000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x5c"
+length = "0x4b8"
+[[cse.entry]]
+name = "ADSP.met"
+offset = "0x4c0"
+length = "0x70"
+[[cse.entry]]
+name = "ADSP"
+offset = "0x540"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+partition_usage = "0x23"
+[[signed_pkg.module]]
+name = "ADSP.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x40000"
+
+[module]
+count = 25
+	[[module.entry]]
+	name = "BRNGUP"
+	uuid = "2B79E4F3-4675-F649-89DF-3BC194A91AEB"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0"
+	auto_start = "0"
+
+	[[module.entry]]
+	name = "BASEFW"
+	uuid = "0E398C32-5ADE-BA4B-93B1-C50432280EE4"
+	affinity_mask = "3"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0"
+	auto_start = "0"
+
+	[[module.entry]]
+	name = "MIXIN"
+	uuid = "39656EB2-3B71-4049-8D3F-F92CD5C43C09"
+	affinity_mask = "0x1"
+	instance_count = "30"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0,   0,   0xfeef, 0xc,  0x8,   0x45ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [1, 0, 0, 0, 296, 4996000, 384, 384, 0, 4996, 0,
+			2, 0, 0, 0, 296, 2652000, 384, 384, 0, 2652, 0,
+			3, 0, 0, 0, 296, 2928000, 512, 512, 0, 2928, 0,
+			4, 0, 0, 0, 296, 2572000, 128, 128, 0, 2572, 0,
+			5, 0, 0, 0, 296, 3760000, 1536, 1536, 0, 3760, 0]
+
+	[[module.entry]]
+	name = "MIXOUT"
+	uuid = "3C56505A-24D7-418F-BDDC-C1F5A3AC2AE0"
+	affinity_mask = "0x1"
+	instance_count = "30"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "2"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [1, 0, 0, 0, 520, 2280000, 384, 384, 0, 2280, 0,
+			2, 0, 0, 0, 520, 1988000, 384, 384, 0, 1988, 0,
+			3, 0, 0, 0, 520, 7631000, 512, 512, 0, 7631, 0,
+			4, 0, 0, 0, 520, 1953000, 128, 128, 0, 1953, 0,
+			5, 0, 0, 0, 520, 2301000, 1536, 1536, 0, 2301, 0]
+
+	[[module.entry]]
+	name = "COPIER"
+	uuid = "9BA00C83-CA12-4A83-943C-1FA2E82F9DDA"
+	affinity_mask = "0x1"
+	instance_count = "32"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "3"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [1, 0, 0, 0, 280, 4918000, 768, 768, 0, 4918, 0,
+			2, 0, 0, 0, 280, 6526000, 768, 768, 0, 6526, 0,
+			3, 0, 0, 0, 280, 6388000, 384, 384, 0, 6388, 0,
+			4, 0, 0, 0, 280, 4682000, 512, 512, 0, 4682, 0,
+			5, 0, 0, 0, 280, 5738000, 512, 512, 0, 5738, 0,
+			6, 0, 0, 0, 280, 6250000, 256, 256, 0, 6250, 0,
+			7, 0, 0, 0, 280, 6460000, 768, 768, 0, 6460, 0,
+			8, 0, 0, 0, 280, 7116000, 768, 768, 0, 7116, 0,
+			9, 0, 0, 0, 280, 6008000, 384, 384, 0, 6008, 0,
+			10, 0, 0, 0, 280, 6258000, 512, 512, 0, 6258, 0,
+			11, 0, 0, 0, 280, 7188000, 1024, 1024, 0, 7188, 0,
+			12, 0, 0, 0, 280, 7272000, 1536, 1536, 0, 7272, 0,
+			13, 0, 0, 0, 280, 6290000, 768, 768, 0, 6290, 0,
+			14, 0, 0, 0, 280, 6604000, 1024, 1024, 0, 6604, 0,
+			15, 0, 0, 0, 280, 6198000, 384, 384, 0, 6198, 0,
+			16, 0, 0, 0, 280, 6250000, 384, 384, 0, 6250, 0,
+			17, 0, 0, 0, 280, 6258000, 256, 256, 0, 6258, 0,
+			18, 0, 0, 0, 280, 4354000, 256, 256, 0, 4354, 0,
+			19, 0, 0, 0, 280, 6198000, 256, 256, 0, 6198, 0,
+			20, 0, 0, 0, 280, 6250000, 128, 128, 0, 6250, 0,
+			21, 0, 0, 0, 280, 6250000, 128, 128, 0, 6250, 0,
+			22, 0, 0, 0, 280, 6206000, 128, 128, 0, 6206, 0,
+			23, 0, 0, 0, 280, 4170000, 64, 64, 0, 4170, 0,
+			24, 0, 0, 0, 280, 4234000, 96, 96, 0, 4234, 0,
+			25, 0, 0, 0, 280, 6198000, 96, 96, 0, 6198, 0,
+			26, 0, 0, 0, 280, 6250000, 96, 96, 0, 6250, 0,
+			27, 0, 0, 0, 280, 6198000, 192, 192, 0, 6198, 0,
+			28, 0, 0, 0, 280, 6258000, 192, 192, 0, 6258, 0,
+			29, 0, 0, 0, 280, 6392000, 720, 720, 0, 6392, 0,
+			30, 0, 0, 0, 280, 6250000, 360, 360, 0, 6250, 0,
+			31, 0, 0, 0, 280, 5326000, 360, 360, 0, 5326, 0,
+			32, 0, 0, 0, 280, 6258000, 180, 180, 0, 6258, 0,
+			33, 0, 0, 0, 280, 4354000, 256, 256, 0, 4354, 0,
+			34, 0, 0, 0, 280, 4898000, 256, 256, 0, 4898, 0,
+			35, 0, 0, 0, 280, 6246000, 128, 128, 0, 6246, 0,
+			36, 0, 0, 0, 280, 6250000, 192, 192, 0, 6250, 0,
+			37, 0, 0, 0, 280, 6250000, 48, 48, 0, 6250, 0,
+			38, 0, 0, 0, 280, 4170000, 64, 64, 0, 4170, 0,
+			39, 0, 0, 0, 280, 6198000, 64, 64, 0, 6198, 0,
+			40, 0, 0, 0, 280, 6246000, 32, 32, 0, 6246, 0,
+			41, 0, 0, 0, 280, 5272000, 192, 384, 0, 5272, 0]
+
+	[[module.entry]]
+	name = "PEAKVOL"
+	uuid = "8A171323-94A3-4E1D-AFE9-FE5DBAA4C393"
+	affinity_mask = "0x1"
+	instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "4"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [1, 0, 0, 0, 480, 11667000, 384, 384, 0, 11667, 0,
+			2, 0, 0, 0, 480, 5943000, 192, 192, 0, 5943, 0,
+			3, 0, 0, 0, 480, 12567000, 720, 720, 0, 12567, 0,
+			4, 0, 0, 0, 480, 7360000, 768, 768, 0, 7360, 0,
+			5, 0, 0, 0, 480, 12236000, 1536, 1536, 0, 12236, 0]
+
+	[[module.entry]]
+	name = "GAIN"
+	uuid = "61BCA9A8-18D0-4A18-8E7B-2639219804B7"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [1, 0, 0, 0, 416, 12100000, 1536, 1536, 0, 12100, 0,
+			2, 0, 0, 0, 416, 10183000, 384, 384, 0, 10183, 0,
+			3, 0, 0, 0, 416, 8192000, 512, 512, 0, 8192, 0,
+			4, 0, 0, 0, 416, 10091000, 128, 128, 0, 10091, 0,
+			5, 0, 0, 0, 416, 5908000, 768, 768, 0, 5908, 0]
+
+	[[module.entry]]
+	name = "ASRC"
+	uuid = "66B4402D-B468-42F2-81A7-B37121863DD4"
+	affinity_mask = "0x3"
+	instance_count = "2"
+	domain_types = "0"
+
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	pin = [0, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x45ff]
+
+	mod_cfg = [1, 0, 0, 0, 20480, 21808000, 64, 192, 0, 21808, 0,
+			2, 0, 0, 0, 20480, 45820000, 64, 384, 0, 45820, 0,
+			3, 0, 0, 0, 20480, 75236000, 512, 1440, 0, 75236, 0,
+			4, 0, 0, 0, 20480, 79732000, 512, 1536, 0, 79732, 0,
+			5, 0, 0, 0, 20480, 50411000, 184, 384, 0, 50411, 0,
+			6, 0, 0, 0, 20480, 24236000, 192, 128, 0, 24236, 0,
+			7, 0, 0, 0, 20480, 46753000, 192, 384, 0, 46753, 0,
+			8, 0, 0, 0, 20480, 30032000, 256, 256, 0, 30032, 0,
+			9, 0, 0, 0, 20480, 48676000, 256, 384, 0, 48676, 0,
+			10, 0, 0, 0, 20480, 46548000, 360, 360, 0, 46548, 0,
+			11, 0, 0, 0, 20480, 94372000, 1440, 1536, 0, 94372, 0,
+			12, 0, 0, 0, 20480, 42912000, 1536, 512, 0, 42912, 0,
+			13, 0, 0, 0, 20480, 31871000, 384, 192, 0, 31871, 0,
+			14, 0, 0, 0, 20480, 34216000, 384, 256, 0, 34216, 0,
+			15, 0, 0, 0, 20480, 83448000, 1536, 1440, 0, 83448, 0]
+
+	[[module.entry]]
+	name = "SRC"
+	uuid = "E61BB28D-149A-4C1F-B709-46823EF5F5AE"
+	affinity_mask = "0x1"
+	#instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "7"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xffff, 0xc, 0x8, 0x05ff,
+			1, 0, 0xf6c9, 0xc, 0x8, 0x05ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [1, 0, 0, 0, 12832, 15976000, 128, 512, 0, 15976, 0,
+			2, 0, 0, 0, 12832, 15340000, 64, 256, 0, 15340, 0,
+			3, 0, 0, 0, 12832, 21880000, 96, 512, 0, 21880, 0,
+			4, 0, 0, 0, 12832, 19968000, 48, 256, 0, 19968, 0,
+			5, 0, 0, 0, 12832, 18236000, 64, 256, 0, 18236, 0,
+			6, 0, 0, 0, 12832, 15244000, 32, 256, 0, 15244, 0,
+			7, 0, 0, 0, 12832, 56028000, 1536, 512, 0, 56028, 0,
+			8, 0, 0, 0, 12832, 46740000, 768, 256, 0, 46740, 0,
+			9, 0, 0, 0, 12832, 24656000, 768, 512, 0, 24656, 0,
+			10, 0, 0, 0, 12832, 23516000, 384, 256, 0, 23516, 0,
+			11, 0, 0, 0, 12832, 29368000, 384, 488, 0, 29368, 0,
+			12, 0, 0, 0, 12832, 27164000, 192, 244, 0, 27164, 0,
+			13, 0, 0, 0, 12832, 15892000, 384, 384, 0, 15892, 0,
+			14, 0, 0, 0, 12832, 19916000, 192, 512, 0, 19916, 0,
+			15, 0, 0, 0, 12832, 19176000, 96, 256, 0, 19176, 0,
+			16, 0, 0, 0, 12832, 12676000, 192, 192, 0, 12676, 0,
+			17, 0, 0, 0, 12832, 16280000, 384, 320, 0, 16280, 0,
+			18, 0, 0, 0, 12832, 13076000, 192, 160, 0, 13076, 0,
+			19, 0, 0, 0, 12832, 11440000, 384, 256, 0, 11440, 0,
+			20, 0, 0, 0, 12832, 10996000, 192, 128, 0, 10996, 0,
+			21, 0, 0, 0, 12832, 11428000, 384, 192, 0, 11428, 0,
+			22, 0, 0, 0, 12832, 10740000, 192, 96, 0, 10740, 0,
+			23, 0, 0, 0, 12832, 29936000, 360, 512, 0, 29936, 0,
+			24, 0, 0, 0, 12832, 27696000, 180, 256, 0, 27696, 0,
+			25, 0, 0, 0, 12832, 18368000, 256, 512, 0, 18368, 0,
+			26, 0, 0, 0, 12832, 15204000, 128, 256, 0, 15204, 0]
+
+	[[module.entry]]
+	name = "MICSEL"
+	uuid = "32FE92C1-1E17-4FC2-9758-C7F3542E980A"
+	affinity_mask = "0x1"
+	instance_count = "8"
+	domain_types = "0"
+	load_type = "0"
+	init_config = "1"
+	module_type = "0xC"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xe, 0xa, 0x45ff, 1, 0, 0xfeef, 0xe, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 960, 488500, 16, 16, 0, 0, 0,
+			1, 0, 0, 0, 960, 964500, 16, 16, 0, 0, 0,
+			2, 0, 0, 0, 960, 2003000, 16, 16, 0, 0, 0]
+
+	[[module.entry]]
+	name = "UPDWMIX"
+	uuid = "42F8060C-832F-4DBF-B247-51E961997B34"
+	affinity_mask = "0x1"
+	instance_count = "15"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "5"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xffff, 0xc, 0x8, 0x05ff,
+			1, 0, 0xffff, 0xc, 0x8, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [1, 0, 0, 0, 216, 5044000, 384, 192, 0, 5044, 0,
+			2, 0, 0, 0, 216, 2660000, 384, 384, 0, 2660, 0,
+			3, 0, 0, 0, 216, 3164000, 576, 384, 0, 3164, 0,
+			4, 0, 0, 0, 216, 3316000, 768, 384, 0, 3316, 0,
+			5, 0, 0, 0, 216, 5264000, 768, 384, 0, 5264, 0,
+			6, 0, 0, 0, 216, 5440000, 768, 384, 0, 5440, 0,
+			7, 0, 0, 0, 216, 2888000, 768, 192, 0, 2888, 0,
+			8, 0, 0, 0, 216, 2856000, 768, 192, 0, 2856, 0,
+			9, 0, 0, 0, 216, 2876000, 768, 192, 0, 2876, 0,
+			10, 0, 0, 0, 216, 2956000, 960, 192, 0, 2956, 0,
+			11, 0, 0, 0, 216, 2888000, 1152, 192, 0, 2888, 0,
+			12, 0, 0, 0, 216, 2888000, 1152, 192, 0, 2888, 0,
+			13, 0, 0, 0, 216, 2816000, 1536, 192, 0, 2816, 0,
+			14, 0, 0, 0, 216, 2468000, 192, 384, 0, 2468, 0,
+			15, 0, 0, 0, 216, 3084000, 576, 384, 0, 3084, 0,
+			16, 0, 0, 0, 216, 3442000, 960, 384, 0, 3442, 0,
+			17, 0, 0, 0, 216, 3478000, 1152, 384, 0, 3478, 0,
+			18, 0, 0, 0, 216, 3478000, 1152, 384, 0, 3478, 0,
+			19, 0, 0, 0, 216, 3736000, 1536, 384, 0, 3736, 0,
+			20, 0, 0, 0, 216, 3216000, 192, 1152, 0, 3216, 0,
+			21, 0, 0, 0, 216, 3308000, 384, 1152, 0, 3308, 0,
+			22, 0, 0, 0, 216, 3616000, 768, 1152, 0, 3616, 0,
+			23, 0, 0, 0, 216, 3616000, 768, 1152, 0, 3616, 0,
+			24, 0, 0, 0, 216, 4916000, 1536, 1152, 0, 4916, 0,
+			25, 0, 0, 0, 216, 3228000, 192, 1152, 0, 3228, 0,
+			26, 0, 0, 0, 216, 3452000, 384, 1152, 0, 3452, 0,
+			27, 0, 0, 0, 216, 4016000, 768, 1152, 0, 4016, 0,
+			28, 0, 0, 0, 216, 5080000, 1536, 1152, 0, 5080, 0,
+			29, 0, 0, 0, 216, 3552000, 384, 1536, 0, 3552, 0,
+			30, 0, 0, 0, 216, 3728000, 768, 1152, 0, 3728, 0]
+
+	[[module.entry]]
+	name = "PROBE"
+	uuid = "7CAD0808-AB10-CD23-EF45-12AB34CD56EF"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 100000, 48, 48, 0, 1000, 0]
+
+ 	[[module.entry]]
+	name = "MUX"
+	uuid = "64ce6e35-857a-4878-ace8-e2a2f42e3069"
+	affinity_mask = "0x1"
+	instance_count = "15"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "6"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 280, 460700, 16, 16, 0, 0, 0]
+
+	[[module.entry]]
+	name = "KDTEST"
+	uuid = "EBA8D51F-7827-47B5-82EE-DE6E7743AF67"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "8"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 480, 1114000, 64, 64, 0, 0, 0]
+
+	[[module.entry]]
+	name = "KPB"
+	uuid = "A8A0CB32-4A77-4DB1-85C7-53D7EE07BCE6"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0xB"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 14400, 1114000, 16, 16, 0, 0, 0]
+
+	# smart amp test module config
+	[[module.entry]]
+	name = "SMATEST"
+	uuid = "167A961E-8AE4-11EA-89F1-000C29CE1635"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	init_config = "1"
+	module_type = "0xD"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 296, 5000000, 384, 384, 0, 5000, 0]
+
+	# eq iir module config
+	[[module.entry]]
+	name = "EQIIR"
+	uuid = "5150C0E6-27F9-4EC8-8351-C705B642D12F"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+		1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 1000, 0,
+				0, 0, 0, 0, 4096, 20663000, 768, 768, 0, 20663, 0]
+
+	# eq fir module config
+	[[module.entry]]
+	name = "EQFIR"
+	uuid = "43A90CE7-f3A5-41Df-AC06-BA98651AE6A3"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+		1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# Aria module config
+	[[module.entry]]
+	name = "ARIA"
+	uuid = "99F7166D-372C-43EF-81F6-22007AA15F03"
+	affinity_mask = "0x1"
+	instance_count = "8"
+	domain_types = "0"
+	load_type = "0"
+	init_config = "1"
+	module_type = "30"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 260, 1063000, 16, 21, 0, 0, 0,
+				1, 0, 0, 0, 260, 1873500, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 260, 2680000, 32, 42, 0, 0, 0,
+				3, 0, 0, 0, 260, 3591000, 64, 85, 0, 0, 0,
+				4, 0, 0, 0, 260, 4477000, 96, 128, 0, 0, 0,
+				5, 0, 0, 0, 260, 7195000, 192, 192, 0, 0, 0]
+
+	# DRC module config
+	[[module.entry]]
+	name = "DRC"
+	uuid = "B36EE4DA-006F-47F9-A06D-FECBE2D8B6CE"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# Crossover module config
+	# Note: Crossover has init_config set to 1 to let kernel know that the base_cfg_ext needs to
+	# be appended to the IPC payload. The Extension is needed to know the output pin indices.
+	[[module.entry]]
+	name = "XOVER"
+	uuid = "948C9AD1-806A-4131-AD6C-B2BDA9E35A9F"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	init_config = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# Multiband-DRC module config
+	[[module.entry]]
+	name = "MB_DRC"
+	uuid = "0D9F2256-8E4F-47B3-8448-239A334F1191"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# DCblock module config
+	[[module.entry]]
+	name = "DCBLOCK"
+	uuid = "B809EFAF-5681-42B1-9ED6-04BB012DD384"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	[[module.entry]]
+        name = "RTC_AEC"
+        uuid = "B780A0A6-269F-466F-B477-23DFA05AF758"
+        affinity_mask = "0x3"
+        instance_count = "1"
+        domain_types = "0"
+        load_type = "1"
+        module_type = "10"
+	init_config = "1"
+        auto_start = "0"
+        sched_caps = [1, 0x00008000]
+
+        # pin = [dir, type, sample rate, size, container, channel-cfg]
+        pin = [0, 0, 0x8, 0x2, 0x2, 0x1,
+                0, 0, 0x8, 0x2, 0x2, 0x4,
+                1, 0, 0x8, 0x2, 0x2, 0x1]
+
+	# TDFB module config
+	[[module.entry]]
+	name = "TDFB"
+	uuid = "DD511749-D9FA-455C-B3A7-13585693F1AF"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
diff --git a/tools/rimage/config/rmb.toml b/tools/rimage/config/rmb.toml
new file mode 100644
index 000000000000..7d43f3a3dc33
--- /dev/null
+++ b/tools/rimage/config/rmb.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "rmb"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0x7F000000"
+size = "0x40000"
+host_offset = "0x0"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0xE0000000"
+size = "0xE0000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/rn.toml b/tools/rimage/config/rn.toml
new file mode 100644
index 000000000000..d4e0b34b685c
--- /dev/null
+++ b/tools/rimage/config/rn.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "rn"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0x20000000"
+size = "0x40000"
+host_offset = "0x0"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0x21000000"
+size = "0xE0000"
+host_offset = "0x0"
diff --git a/tools/rimage/config/skl.toml b/tools/rimage/config/skl.toml
new file mode 100644
index 000000000000..0fff3a382bbf
--- /dev/null
+++ b/tools/rimage/config/skl.toml
@@ -0,0 +1,30 @@
+version = [1, 5]
+
+[adsp]
+name = "skl"
+image_size = "0x200000" # (30 + 2) bank * 64KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0xBEFE0000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xA000A000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[css]
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0"
+hw_buf_base_addr = "0xBE500000"
+hw_buf_length = "0x4A000"
diff --git a/tools/rimage/config/sue.toml b/tools/rimage/config/sue.toml
new file mode 100644
index 000000000000..7579c7fcfb06
--- /dev/null
+++ b/tools/rimage/config/sue.toml
@@ -0,0 +1,31 @@
+version = [1, 5]
+
+[adsp]
+name = "sue"
+image_size = "0x300000"        # (47 + 1) bank * 64KB
+exec_boot_ldr = 1
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0xBEFE0000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xb0038000"
+size = "0x100000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xbe000000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x2000"
diff --git a/tools/rimage/config/tgl-cavs.toml b/tools/rimage/config/tgl-cavs.toml
new file mode 100644
index 000000000000..320c1f3531e4
--- /dev/null
+++ b/tools/rimage/config/tgl-cavs.toml
@@ -0,0 +1,498 @@
+version = [2, 5]
+
+[adsp]
+name = "tgl"
+image_size = "0x2F0000"
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0x9F180000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xB0000000"
+size = "0x1000000"
+[[adsp.mem_zone]]
+type = "HP-SRAM"
+base = "0xBE000000"
+size = "0x800000"
+[[adsp.mem_zone]]
+type = "LP-SRAM"
+base = "0xBE800000"
+size = "0x40"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x5c"
+length = "0x464"
+[[cse.entry]]
+name = "cavs0015.met"
+offset = "0x4c0"
+length = "0x70"
+[[cse.entry]]
+name = "cavs0015"
+offset = "0x540"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "cavs0015.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x30000"
+
+[module]
+count = 21
+	[[module.entry]]
+	name = "BRNGUP"
+	uuid = "61EB0CB9-34D8-4F59-A21D-04C54C21D3A4"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0"
+	auto_start = "0"
+
+	[[module.entry]]
+	name = "BASEFW"
+	uuid = "383B9BE2-3518-4DB0-8891-B1470A8914F8"
+	affinity_mask = "3"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0"
+	auto_start = "0"
+
+	[[module.entry]]
+	name = "MIXIN"
+	uuid = "39656EB2-3B71-4049-8D3F-F92CD5C43C09"
+	affinity_mask = "0x1"
+	instance_count = "30"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0,   0,   0xfeef, 0xc,  0x8,   0x45ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [ 0, 0, 0, 0, 296, 644000, 45, 60, 0, 0, 0,
+				1, 0, 0, 0, 296, 669900, 48, 64, 0, 0, 0,
+				2, 0, 0, 0, 296, 934000, 96, 128, 0, 0, 0,
+				3, 0, 0, 0, 296, 1137000, 96, 128, 0, 0, 0,
+				4, 0, 0, 0, 296, 1482000, 48, 64, 0, 0, 0,
+				5, 0, 0, 0, 296, 1746000, 96, 128, 0, 0, 0,
+				6, 0, 0, 0, 296, 2274000, 192, 256, 0, 0, 0,
+				7, 0, 0, 0, 296, 2700000, 48, 64, 0, 0, 0,
+				8, 0, 0, 0, 296, 2964000, 96, 128, 0, 0, 0,
+				9, 0, 0, 0, 296, 3492000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "MIXOUT"
+	uuid = "3C56505A-24D7-418F-BDDC-C1F5A3AC2AE0"
+	affinity_mask = "0x1"
+	instance_count = "30"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "2"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [1, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 520, 649600, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 520, 966300, 96, 128, 0, 0, 0,
+				2, 0, 0, 0, 520, 2101000, 48, 64, 0, 0, 0,
+				3, 0, 0, 0, 520, 2500800, 192, 256, 0, 0, 0,
+				4, 0, 0, 0, 520, 2616700, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 520, 2964500, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 520, 4202000, 96, 128, 0, 0, 0,
+				7, 0, 0, 0, 520, 3730000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "COPIER"
+	uuid = "9BA00C83-CA12-4A83-943C-1FA2E82F9DDA"
+	affinity_mask = "0x1"
+	instance_count = "32"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "3"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [ 0, 0, 0, 0, 280, 640100, 45, 60, 0, 0, 0,
+				1, 0, 0, 0, 280, 1106300, 192, 192, 0, 0, 0,
+				2, 0, 0, 0, 280, 1573000, 45, 45, 0, 0, 0,
+				3, 0, 0, 0, 280, 2040600, 192, 256, 0, 0, 0,
+				4, 0, 0, 0, 280, 2507500, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 280, 2999000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 280, 3501000, 45, 60, 0, 0, 0,
+				7, 0, 0, 0, 280, 3927000, 192, 256, 0, 0, 0,
+				8, 0, 0, 0, 280, 4424000, 192, 256, 0, 0, 0,
+				9, 0, 0, 0, 280, 4941000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "PEAKVOL"
+	uuid = "8A171323-94A3-4E1D-AFE9-FE5DBAA4C393"
+	affinity_mask = "0x1"
+	instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "4"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 480, 3786000, 192, 256, 0, 0, 0,
+				3, 0, 0, 0, 480, 4333000, 48, 64, 0, 0, 0,
+				4, 0, 0, 0, 480, 4910000, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 480, 5441000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 480, 6265000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "GAIN"
+	uuid = "61BCA9A8-18D0-4A18-8E7B-2639219804B7"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 416, 1786000, 192, 256, 0, 0, 0,
+				3, 0, 0, 0, 416, 2333000, 48, 64, 0, 0, 0,
+				4, 0, 0, 0, 416, 2910000, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 416, 3441000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 416, 4265000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "PROBE"
+	uuid = "7CAD0808-AB10-CD23-EF45-12AB34CD56EF"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 100000, 48, 48, 0, 1000, 0]
+
+	[[module.entry]]
+	name = "SRCINTC"
+	uuid = "e61bb28d-149a-4c1f-b709-46823ef5f5ae"
+	affinity_mask = "0xF"
+	instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0x7"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xffff, 0xc, 0x8, 0x45ff,
+		1, 0, 0xf6c9, 0xc, 0x8, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 12832, 1365500, 0, 0, 0, 1365, 0,
+		1, 0, 0, 0, 12832, 2302300, 0, 0, 0, 2302, 0,
+		2, 0, 0, 0, 12832, 3218200, 0, 0, 0, 3218, 0,
+		3, 0, 0, 0, 12832, 4169700, 0, 0, 0, 4169, 0,
+		4, 0, 0, 0, 12832, 5095100, 0, 0, 0, 5095, 0,
+		5, 0, 0, 0, 12832, 6014800, 0, 0, 0, 6014, 0,
+		6, 0, 0, 0, 12832, 6963500, 0, 0, 0, 6963, 0,
+		7, 0, 0, 0, 12832, 7791000, 0, 0, 0, 7791, 0,
+		8, 0, 0, 0, 12832, 8843000, 0, 0, 0, 8843, 0,
+		9, 0, 0, 0, 12832, 9755100, 0, 0, 0, 9755, 0,
+		10, 0, 0, 0, 12832, 10726500, 0, 0, 0, 10726, 0,
+		11, 0, 0, 0, 12832, 11624100, 0, 0, 0, 11624, 0,
+		12, 0, 0, 0, 12832, 12518700, 0, 0, 0, 12518, 0,
+		13, 0, 0, 0, 12832, 13555000, 0, 0, 0, 13555, 0,
+		14, 0, 0, 0, 12832, 14144500, 0, 0, 0, 14144, 0,
+		15, 0, 0, 0, 12832, 15809800, 0, 0, 0, 15809, 0,
+		16, 0, 0, 0, 12832, 16749000, 0, 0, 0, 16749, 0,
+		17, 0, 0, 0, 12832, 18433500, 0, 0, 0, 18433, 0,
+		18, 0, 0, 0, 12832, 19425900, 0, 0, 0, 19425, 0,
+		19, 0, 0, 0, 12832, 20396900, 0, 0, 0, 20396, 0,
+		20, 0, 0, 0, 12832, 20881000, 0, 0, 0, 20881, 0,
+		21, 0, 0, 0, 12832, 23431000, 0, 0, 0, 23431, 0,
+		22, 0, 0, 0, 12832, 30471000, 0, 0, 0, 30471, 0]
+
+	# smart amp test module config
+	[[module.entry]]
+	name = "SMATEST"
+	uuid = "167A961E-8AE4-11EA-89F1-000C29CE1635"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0xD"
+	init_config = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# eq iir module config
+	[[module.entry]]
+	name = "EQIIR"
+	uuid = "5150C0E6-27F9-4EC8-8351-C705B642D12F"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# eq fir module config
+	[[module.entry]]
+	name = "EQFIR"
+	uuid = "43A90CE7-f3A5-41Df-AC06-BA98651AE6A3"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	[[module.entry]]
+	name = "KDTEST"
+	uuid = "EBA8D51F-7827-47B5-82EE-DE6E7743AF67"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "1"
+	module_type = "8"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 480, 1114000, 64, 64, 0, 0, 0]
+
+	[[module.entry]]
+	name = "KPB"
+	uuid = "D8218443-5FF3-4A4C-B388-6CFE07B9562E"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "1"
+	module_type = "0xB"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 14400, 1114000, 16, 16, 0, 0, 0]
+
+	[[module.entry]]
+	name = "MICSEL"
+	uuid = "32FE92C1-1E17-4FC2-9758-C7F3542E980A"
+	affinity_mask = "0x1"
+	instance_count = "8"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0xC"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xe, 0xa, 0x45ff, 1, 0, 0xfeef, 0xe, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 960, 488500, 16, 16, 0, 0, 0,
+			1, 0, 0, 0, 960, 964500, 16, 16, 0, 0, 0,
+			2, 0, 0, 0, 960, 2003000, 16, 16, 0, 0, 0]
+
+	# Aria module config
+	[[module.entry]]
+	name = "ARIA"
+	uuid = "99F7166D-372C-43EF-81F6-22007AA15F03"
+	affinity_mask = "0x1"
+	instance_count = "8"
+	domain_types = "0"
+	load_type = "0"
+	init_config = "1"
+	module_type = "30"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 260, 1063000, 16, 21, 0, 0, 0,
+				1, 0, 0, 0, 260, 1873500, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 260, 2680000, 32, 42, 0, 0, 0,
+				3, 0, 0, 0, 260, 3591000, 64, 85, 0, 0, 0,
+				4, 0, 0, 0, 260, 4477000, 96, 128, 0, 0, 0,
+				5, 0, 0, 0, 260, 7195000, 192, 192, 0, 0, 0]
+
+	# DRC module config
+	[[module.entry]]
+	name = "DRC"
+	uuid = "B36EE4DA-006F-47F9-A06D-FECBE2D8B6CE"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# Crossover module config
+	# Note: Crossover has init_config set to 1 to let kernel know that the base_cfg_ext needs to
+	# be appended to the IPC payload. The Extension is needed to know the output pin indices.
+	[[module.entry]]
+	name = "XOVER"
+	uuid = "948C9AD1-806A-4131-AD6C-B2BDA9E35A9F"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	init_config = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# Multiband-DRC module config
+	[[module.entry]]
+	name = "MB_DRC"
+	uuid = "0D9F2256-8E4F-47B3-8448-239A334F1191"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# DCblock module config
+	[[module.entry]]
+	name = "DCBLOCK"
+	uuid = "B809EFAF-5681-42B1-9ED6-04BB012DD384"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# TDFB module config
+	[[module.entry]]
+	name = "TDFB"
+	uuid = "DD511749-D9FA-455C-B3A7-13585693F1AF"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
diff --git a/tools/rimage/config/tgl-h-cavs.toml b/tools/rimage/config/tgl-h-cavs.toml
new file mode 100644
index 000000000000..61c3c01ad464
--- /dev/null
+++ b/tools/rimage/config/tgl-h-cavs.toml
@@ -0,0 +1,498 @@
+version = [2, 5]
+
+[adsp]
+name = "tgl"
+image_size = "0x1F0000" # (30 + 1) bank * 64KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0x9F180000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xB0000000"
+size = "0x1000000"
+[[adsp.mem_zone]]
+type = "HP-SRAM"
+base = "0xBE000000"
+size = "0x800000"
+[[adsp.mem_zone]]
+type = "LP-SRAM"
+base = "0xBE800000"
+size = "0x40"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x5c"
+length = "0x464"
+[[cse.entry]]
+name = "cavs0015.met"
+offset = "0x4c0"
+length = "0x70"
+[[cse.entry]]
+name = "cavs0015"
+offset = "0x540"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "cavs0015.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x30000"
+
+[module]
+count = 21
+	[[module.entry]]
+	name = "BRNGUP"
+	uuid = "61EB0CB9-34D8-4F59-A21D-04C54C21D3A4"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0"
+	auto_start = "0"
+
+	[[module.entry]]
+	name = "BASEFW"
+	uuid = "383B9BE2-3518-4DB0-8891-B1470A8914F8"
+	affinity_mask = "3"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0"
+	auto_start = "0"
+
+	[[module.entry]]
+	name = "MIXIN"
+	uuid = "39656EB2-3B71-4049-8D3F-F92CD5C43C09"
+	affinity_mask = "0x1"
+	instance_count = "30"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0,   0,   0xfeef, 0xc,  0x8,   0x45ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [ 0, 0, 0, 0, 296, 644000, 45, 60, 0, 0, 0,
+				1, 0, 0, 0, 296, 669900, 48, 64, 0, 0, 0,
+				2, 0, 0, 0, 296, 934000, 96, 128, 0, 0, 0,
+				3, 0, 0, 0, 296, 1137000, 96, 128, 0, 0, 0,
+				4, 0, 0, 0, 296, 1482000, 48, 64, 0, 0, 0,
+				5, 0, 0, 0, 296, 1746000, 96, 128, 0, 0, 0,
+				6, 0, 0, 0, 296, 2274000, 192, 256, 0, 0, 0,
+				7, 0, 0, 0, 296, 2700000, 48, 64, 0, 0, 0,
+				8, 0, 0, 0, 296, 2964000, 96, 128, 0, 0, 0,
+				9, 0, 0, 0, 296, 3492000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "MIXOUT"
+	uuid = "3C56505A-24D7-418F-BDDC-C1F5A3AC2AE0"
+	affinity_mask = "0x1"
+	instance_count = "30"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "2"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [1, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 520, 649600, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 520, 966300, 96, 128, 0, 0, 0,
+				2, 0, 0, 0, 520, 2101000, 48, 64, 0, 0, 0,
+				3, 0, 0, 0, 520, 2500800, 192, 256, 0, 0, 0,
+				4, 0, 0, 0, 520, 2616700, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 520, 2964500, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 520, 4202000, 96, 128, 0, 0, 0,
+				7, 0, 0, 0, 520, 3730000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "COPIER"
+	uuid = "9BA00C83-CA12-4A83-943C-1FA2E82F9DDA"
+	affinity_mask = "0x1"
+	instance_count = "32"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "3"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [ 0, 0, 0, 0, 280, 640100, 45, 60, 0, 0, 0,
+				1, 0, 0, 0, 280, 1106300, 192, 192, 0, 0, 0,
+				2, 0, 0, 0, 280, 1573000, 45, 45, 0, 0, 0,
+				3, 0, 0, 0, 280, 2040600, 192, 256, 0, 0, 0,
+				4, 0, 0, 0, 280, 2507500, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 280, 2999000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 280, 3501000, 45, 60, 0, 0, 0,
+				7, 0, 0, 0, 280, 3927000, 192, 256, 0, 0, 0,
+				8, 0, 0, 0, 280, 4424000, 192, 256, 0, 0, 0,
+				9, 0, 0, 0, 280, 4941000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "PEAKVOL"
+	uuid = "8A171323-94A3-4E1D-AFE9-FE5DBAA4C393"
+	affinity_mask = "0x1"
+	instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "4"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 480, 3786000, 192, 256, 0, 0, 0,
+				3, 0, 0, 0, 480, 4333000, 48, 64, 0, 0, 0,
+				4, 0, 0, 0, 480, 4910000, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 480, 5441000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 480, 6265000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "GAIN"
+	uuid = "61BCA9A8-18D0-4A18-8E7B-2639219804B7"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 416, 1786000, 192, 256, 0, 0, 0,
+				3, 0, 0, 0, 416, 2333000, 48, 64, 0, 0, 0,
+				4, 0, 0, 0, 416, 2910000, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 416, 3441000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 416, 4265000, 192, 256, 0, 0, 0]
+
+	[[module.entry]]
+	name = "PROBE"
+	uuid = "7CAD0808-AB10-CD23-EF45-12AB34CD56EF"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 100000, 48, 48, 0, 1000, 0]
+
+	[[module.entry]]
+	name = "SRCINTC"
+	uuid = "e61bb28d-149a-4c1f-b709-46823ef5f5ae"
+	affinity_mask = "0xF"
+	instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0x7"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xffff, 0xc, 0x8, 0x45ff,
+		1, 0, 0xf6c9, 0xc, 0x8, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 12832, 1365500, 0, 0, 0, 1365, 0,
+		1, 0, 0, 0, 12832, 2302300, 0, 0, 0, 2302, 0,
+		2, 0, 0, 0, 12832, 3218200, 0, 0, 0, 3218, 0,
+		3, 0, 0, 0, 12832, 4169700, 0, 0, 0, 4169, 0,
+		4, 0, 0, 0, 12832, 5095100, 0, 0, 0, 5095, 0,
+		5, 0, 0, 0, 12832, 6014800, 0, 0, 0, 6014, 0,
+		6, 0, 0, 0, 12832, 6963500, 0, 0, 0, 6963, 0,
+		7, 0, 0, 0, 12832, 7791000, 0, 0, 0, 7791, 0,
+		8, 0, 0, 0, 12832, 8843000, 0, 0, 0, 8843, 0,
+		9, 0, 0, 0, 12832, 9755100, 0, 0, 0, 9755, 0,
+		10, 0, 0, 0, 12832, 10726500, 0, 0, 0, 10726, 0,
+		11, 0, 0, 0, 12832, 11624100, 0, 0, 0, 11624, 0,
+		12, 0, 0, 0, 12832, 12518700, 0, 0, 0, 12518, 0,
+		13, 0, 0, 0, 12832, 13555000, 0, 0, 0, 13555, 0,
+		14, 0, 0, 0, 12832, 14144500, 0, 0, 0, 14144, 0,
+		15, 0, 0, 0, 12832, 15809800, 0, 0, 0, 15809, 0,
+		16, 0, 0, 0, 12832, 16749000, 0, 0, 0, 16749, 0,
+		17, 0, 0, 0, 12832, 18433500, 0, 0, 0, 18433, 0,
+		18, 0, 0, 0, 12832, 19425900, 0, 0, 0, 19425, 0,
+		19, 0, 0, 0, 12832, 20396900, 0, 0, 0, 20396, 0,
+		20, 0, 0, 0, 12832, 20881000, 0, 0, 0, 20881, 0,
+		21, 0, 0, 0, 12832, 23431000, 0, 0, 0, 23431, 0,
+		22, 0, 0, 0, 12832, 30471000, 0, 0, 0, 30471, 0]
+
+	# smart amp test module config
+	[[module.entry]]
+	name = "SMATEST"
+	uuid = "167A961E-8AE4-11EA-89F1-000C29CE1635"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0xD"
+	init_config = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# eq iir module config
+	[[module.entry]]
+	name = "EQIIR"
+	uuid = "5150C0E6-27F9-4EC8-8351-C705B642D12F"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# eq fir module config
+	[[module.entry]]
+	name = "EQFIR"
+	uuid = "43A90CE7-f3A5-41Df-AC06-BA98651AE6A3"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	[[module.entry]]
+	name = "KDTEST"
+	uuid = "EBA8D51F-7827-47B5-82EE-DE6E7743AF67"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "1"
+	module_type = "8"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 480, 1114000, 64, 64, 0, 0, 0]
+
+	[[module.entry]]
+	name = "KPB"
+	uuid = "D8218443-5FF3-4A4C-B388-6CFE07B9562E"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "1"
+	module_type = "0xB"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 14400, 1114000, 16, 16, 0, 0, 0]
+
+	[[module.entry]]
+	name = "MICSEL"
+	uuid = "32FE92C1-1E17-4FC2-9758-C7F3542E980A"
+	affinity_mask = "0x1"
+	instance_count = "8"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0xC"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xe, 0xa, 0x45ff, 1, 0, 0xfeef, 0xe, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 960, 488500, 16, 16, 0, 0, 0,
+			1, 0, 0, 0, 960, 964500, 16, 16, 0, 0, 0,
+			2, 0, 0, 0, 960, 2003000, 16, 16, 0, 0, 0]
+
+	# Aria module config
+	[[module.entry]]
+	name = "ARIA"
+	uuid = "99F7166D-372C-43EF-81F6-22007AA15F03"
+	affinity_mask = "0x1"
+	instance_count = "8"
+	domain_types = "0"
+	load_type = "0"
+	init_config = "1"
+	module_type = "30"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 260, 1063000, 16, 21, 0, 0, 0,
+				1, 0, 0, 0, 260, 1873500, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 260, 2680000, 32, 42, 0, 0, 0,
+				3, 0, 0, 0, 260, 3591000, 64, 85, 0, 0, 0,
+				4, 0, 0, 0, 260, 4477000, 96, 128, 0, 0, 0,
+				5, 0, 0, 0, 260, 7195000, 192, 192, 0, 0, 0]
+
+	# DRC module config
+	[[module.entry]]
+	name = "DRC"
+	uuid = "B36EE4DA-006F-47F9-A06D-FECBE2D8B6CE"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# Crossover module config
+	# Note: Crossover has init_config set to 1 to let kernel know that the base_cfg_ext needs to
+	# be appended to the IPC payload. The Extension is needed to know the output pin indices.
+	[[module.entry]]
+	name = "XOVER"
+	uuid = "948C9AD1-806A-4131-AD6C-B2BDA9E35A9F"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	init_config = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# Multiband-DRC module config
+	[[module.entry]]
+	name = "MB_DRC"
+	uuid = "0D9F2256-8E4F-47B3-8448-239A334F1191"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# DCblock module config
+	[[module.entry]]
+	name = "DCBLOCK"
+	uuid = "B809EFAF-5681-42B1-9ED6-04BB012DD384"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# TDFB module config
+	[[module.entry]]
+	name = "TDFB"
+	uuid = "DD511749-D9FA-455C-B3A7-13585693F1AF"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
diff --git a/tools/rimage/config/tgl-h.toml b/tools/rimage/config/tgl-h.toml
new file mode 100644
index 000000000000..997e1a832899
--- /dev/null
+++ b/tools/rimage/config/tgl-h.toml
@@ -0,0 +1,56 @@
+version = [2, 5]
+
+[adsp]
+name = "tgl"
+image_size = "0x1F0000" # (30 + 1) bank * 64KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0x9F180000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xB0038000"
+size = "0x100000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xBE040000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x5c"
+length = "0x464"
+[[cse.entry]]
+name = "cavs0015.met"
+offset = "0x4c0"
+length = "0x70"
+[[cse.entry]]
+name = "cavs0015"
+offset = "0x540"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "cavs0015.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x30000"
diff --git a/tools/rimage/config/tgl.toml b/tools/rimage/config/tgl.toml
new file mode 100644
index 000000000000..9a64c694c7f8
--- /dev/null
+++ b/tools/rimage/config/tgl.toml
@@ -0,0 +1,56 @@
+version = [2, 5]
+
+[adsp]
+name = "tgl"
+image_size = "0x2F0000" # (46 + 1) bank * 64KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0x9F180000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xB0038000"
+size = "0x100000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xBE040000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x5c"
+length = "0x464"
+[[cse.entry]]
+name = "cavs0015.met"
+offset = "0x4c0"
+length = "0x70"
+[[cse.entry]]
+name = "cavs0015"
+offset = "0x540"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "cavs0015.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x30000"
diff --git a/tools/rimage/config/vangogh.toml b/tools/rimage/config/vangogh.toml
new file mode 100644
index 000000000000..c5acdb9c9ba3
--- /dev/null
+++ b/tools/rimage/config/vangogh.toml
@@ -0,0 +1,15 @@
+version = [1, 0]  # use simple file write
+
+[adsp]
+name = "vangogh"
+
+[[adsp.mem_zone]]
+type = "IRAM"
+base = "0x20000000"
+size = "0x40000"
+host_offset = "0x0"
+[[adsp.mem_zone]]
+type = "DRAM"
+base = "0xE0000000"
+size = "0x100000"
+host_offset = "0x0"
diff --git a/tools/rimage/scripts/checkpatch.pl b/tools/rimage/scripts/checkpatch.pl
new file mode 100755
index 000000000000..ce33a3b0ac98
--- /dev/null
+++ b/tools/rimage/scripts/checkpatch.pl
@@ -0,0 +1,6845 @@
+#!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
+#
+# (c) 2001, Dave Jones. (the file handling bit)
+# (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
+# (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite)
+# (c) 2008-2010 Andy Whitcroft <apw@canonical.com>
+# (c) 2010-2018 Joe Perches <joe@perches.com>
+
+use strict;
+use warnings;
+use POSIX;
+use File::Basename;
+use Cwd 'abs_path';
+use Term::ANSIColor qw(:constants);
+use Encode qw(decode encode);
+
+my $P = $0;
+my $D = dirname(abs_path($P));
+
+my $V = '0.32';
+
+use Getopt::Long qw(:config no_auto_abbrev);
+
+my $SOF = 1; # enables SOF-specific behaviour
+my $quiet = 0;
+my $tree = 1;
+my $chk_signoff = 1;
+my $chk_patch = 1;
+my $tst_only;
+my $emacs = 0;
+my $terse = 0;
+my $showfile = 0;
+my $file = 0;
+my $git = 0;
+my %git_commits = ();
+my $check = 0;
+my $check_orig = 0;
+my $summary = 1;
+my $mailback = 0;
+my $summary_file = 0;
+my $show_types = 0;
+my $list_types = 0;
+my $fix = 0;
+my $fix_inplace = 0;
+my $root;
+my %debug;
+my %camelcase = ();
+my %use_type = ();
+my @use = ();
+my %ignore_type = ();
+my @ignore = ();
+my $help = 0;
+my $configuration_file = ".checkpatch.conf";
+my $max_line_length = 100;
+my $ignore_perl_version = 0;
+my $minimum_perl_version = 5.10.0;
+my $min_conf_desc_length = 4;
+my $spelling_file = "$D/spelling.txt";
+my $codespell = 0;
+my $codespellfile = "/usr/share/codespell/dictionary.txt";
+my $conststructsfile = "$D/const_structs.checkpatch";
+my $typedefsfile = "";
+my $color = "auto";
+my $allow_c99_comments = 1; # Can be overridden by --ignore C99_COMMENT_TOLERANCE
+# git output parsing needs US English output, so first set backtick child process LANGUAGE
+my $git_command ='export LANGUAGE=en_US.UTF-8; git';
+
+sub help {
+	my ($exitcode) = @_;
+
+	print << "EOM";
+Usage: $P [OPTION]... [FILE]...
+Version: $V
+
+Options:
+  -q, --quiet                quiet
+  --no-tree                  run without a kernel tree
+  --no-signoff               do not check for 'Signed-off-by' line
+  --patch                    treat FILE as patchfile (default)
+  --emacs                    emacs compile window format
+  --terse                    one line per report
+  --showfile                 emit diffed file position, not input file position
+  -g, --git                  treat FILE as a single commit or git revision range
+                             single git commit with:
+                               <rev>
+                               <rev>^
+                               <rev>~n
+                             multiple git commits with:
+                               <rev1>..<rev2>
+                               <rev1>...<rev2>
+                               <rev>-<count>
+                             git merges are ignored
+  -f, --file                 treat FILE as regular source file
+  --subjective, --strict     enable more subjective tests
+  --list-types               list the possible message types
+  --types TYPE(,TYPE2...)    show only these comma separated message types
+  --ignore TYPE(,TYPE2...)   ignore various comma separated message types
+  --show-types               show the specific message type in the output
+  --max-line-length=n        set the maximum line length, (default $max_line_length)
+                             if exceeded, warn on patches
+                             requires --strict for use with --file
+  --min-conf-desc-length=n   set the min description length, if shorter, warn
+  --root=PATH                PATH to the kernel tree root
+  --no-summary               suppress the per-file summary
+  --mailback                 only produce a report in case of warnings/errors
+  --summary-file             include the filename in summary
+  --debug KEY=[0|1]          turn on/off debugging of KEY, where KEY is one of
+                             'values', 'possible', 'type', and 'attr' (default
+                             is all off)
+  --test-only=WORD           report only warnings/errors containing WORD
+                             literally
+  --fix                      EXPERIMENTAL - may create horrible results
+                             If correctable single-line errors exist, create
+                             "<inputfile>.EXPERIMENTAL-checkpatch-fixes"
+                             with potential errors corrected to the preferred
+                             checkpatch style
+  --fix-inplace              EXPERIMENTAL - may create horrible results
+                             Is the same as --fix, but overwrites the input
+                             file.  It's your fault if there's no backup or git
+  --ignore-perl-version      override checking of perl version.  expect
+                             runtime errors.
+  --codespell                Use the codespell dictionary for spelling/typos
+                             (default:/usr/share/codespell/dictionary.txt)
+  --codespellfile            Use this codespell dictionary
+  --typedefsfile             Read additional types from this file
+  --color[=WHEN]             Use colors 'always', 'never', or only when output
+                             is a terminal ('auto'). Default is 'auto'.
+  -h, --help, --version      display this help and exit
+
+When FILE is - read standard input.
+EOM
+
+	exit($exitcode);
+}
+
+sub uniq {
+	my %seen;
+	return grep { !$seen{$_}++ } @_;
+}
+
+sub list_types {
+	my ($exitcode) = @_;
+
+	my $count = 0;
+
+	local $/ = undef;
+
+	open(my $script, '<', abs_path($P)) or
+	    die "$P: Can't read '$P' $!\n";
+
+	my $text = <$script>;
+	close($script);
+
+	my @types = ();
+	# Also catch when type or level is passed through a variable
+	for ($text =~ /(?:(?:\bCHK|\bWARN|\bERROR|&\{\$msg_level})\s*\(|\$msg_type\s*=)\s*"([^"]+)"/g) {
+		push (@types, $_);
+	}
+	@types = sort(uniq(@types));
+	print("#\tMessage type\n\n");
+	foreach my $type (@types) {
+		print(++$count . "\t" . $type . "\n");
+	}
+
+	exit($exitcode);
+}
+
+my $conf = which_conf($configuration_file);
+if (-f $conf) {
+	my @conf_args;
+	open(my $conffile, '<', "$conf")
+	    or warn "$P: Can't find a readable $configuration_file file $!\n";
+
+	while (<$conffile>) {
+		my $line = $_;
+
+		$line =~ s/\s*\n?$//g;
+		$line =~ s/^\s*//g;
+		$line =~ s/\s+/ /g;
+
+		next if ($line =~ m/^\s*#/);
+		next if ($line =~ m/^\s*$/);
+
+		my @words = split(" ", $line);
+		foreach my $word (@words) {
+			last if ($word =~ m/^#/);
+			push (@conf_args, $word);
+		}
+	}
+	close($conffile);
+	unshift(@ARGV, @conf_args) if @conf_args;
+}
+
+# Perl's Getopt::Long allows options to take optional arguments after a space.
+# Prevent --color by itself from consuming other arguments
+foreach (@ARGV) {
+	if ($_ eq "--color" || $_ eq "-color") {
+		$_ = "--color=$color";
+	}
+}
+
+GetOptions(
+	'q|quiet+'	=> \$quiet,
+	'tree!'		=> \$tree,
+	'signoff!'	=> \$chk_signoff,
+	'patch!'	=> \$chk_patch,
+	'emacs!'	=> \$emacs,
+	'terse!'	=> \$terse,
+	'showfile!'	=> \$showfile,
+	'f|file!'	=> \$file,
+	'g|git!'	=> \$git,
+	'subjective!'	=> \$check,
+	'strict!'	=> \$check,
+	'ignore=s'	=> \@ignore,
+	'types=s'	=> \@use,
+	'show-types!'	=> \$show_types,
+	'list-types!'	=> \$list_types,
+	'max-line-length=i' => \$max_line_length,
+	'min-conf-desc-length=i' => \$min_conf_desc_length,
+	'root=s'	=> \$root,
+	'summary!'	=> \$summary,
+	'mailback!'	=> \$mailback,
+	'summary-file!'	=> \$summary_file,
+	'fix!'		=> \$fix,
+	'fix-inplace!'	=> \$fix_inplace,
+	'ignore-perl-version!' => \$ignore_perl_version,
+	'debug=s'	=> \%debug,
+	'test-only=s'	=> \$tst_only,
+	'codespell!'	=> \$codespell,
+	'codespellfile=s'	=> \$codespellfile,
+	'typedefsfile=s'	=> \$typedefsfile,
+	'color=s'	=> \$color,
+	'no-color'	=> \$color,	#keep old behaviors of -nocolor
+	'nocolor'	=> \$color,	#keep old behaviors of -nocolor
+	'h|help'	=> \$help,
+	'version'	=> \$help
+) or help(1);
+
+help(0) if ($help);
+
+list_types(0) if ($list_types);
+
+$fix = 1 if ($fix_inplace);
+$check_orig = $check;
+
+my $exit = 0;
+
+my $perl_version_ok = 1;
+if ($^V && $^V lt $minimum_perl_version) {
+	$perl_version_ok = 0;
+	printf "$P: requires at least perl version %vd\n", $minimum_perl_version;
+	exit(1) if (!$ignore_perl_version);
+}
+
+#if no filenames are given, push '-' to read patch from stdin
+if ($#ARGV < 0) {
+	push(@ARGV, '-');
+}
+
+if ($color =~ /^[01]$/) {
+	$color = !$color;
+} elsif ($color =~ /^always$/i) {
+	$color = 1;
+} elsif ($color =~ /^never$/i) {
+	$color = 0;
+} elsif ($color =~ /^auto$/i) {
+	$color = (-t STDOUT);
+} else {
+	die "Invalid color mode: $color\n";
+}
+
+sub hash_save_array_words {
+	my ($hashRef, $arrayRef) = @_;
+
+	my @array = split(/,/, join(',', @$arrayRef));
+	foreach my $word (@array) {
+		$word =~ s/\s*\n?$//g;
+		$word =~ s/^\s*//g;
+		$word =~ s/\s+/ /g;
+		$word =~ tr/[a-z]/[A-Z]/;
+
+		next if ($word =~ m/^\s*#/);
+		next if ($word =~ m/^\s*$/);
+
+		$hashRef->{$word}++;
+	}
+}
+
+sub hash_show_words {
+	my ($hashRef, $prefix) = @_;
+
+	if (keys %$hashRef) {
+		print "\nNOTE: $prefix message types:";
+		foreach my $word (sort keys %$hashRef) {
+			print " $word";
+		}
+		print "\n";
+	}
+}
+
+hash_save_array_words(\%ignore_type, \@ignore);
+hash_save_array_words(\%use_type, \@use);
+
+my $dbg_values = 0;
+my $dbg_possible = 0;
+my $dbg_type = 0;
+my $dbg_attr = 0;
+for my $key (keys %debug) {
+	## no critic
+	eval "\${dbg_$key} = '$debug{$key}';";
+	die "$@" if ($@);
+}
+
+my $rpt_cleaners = 0;
+
+if ($terse) {
+	$emacs = 1;
+	$quiet++;
+}
+
+if ($tree) {
+	if (defined $root) {
+		if (!top_of_kernel_tree($root)) {
+			die "$P: $root: --root does not point at a valid tree\n";
+		}
+	} else {
+		if (top_of_kernel_tree('.')) {
+			$root = '.';
+		} elsif ($0 =~ m@(.*)/scripts/[^/]*$@ &&
+						top_of_kernel_tree($1)) {
+			$root = $1;
+		}
+	}
+
+	if (!defined $root) {
+		print "Must be run from the top-level dir. of a kernel tree\n";
+		exit(2);
+	}
+}
+
+my $emitted_corrupt = 0;
+
+our $Ident	= qr{
+			[A-Za-z_][A-Za-z\d_]*
+			(?:\s*\#\#\s*[A-Za-z_][A-Za-z\d_]*)*
+		}x;
+our $Storage	= qr{extern|static|asmlinkage};
+our $Sparse	= qr{
+			__user|
+			__kernel|
+			__force|
+			__iomem|
+			__must_check|
+			__kprobes|
+			__ref|
+			__refconst|
+			__refdata|
+			__rcu|
+			__private
+		}x;
+our $InitAttributePrefix = qr{__(?:mem|cpu|dev|net_|)};
+our $InitAttributeData = qr{$InitAttributePrefix(?:initdata\b)};
+our $InitAttributeConst = qr{$InitAttributePrefix(?:initconst\b)};
+our $InitAttributeInit = qr{$InitAttributePrefix(?:init\b)};
+our $InitAttribute = qr{$InitAttributeData|$InitAttributeConst|$InitAttributeInit};
+
+# Notes to $Attribute:
+# We need \b after 'init' otherwise 'initconst' will cause a false positive in a check
+our $Attribute	= qr{
+			const|
+			__percpu|
+			__nocast|
+			__safe|
+			__bitwise|
+			__packed__|
+			__packed2__|
+			__naked|
+			__maybe_unused|
+			__always_unused|
+			__noreturn|
+			__used|
+			__cold|
+			__pure|
+			__noclone|
+			__deprecated|
+			__read_mostly|
+			__ro_after_init|
+			__kprobes|
+			$InitAttribute|
+			____cacheline_aligned|
+			____cacheline_aligned_in_smp|
+			____cacheline_internodealigned_in_smp|
+			__weak
+		  }x;
+our $Modifier;
+our $Inline	= qr{inline|__always_inline|noinline|__inline|__inline__};
+our $Member	= qr{->$Ident|\.$Ident|\[[^]]*\]};
+our $Lval	= qr{$Ident(?:$Member)*};
+
+our $Int_type	= qr{(?i)llu|ull|ll|lu|ul|l|u};
+our $Binary	= qr{(?i)0b[01]+$Int_type?};
+our $Hex	= qr{(?i)0x[0-9a-f]+$Int_type?};
+our $Int	= qr{[0-9]+$Int_type?};
+our $Octal	= qr{0[0-7]+$Int_type?};
+our $String	= qr{"[X\t]*"};
+our $Float_hex	= qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?};
+our $Float_dec	= qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?};
+our $Float_int	= qr{(?i)[0-9]+e-?[0-9]+[fl]?};
+our $Float	= qr{$Float_hex|$Float_dec|$Float_int};
+our $Constant	= qr{$Float|$Binary|$Octal|$Hex|$Int};
+our $Assignment	= qr{\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=};
+our $Compare    = qr{<=|>=|==|!=|<|(?<!-)>};
+our $Arithmetic = qr{\+|-|\*|\/|%};
+our $Operators	= qr{
+			<=|>=|==|!=|
+			=>|->|<<|>>|<|>|!|~|
+			&&|\|\||,|\^|\+\+|--|&|\||$Arithmetic
+		  }x;
+
+our $c90_Keywords = qr{do|for|while|if|else|return|goto|continue|switch|default|case|break}x;
+
+our $BasicType;
+our $NonptrType;
+our $NonptrTypeMisordered;
+our $NonptrTypeWithAttr;
+our $Type;
+our $TypeMisordered;
+our $Declare;
+our $DeclareMisordered;
+
+our $NON_ASCII_UTF8	= qr{
+	[\xC2-\xDF][\x80-\xBF]               # non-overlong 2-byte
+	|  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
+	| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+	|  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
+	|  \xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
+	| [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+	|  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
+}x;
+
+our $UTF8	= qr{
+	[\x09\x0A\x0D\x20-\x7E]              # ASCII
+	| $NON_ASCII_UTF8
+}x;
+
+our $typeC99Typedefs = qr{(?:__)?(?:[us]_?)?int_?(?:8|16|32|64)_t};
+our $typeOtherOSTypedefs = qr{(?x:
+	u_(?:char|short|int|long) |          # bsd
+	u(?:nchar|short|int|long)            # sysv
+)};
+our $typeKernelTypedefs = qr{(?x:
+	(?:__)?(?:u|s|be|le)(?:8|16|32|64)|
+	atomic_t
+)};
+our $typeTypedefs = qr{(?x:
+	$typeC99Typedefs\b|
+	$typeOtherOSTypedefs\b|
+	$typeKernelTypedefs\b
+)};
+
+our $zero_initializer = qr{(?:(?:0[xX])?0+$Int_type?|NULL|false)\b};
+
+our $logFunctions = qr{(?x:
+	printk(?:_ratelimited|_once|_deferred_once|_deferred|)|
+	(?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
+	TP_printk|
+	WARN(?:_RATELIMIT|_ONCE|)|
+	panic|
+	MODULE_[A-Z_]+|
+	seq_vprintf|seq_printf|seq_puts|
+	trace[a-z_]+
+)};
+
+our $allocFunctions = qr{(?x:
+	(?:(?:devm_)?
+		(?:kv|k|v)[czm]alloc(?:_node|_array)? |
+		kstrdup(?:_const)? |
+		kmemdup(?:_nul)?) |
+	(?:\w+)?alloc_skb(?:ip_align)? |
+				# dev_alloc_skb/netdev_alloc_skb, et al
+	dma_alloc_coherent
+)};
+
+our $signature_tags = qr{(?xi:
+	Signed-off-by:|
+	Co-developed-by:|
+	Acked-by:|
+	Tested-by:|
+	Reviewed-by:|
+	Reported-by:|
+	Suggested-by:|
+	To:|
+	Cc:
+)};
+
+our @typeListMisordered = (
+	qr{char\s+(?:un)?signed},
+	qr{int\s+(?:(?:un)?signed\s+)?short\s},
+	qr{int\s+short(?:\s+(?:un)?signed)},
+	qr{short\s+int(?:\s+(?:un)?signed)},
+	qr{(?:un)?signed\s+int\s+short},
+	qr{short\s+(?:un)?signed},
+	qr{long\s+int\s+(?:un)?signed},
+	qr{int\s+long\s+(?:un)?signed},
+	qr{long\s+(?:un)?signed\s+int},
+	qr{int\s+(?:un)?signed\s+long},
+	qr{int\s+(?:un)?signed},
+	qr{int\s+long\s+long\s+(?:un)?signed},
+	qr{long\s+long\s+int\s+(?:un)?signed},
+	qr{long\s+long\s+(?:un)?signed\s+int},
+	qr{long\s+long\s+(?:un)?signed},
+	qr{long\s+(?:un)?signed},
+);
+
+our @typeList = (
+	qr{void},
+	qr{(?:(?:un)?signed\s+)?char},
+	qr{(?:(?:un)?signed\s+)?short\s+int},
+	qr{(?:(?:un)?signed\s+)?short},
+	qr{(?:(?:un)?signed\s+)?int},
+	qr{(?:(?:un)?signed\s+)?long\s+int},
+	qr{(?:(?:un)?signed\s+)?long\s+long\s+int},
+	qr{(?:(?:un)?signed\s+)?long\s+long},
+	qr{(?:(?:un)?signed\s+)?long},
+	qr{(?:un)?signed},
+	qr{float},
+	qr{double},
+	qr{bool},
+	qr{struct\s+$Ident},
+	qr{union\s+$Ident},
+	qr{enum\s+$Ident},
+	qr{${Ident}_t},
+	qr{${Ident}_handler},
+	qr{${Ident}_handler_fn},
+	@typeListMisordered,
+);
+
+our $C90_int_types = qr{(?x:
+	long\s+long\s+int\s+(?:un)?signed|
+	long\s+long\s+(?:un)?signed\s+int|
+	long\s+long\s+(?:un)?signed|
+	(?:(?:un)?signed\s+)?long\s+long\s+int|
+	(?:(?:un)?signed\s+)?long\s+long|
+	int\s+long\s+long\s+(?:un)?signed|
+	int\s+(?:(?:un)?signed\s+)?long\s+long|
+
+	long\s+int\s+(?:un)?signed|
+	long\s+(?:un)?signed\s+int|
+	long\s+(?:un)?signed|
+	(?:(?:un)?signed\s+)?long\s+int|
+	(?:(?:un)?signed\s+)?long|
+	int\s+long\s+(?:un)?signed|
+	int\s+(?:(?:un)?signed\s+)?long|
+
+	int\s+(?:un)?signed|
+	(?:(?:un)?signed\s+)?int
+)};
+
+our @typeListFile = ();
+our @typeListWithAttr = (
+	@typeList,
+	qr{struct\s+$InitAttribute\s+$Ident},
+	qr{union\s+$InitAttribute\s+$Ident},
+);
+
+our @modifierList = (
+	qr{fastcall},
+);
+our @modifierListFile = ();
+
+our @mode_permission_funcs = (
+	["module_param", 3],
+	["module_param_(?:array|named|string)", 4],
+	["module_param_array_named", 5],
+	["debugfs_create_(?:file|u8|u16|u32|u64|x8|x16|x32|x64|size_t|atomic_t|bool|blob|regset32|u32_array)", 2],
+	["proc_create(?:_data|)", 2],
+	["(?:CLASS|DEVICE|SENSOR|SENSOR_DEVICE|IIO_DEVICE)_ATTR", 2],
+	["IIO_DEV_ATTR_[A-Z_]+", 1],
+	["SENSOR_(?:DEVICE_|)ATTR_2", 2],
+	["SENSOR_TEMPLATE(?:_2|)", 3],
+	["__ATTR", 2],
+);
+
+#Create a search pattern for all these functions to speed up a loop below
+our $mode_perms_search = "";
+foreach my $entry (@mode_permission_funcs) {
+	$mode_perms_search .= '|' if ($mode_perms_search ne "");
+	$mode_perms_search .= $entry->[0];
+}
+$mode_perms_search = "(?:${mode_perms_search})";
+
+our %deprecated_apis = (
+	"synchronize_rcu_bh"			=> "synchronize_rcu",
+	"synchronize_rcu_bh_expedited"		=> "synchronize_rcu_expedited",
+	"call_rcu_bh"				=> "call_rcu",
+	"rcu_barrier_bh"			=> "rcu_barrier",
+	"synchronize_sched"			=> "synchronize_rcu",
+	"synchronize_sched_expedited"		=> "synchronize_rcu_expedited",
+	"call_rcu_sched"			=> "call_rcu",
+	"rcu_barrier_sched"			=> "rcu_barrier",
+	"get_state_synchronize_sched"		=> "get_state_synchronize_rcu",
+	"cond_synchronize_sched"		=> "cond_synchronize_rcu",
+);
+
+#Create a search pattern for all these strings to speed up a loop below
+our $deprecated_apis_search = "";
+foreach my $entry (keys %deprecated_apis) {
+	$deprecated_apis_search .= '|' if ($deprecated_apis_search ne "");
+	$deprecated_apis_search .= $entry;
+}
+$deprecated_apis_search = "(?:${deprecated_apis_search})";
+
+our $mode_perms_world_writable = qr{
+	S_IWUGO		|
+	S_IWOTH		|
+	S_IRWXUGO	|
+	S_IALLUGO	|
+	0[0-7][0-7][2367]
+}x;
+
+our %mode_permission_string_types = (
+	"S_IRWXU" => 0700,
+	"S_IRUSR" => 0400,
+	"S_IWUSR" => 0200,
+	"S_IXUSR" => 0100,
+	"S_IRWXG" => 0070,
+	"S_IRGRP" => 0040,
+	"S_IWGRP" => 0020,
+	"S_IXGRP" => 0010,
+	"S_IRWXO" => 0007,
+	"S_IROTH" => 0004,
+	"S_IWOTH" => 0002,
+	"S_IXOTH" => 0001,
+	"S_IRWXUGO" => 0777,
+	"S_IRUGO" => 0444,
+	"S_IWUGO" => 0222,
+	"S_IXUGO" => 0111,
+);
+
+#Create a search pattern for all these strings to speed up a loop below
+our $mode_perms_string_search = "";
+foreach my $entry (keys %mode_permission_string_types) {
+	$mode_perms_string_search .= '|' if ($mode_perms_string_search ne "");
+	$mode_perms_string_search .= $entry;
+}
+our $single_mode_perms_string_search = "(?:${mode_perms_string_search})";
+our $multi_mode_perms_string_search = qr{
+	${single_mode_perms_string_search}
+	(?:\s*\|\s*${single_mode_perms_string_search})*
+}x;
+
+sub perms_to_octal {
+	my ($string) = @_;
+
+	return trim($string) if ($string =~ /^\s*0[0-7]{3,3}\s*$/);
+
+	my $val = "";
+	my $oval = "";
+	my $to = 0;
+	my $curpos = 0;
+	my $lastpos = 0;
+	while ($string =~ /\b(($single_mode_perms_string_search)\b(?:\s*\|\s*)?\s*)/g) {
+		$curpos = pos($string);
+		my $match = $2;
+		my $omatch = $1;
+		last if ($lastpos > 0 && ($curpos - length($omatch) != $lastpos));
+		$lastpos = $curpos;
+		$to |= $mode_permission_string_types{$match};
+		$val .= '\s*\|\s*' if ($val ne "");
+		$val .= $match;
+		$oval .= $omatch;
+	}
+	$oval =~ s/^\s*\|\s*//;
+	$oval =~ s/\s*\|\s*$//;
+	return sprintf("%04o", $to);
+}
+
+our $allowed_asm_includes = qr{(?x:
+	irq|
+	memory|
+	time|
+	reboot
+)};
+# memory.h: ARM has a custom one
+
+# Load common spelling mistakes and build regular expression list.
+my $misspellings;
+my %spelling_fix;
+
+if (open(my $spelling, '<', $spelling_file)) {
+	while (<$spelling>) {
+		my $line = $_;
+
+		$line =~ s/\s*\n?$//g;
+		$line =~ s/^\s*//g;
+
+		next if ($line =~ m/^\s*#/);
+		next if ($line =~ m/^\s*$/);
+
+		my ($suspect, $fix) = split(/\|\|/, $line);
+
+		$spelling_fix{$suspect} = $fix;
+	}
+	close($spelling);
+} else {
+	warn "No typos will be found - file '$spelling_file': $!\n";
+}
+
+if ($codespell) {
+	if (open(my $spelling, '<', $codespellfile)) {
+		while (<$spelling>) {
+			my $line = $_;
+
+			$line =~ s/\s*\n?$//g;
+			$line =~ s/^\s*//g;
+
+			next if ($line =~ m/^\s*#/);
+			next if ($line =~ m/^\s*$/);
+			next if ($line =~ m/, disabled/i);
+
+			$line =~ s/,.*$//;
+
+			my ($suspect, $fix) = split(/->/, $line);
+
+			$spelling_fix{$suspect} = $fix;
+		}
+		close($spelling);
+	} else {
+		warn "No codespell typos will be found - file '$codespellfile': $!\n";
+	}
+}
+
+$misspellings = join("|", sort keys %spelling_fix) if keys %spelling_fix;
+
+sub read_words {
+	my ($wordsRef, $file) = @_;
+
+	if (open(my $words, '<', $file)) {
+		while (<$words>) {
+			my $line = $_;
+
+			$line =~ s/\s*\n?$//g;
+			$line =~ s/^\s*//g;
+
+			next if ($line =~ m/^\s*#/);
+			next if ($line =~ m/^\s*$/);
+			if ($line =~ /\s/) {
+				print("$file: '$line' invalid - ignored\n");
+				next;
+			}
+
+			$$wordsRef .= '|' if ($$wordsRef ne "");
+			$$wordsRef .= $line;
+		}
+		close($file);
+		return 1;
+	}
+
+	return 0;
+}
+
+my $const_structs = "";
+read_words(\$const_structs, $conststructsfile)
+    or warn "No structs that should be const will be found - file '$conststructsfile': $!\n";
+
+my $typeOtherTypedefs = "";
+if (length($typedefsfile)) {
+	read_words(\$typeOtherTypedefs, $typedefsfile)
+	    or warn "No additional types will be considered - file '$typedefsfile': $!\n";
+}
+$typeTypedefs .= '|' . $typeOtherTypedefs if ($typeOtherTypedefs ne "");
+
+sub build_types {
+	my $mods = "(?x:  \n" . join("|\n  ", (@modifierList, @modifierListFile)) . "\n)";
+	my $all = "(?x:  \n" . join("|\n  ", (@typeList, @typeListFile)) . "\n)";
+	my $Misordered = "(?x:  \n" . join("|\n  ", @typeListMisordered) . "\n)";
+	my $allWithAttr = "(?x:  \n" . join("|\n  ", @typeListWithAttr) . "\n)";
+	$Modifier	= qr{(?:$Attribute|$Sparse|$mods)};
+	$BasicType	= qr{
+				(?:$typeTypedefs\b)|
+				(?:${all}\b)
+		}x;
+	$NonptrType	= qr{
+			(?:$Modifier\s+|const\s+)*
+			(?:
+				(?:typeof|__typeof__)\s*\([^\)]*\)|
+				(?:$typeTypedefs\b)|
+				(?:${all}\b)
+			)
+			(?:\s+$Modifier|\s+const)*
+		  }x;
+	$NonptrTypeMisordered	= qr{
+			(?:$Modifier\s+|const\s+)*
+			(?:
+				(?:${Misordered}\b)
+			)
+			(?:\s+$Modifier|\s+const)*
+		  }x;
+	$NonptrTypeWithAttr	= qr{
+			(?:$Modifier\s+|const\s+)*
+			(?:
+				(?:typeof|__typeof__)\s*\([^\)]*\)|
+				(?:$typeTypedefs\b)|
+				(?:${allWithAttr}\b)
+			)
+			(?:\s+$Modifier|\s+const)*
+		  }x;
+	$Type	= qr{
+			$NonptrType
+			(?:(?:\s|\*|\[\])+\s*const|(?:\s|\*\s*(?:const\s*)?|\[\])+|(?:\s*\[\s*\])+)?
+			(?:\s+$Inline|\s+$Modifier)*
+		  }x;
+	$TypeMisordered	= qr{
+			$NonptrTypeMisordered
+			(?:(?:\s|\*|\[\])+\s*const|(?:\s|\*\s*(?:const\s*)?|\[\])+|(?:\s*\[\s*\])+)?
+			(?:\s+$Inline|\s+$Modifier)*
+		  }x;
+	$Declare	= qr{(?:$Storage\s+(?:$Inline\s+)?)?$Type};
+	$DeclareMisordered	= qr{(?:$Storage\s+(?:$Inline\s+)?)?$TypeMisordered};
+}
+build_types();
+
+our $Typecast	= qr{\s*(\(\s*$NonptrType\s*\)){0,1}\s*};
+
+# Using $balanced_parens, $LvalOrFunc, or $FuncArg
+# requires at least perl version v5.10.0
+# Any use must be runtime checked with $^V
+
+our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/;
+our $LvalOrFunc	= qr{((?:[\&\*]\s*)?$Lval)\s*($balanced_parens{0,1})\s*};
+our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant|$String)};
+
+our $declaration_macros = qr{(?x:
+	(?:$Storage\s+)?(?:[A-Z_][A-Z0-9]*_){0,2}(?:DEFINE|DECLARE)(?:_[A-Z0-9]+){1,6}\s*\(|
+	(?:$Storage\s+)?[HLP]?LIST_HEAD\s*\(|
+	(?:$Storage\s+)?${Type}\s+uninitialized_var\s*\(|
+	(?:SKCIPHER_REQUEST|SHASH_DESC|AHASH_REQUEST)_ON_STACK\s*\(
+)};
+
+sub deparenthesize {
+	my ($string) = @_;
+	return "" if (!defined($string));
+
+	while ($string =~ /^\s*\(.*\)\s*$/) {
+		$string =~ s@^\s*\(\s*@@;
+		$string =~ s@\s*\)\s*$@@;
+	}
+
+	$string =~ s@\s+@ @g;
+
+	return $string;
+}
+
+sub seed_camelcase_file {
+	my ($file) = @_;
+
+	return if (!(-f $file));
+
+	local $/;
+
+	open(my $include_file, '<', "$file")
+	    or warn "$P: Can't read '$file' $!\n";
+	my $text = <$include_file>;
+	close($include_file);
+
+	my @lines = split('\n', $text);
+
+	foreach my $line (@lines) {
+		next if ($line !~ /(?:[A-Z][a-z]|[a-z][A-Z])/);
+		if ($line =~ /^[ \t]*(?:#[ \t]*define|typedef\s+$Type)\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)/) {
+			$camelcase{$1} = 1;
+		} elsif ($line =~ /^\s*$Declare\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*[\(\[,;]/) {
+			$camelcase{$1} = 1;
+		} elsif ($line =~ /^\s*(?:union|struct|enum)\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*[;\{]/) {
+			$camelcase{$1} = 1;
+		}
+	}
+}
+
+sub is_maintained_obsolete {
+	my ($filename) = @_;
+
+	return 0 if (!$tree || !(-e "$root/scripts/get_maintainer.pl"));
+
+	my $status = `perl $root/scripts/get_maintainer.pl --status --nom --nol --nogit --nogit-fallback -f $filename 2>&1`;
+
+	return $status =~ /obsolete/i;
+}
+
+sub is_SPDX_License_valid {
+	my ($license) = @_;
+
+	return 1 if (!$tree || which("python") eq "" || !(-e "$root/scripts/spdxcheck.py") || !(-e "$root/.git"));
+
+	my $root_path = abs_path($root);
+	my $status = `cd "$root_path"; echo "$license" | python scripts/spdxcheck.py -`;
+	return 0 if ($status ne "");
+	return 1;
+}
+
+my $camelcase_seeded = 0;
+sub seed_camelcase_includes {
+	return if ($camelcase_seeded);
+
+	my $files;
+	my $camelcase_cache = "";
+	my @include_files = ();
+
+	$camelcase_seeded = 1;
+
+	if (-e ".git") {
+		my $git_last_include_commit = `${git_command} log --no-merges --pretty=format:"%h%n" -1 -- include`;
+		chomp $git_last_include_commit;
+		$camelcase_cache = ".checkpatch-camelcase.git.$git_last_include_commit";
+	} else {
+		my $last_mod_date = 0;
+		$files = `find $root/include -name "*.h"`;
+		@include_files = split('\n', $files);
+		foreach my $file (@include_files) {
+			my $date = POSIX::strftime("%Y%m%d%H%M",
+						   localtime((stat $file)[9]));
+			$last_mod_date = $date if ($last_mod_date < $date);
+		}
+		$camelcase_cache = ".checkpatch-camelcase.date.$last_mod_date";
+	}
+
+	if ($camelcase_cache ne "" && -f $camelcase_cache) {
+		open(my $camelcase_file, '<', "$camelcase_cache")
+		    or warn "$P: Can't read '$camelcase_cache' $!\n";
+		while (<$camelcase_file>) {
+			chomp;
+			$camelcase{$_} = 1;
+		}
+		close($camelcase_file);
+
+		return;
+	}
+
+	if (-e ".git") {
+		$files = `${git_command} ls-files "include/*.h"`;
+		@include_files = split('\n', $files);
+	}
+
+	foreach my $file (@include_files) {
+		seed_camelcase_file($file);
+	}
+
+	if ($camelcase_cache ne "") {
+		unlink glob ".checkpatch-camelcase.*";
+		open(my $camelcase_file, '>', "$camelcase_cache")
+		    or warn "$P: Can't write '$camelcase_cache' $!\n";
+		foreach (sort { lc($a) cmp lc($b) } keys(%camelcase)) {
+			print $camelcase_file ("$_\n");
+		}
+		close($camelcase_file);
+	}
+}
+
+sub git_commit_info {
+	my ($commit, $id, $desc) = @_;
+
+	return ($id, $desc) if ((which("git") eq "") || !(-e ".git"));
+
+	my $output = `${git_command} log --no-color --format='%H %s' -1 $commit 2>&1`;
+	$output =~ s/^\s*//gm;
+	my @lines = split("\n", $output);
+
+	return ($id, $desc) if ($#lines < 0);
+
+	if ($lines[0] =~ /^error: short SHA1 $commit is ambiguous/) {
+# Maybe one day convert this block of bash into something that returns
+# all matching commit ids, but it's very slow...
+#
+#		echo "checking commits $1..."
+#		git rev-list --remotes | grep -i "^$1" |
+#		while read line ; do
+#		    git log --format='%H %s' -1 $line |
+#		    echo "commit $(cut -c 1-12,41-)"
+#		done
+	} elsif ($lines[0] =~ /^fatal: ambiguous argument '$commit': unknown revision or path not in the working tree\./) {
+		$id = undef;
+	} else {
+		$id = substr($lines[0], 0, 12);
+		$desc = substr($lines[0], 41);
+	}
+
+	return ($id, $desc);
+}
+
+$chk_signoff = 0 if ($file);
+
+my @rawlines = ();
+my @lines = ();
+my @fixed = ();
+my @fixed_inserted = ();
+my @fixed_deleted = ();
+my $fixlinenr = -1;
+
+# If input is git commits, extract all commits from the commit expressions.
+# For example, HEAD-3 means we need check 'HEAD, HEAD~1, HEAD~2'.
+die "$P: No git repository found\n" if ($git && !-e ".git");
+
+if ($git) {
+	my @commits = ();
+	foreach my $commit_expr (@ARGV) {
+		my $git_range;
+		if ($commit_expr =~ m/^(.*)-(\d+)$/) {
+			$git_range = "-$2 $1";
+		} elsif ($commit_expr =~ m/\.\./) {
+			$git_range = "$commit_expr";
+		} else {
+			$git_range = "-1 $commit_expr";
+		}
+		my $lines = `${git_command} log --no-color --no-merges --pretty=format:'%H %s' $git_range`;
+		foreach my $line (split(/\n/, $lines)) {
+			$line =~ /^([0-9a-fA-F]{40,40}) (.*)$/;
+			next if (!defined($1) || !defined($2));
+			my $sha1 = $1;
+			my $subject = $2;
+			unshift(@commits, $sha1);
+			$git_commits{$sha1} = $subject;
+		}
+	}
+	die "$P: no git commits after extraction!\n" if (@commits == 0);
+	@ARGV = @commits;
+}
+
+my $vname;
+$allow_c99_comments = !defined $ignore_type{"C99_COMMENT_TOLERANCE"};
+for my $filename (@ARGV) {
+	my $FILE;
+	if ($git) {
+		open($FILE, '-|', "git format-patch -M --stdout -1 $filename") ||
+			die "$P: $filename: git format-patch failed - $!\n";
+	} elsif ($file) {
+		open($FILE, '-|', "diff -u /dev/null $filename") ||
+			die "$P: $filename: diff failed - $!\n";
+	} elsif ($filename eq '-') {
+		open($FILE, '<&STDIN');
+	} else {
+		open($FILE, '<', "$filename") ||
+			die "$P: $filename: open failed - $!\n";
+	}
+	if ($filename eq '-') {
+		$vname = 'Your patch';
+	} elsif ($git) {
+		$vname = "Commit " . substr($filename, 0, 12) . ' ("' . $git_commits{$filename} . '")';
+	} else {
+		$vname = $filename;
+	}
+	while (<$FILE>) {
+		chomp;
+		push(@rawlines, $_);
+	}
+	close($FILE);
+
+	if ($#ARGV > 0 && $quiet == 0) {
+		print '-' x length($vname) . "\n";
+		print "$vname\n";
+		print '-' x length($vname) . "\n";
+	}
+
+	if (!process($filename)) {
+		$exit = 1;
+	}
+	@rawlines = ();
+	@lines = ();
+	@fixed = ();
+	@fixed_inserted = ();
+	@fixed_deleted = ();
+	$fixlinenr = -1;
+	@modifierListFile = ();
+	@typeListFile = ();
+	build_types();
+}
+
+if (!$quiet) {
+	hash_show_words(\%use_type, "Used");
+	hash_show_words(\%ignore_type, "Ignored");
+
+	if (!$perl_version_ok) {
+		print << "EOM"
+
+NOTE: perl $^V is not modern enough to detect all possible issues.
+      An upgrade to at least perl $minimum_perl_version is suggested.
+EOM
+	}
+	if ($exit) {
+		print << "EOM"
+
+NOTE: If any of the errors are false positives, please report
+      them to the maintainer, see CHECKPATCH in MAINTAINERS.
+EOM
+	}
+}
+
+exit($exit);
+
+sub top_of_kernel_tree {
+	my ($root) = @_;
+
+	my @tree_check = (
+		"COPYING", "CREDITS", "Kbuild", "MAINTAINERS", "Makefile",
+		"README", "Documentation", "arch", "include", "drivers",
+		"fs", "init", "ipc", "kernel", "lib", "scripts",
+	);
+
+	if ($SOF) {
+		@tree_check = (
+			"LICENCE", "README.md", "rimage", "tools",
+			"scripts", "doc", "src", "CODEOWNERS",
+			"CMakeLists.txt",
+		);
+	}
+
+	foreach my $check (@tree_check) {
+		if (! -e $root . '/' . $check) {
+			return 0;
+		}
+	}
+	return 1;
+}
+
+sub parse_email {
+	my ($formatted_email) = @_;
+
+	my $name = "";
+	my $address = "";
+	my $comment = "";
+
+	if ($formatted_email =~ /^(.*)<(\S+\@\S+)>(.*)$/) {
+		$name = $1;
+		$address = $2;
+		$comment = $3 if defined $3;
+	} elsif ($formatted_email =~ /^\s*<(\S+\@\S+)>(.*)$/) {
+		$address = $1;
+		$comment = $2 if defined $2;
+	} elsif ($formatted_email =~ /(\S+\@\S+)(.*)$/) {
+		$address = $1;
+		$comment = $2 if defined $2;
+		$formatted_email =~ s/\Q$address\E.*$//;
+		$name = $formatted_email;
+		$name = trim($name);
+		$name =~ s/^\"|\"$//g;
+		# If there's a name left after stripping spaces and
+		# leading quotes, and the address doesn't have both
+		# leading and trailing angle brackets, the address
+		# is invalid. ie:
+		#   "joe smith joe@smith.com" bad
+		#   "joe smith <joe@smith.com" bad
+		if ($name ne "" && $address !~ /^<[^>]+>$/) {
+			$name = "";
+			$address = "";
+			$comment = "";
+		}
+	}
+
+	$name = trim($name);
+	$name =~ s/^\"|\"$//g;
+	$address = trim($address);
+	$address =~ s/^\<|\>$//g;
+
+	if ($name =~ /[^\w \-]/i) { ##has "must quote" chars
+		$name =~ s/(?<!\\)"/\\"/g; ##escape quotes
+		$name = "\"$name\"";
+	}
+
+	return ($name, $address, $comment);
+}
+
+sub format_email {
+	my ($name, $address) = @_;
+
+	my $formatted_email;
+
+	$name = trim($name);
+	$name =~ s/^\"|\"$//g;
+	$address = trim($address);
+
+	if ($name =~ /[^\w \-]/i) { ##has "must quote" chars
+		$name =~ s/(?<!\\)"/\\"/g; ##escape quotes
+		$name = "\"$name\"";
+	}
+
+	if ("$name" eq "") {
+		$formatted_email = "$address";
+	} else {
+		$formatted_email = "$name <$address>";
+	}
+
+	return $formatted_email;
+}
+
+sub which {
+	my ($bin) = @_;
+
+	foreach my $path (split(/:/, $ENV{PATH})) {
+		if (-e "$path/$bin") {
+			return "$path/$bin";
+		}
+	}
+
+	return "";
+}
+
+sub which_conf {
+	my ($conf) = @_;
+
+	foreach my $path (split(/:/, ".:$ENV{HOME}:.scripts")) {
+		if (-e "$path/$conf") {
+			return "$path/$conf";
+		}
+	}
+
+	return "";
+}
+
+sub expand_tabs {
+	my ($str) = @_;
+
+	my $res = '';
+	my $n = 0;
+	for my $c (split(//, $str)) {
+		if ($c eq "\t") {
+			$res .= ' ';
+			$n++;
+			for (; ($n % 8) != 0; $n++) {
+				$res .= ' ';
+			}
+			next;
+		}
+		$res .= $c;
+		$n++;
+	}
+
+	return $res;
+}
+sub copy_spacing {
+	(my $res = shift) =~ tr/\t/ /c;
+	return $res;
+}
+
+sub line_stats {
+	my ($line) = @_;
+
+	# Drop the diff line leader and expand tabs
+	$line =~ s/^.//;
+	$line = expand_tabs($line);
+
+	# Pick the indent from the front of the line.
+	my ($white) = ($line =~ /^(\s*)/);
+
+	return (length($line), length($white));
+}
+
+my $sanitise_quote = '';
+
+sub sanitise_line_reset {
+	my ($in_comment) = @_;
+
+	if ($in_comment) {
+		$sanitise_quote = '*/';
+	} else {
+		$sanitise_quote = '';
+	}
+}
+sub sanitise_line {
+	my ($line) = @_;
+
+	my $res = '';
+	my $l = '';
+
+	my $qlen = 0;
+	my $off = 0;
+	my $c;
+
+	# Always copy over the diff marker.
+	$res = substr($line, 0, 1);
+
+	for ($off = 1; $off < length($line); $off++) {
+		$c = substr($line, $off, 1);
+
+		# Comments we are whacking completely including the begin
+		# and end, all to $;.
+		if ($sanitise_quote eq '' && substr($line, $off, 2) eq '/*') {
+			$sanitise_quote = '*/';
+
+			substr($res, $off, 2, "$;$;");
+			$off++;
+			next;
+		}
+		if ($sanitise_quote eq '*/' && substr($line, $off, 2) eq '*/') {
+			$sanitise_quote = '';
+			substr($res, $off, 2, "$;$;");
+			$off++;
+			next;
+		}
+		if ($sanitise_quote eq '' && substr($line, $off, 2) eq '//') {
+			$sanitise_quote = '//';
+
+			substr($res, $off, 2, $sanitise_quote);
+			$off++;
+			next;
+		}
+
+		# A \ in a string means ignore the next character.
+		if (($sanitise_quote eq "'" || $sanitise_quote eq '"') &&
+		    $c eq "\\") {
+			substr($res, $off, 2, 'XX');
+			$off++;
+			next;
+		}
+		# Regular quotes.
+		if ($c eq "'" || $c eq '"') {
+			if ($sanitise_quote eq '') {
+				$sanitise_quote = $c;
+
+				substr($res, $off, 1, $c);
+				next;
+			} elsif ($sanitise_quote eq $c) {
+				$sanitise_quote = '';
+			}
+		}
+
+		#print "c<$c> SQ<$sanitise_quote>\n";
+		if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") {
+			substr($res, $off, 1, $;);
+		} elsif ($off != 0 && $sanitise_quote eq '//' && $c ne "\t") {
+			substr($res, $off, 1, $;);
+		} elsif ($off != 0 && $sanitise_quote && $c ne "\t") {
+			substr($res, $off, 1, 'X');
+		} else {
+			substr($res, $off, 1, $c);
+		}
+	}
+
+	if ($sanitise_quote eq '//') {
+		$sanitise_quote = '';
+	}
+
+	# The pathname on a #include may be surrounded by '<' and '>'.
+	if ($res =~ /^.\s*\#\s*include\s+\<(.*)\>/) {
+		my $clean = 'X' x length($1);
+		$res =~ s@\<.*\>@<$clean>@;
+
+	# The whole of a #error is a string.
+	} elsif ($res =~ /^.\s*\#\s*(?:error|warning)\s+(.*)\b/) {
+		my $clean = 'X' x length($1);
+		$res =~ s@(\#\s*(?:error|warning)\s+).*@$1$clean@;
+	}
+
+	if ($allow_c99_comments && $res =~ m@(//.*$)@) {
+		my $match = $1;
+		$res =~ s/\Q$match\E/"$;" x length($match)/e;
+	}
+
+	return $res;
+}
+
+sub get_quoted_string {
+	my ($line, $rawline) = @_;
+
+	return "" if (!defined($line) || !defined($rawline));
+	return "" if ($line !~ m/($String)/g);
+	return substr($rawline, $-[0], $+[0] - $-[0]);
+}
+
+sub ctx_statement_block {
+	my ($linenr, $remain, $off) = @_;
+	my $line = $linenr - 1;
+	my $blk = '';
+	my $soff = $off;
+	my $coff = $off - 1;
+	my $coff_set = 0;
+
+	my $loff = 0;
+
+	my $type = '';
+	my $level = 0;
+	my @stack = ();
+	my $p;
+	my $c;
+	my $len = 0;
+
+	my $remainder;
+	while (1) {
+		@stack = (['', 0]) if ($#stack == -1);
+
+		#warn "CSB: blk<$blk> remain<$remain>\n";
+		# If we are about to drop off the end, pull in more
+		# context.
+		if ($off >= $len) {
+			for (; $remain > 0; $line++) {
+				last if (!defined $lines[$line]);
+				next if ($lines[$line] =~ /^-/);
+				$remain--;
+				$loff = $len;
+				$blk .= $lines[$line] . "\n";
+				$len = length($blk);
+				$line++;
+				last;
+			}
+			# Bail if there is no further context.
+			#warn "CSB: blk<$blk> off<$off> len<$len>\n";
+			if ($off >= $len) {
+				last;
+			}
+			if ($level == 0 && substr($blk, $off) =~ /^.\s*#\s*define/) {
+				$level++;
+				$type = '#';
+			}
+		}
+		$p = $c;
+		$c = substr($blk, $off, 1);
+		$remainder = substr($blk, $off);
+
+		#warn "CSB: c<$c> type<$type> level<$level> remainder<$remainder> coff_set<$coff_set>\n";
+
+		# Handle nested #if/#else.
+		if ($remainder =~ /^#\s*(?:ifndef|ifdef|if)\s/) {
+			push(@stack, [ $type, $level ]);
+		} elsif ($remainder =~ /^#\s*(?:else|elif)\b/) {
+			($type, $level) = @{$stack[$#stack - 1]};
+		} elsif ($remainder =~ /^#\s*endif\b/) {
+			($type, $level) = @{pop(@stack)};
+		}
+
+		# Statement ends at the ';' or a close '}' at the
+		# outermost level.
+		if ($level == 0 && $c eq ';') {
+			last;
+		}
+
+		# An else is really a conditional as long as its not else if
+		if ($level == 0 && $coff_set == 0 &&
+				(!defined($p) || $p =~ /(?:\s|\}|\+)/) &&
+				$remainder =~ /^(else)(?:\s|{)/ &&
+				$remainder !~ /^else\s+if\b/) {
+			$coff = $off + length($1) - 1;
+			$coff_set = 1;
+			#warn "CSB: mark coff<$coff> soff<$soff> 1<$1>\n";
+			#warn "[" . substr($blk, $soff, $coff - $soff + 1) . "]\n";
+		}
+
+		if (($type eq '' || $type eq '(') && $c eq '(') {
+			$level++;
+			$type = '(';
+		}
+		if ($type eq '(' && $c eq ')') {
+			$level--;
+			$type = ($level != 0)? '(' : '';
+
+			if ($level == 0 && $coff < $soff) {
+				$coff = $off;
+				$coff_set = 1;
+				#warn "CSB: mark coff<$coff>\n";
+			}
+		}
+		if (($type eq '' || $type eq '{') && $c eq '{') {
+			$level++;
+			$type = '{';
+		}
+		if ($type eq '{' && $c eq '}') {
+			$level--;
+			$type = ($level != 0)? '{' : '';
+
+			if ($level == 0) {
+				if (substr($blk, $off + 1, 1) eq ';') {
+					$off++;
+				}
+				last;
+			}
+		}
+		# Preprocessor commands end at the newline unless escaped.
+		if ($type eq '#' && $c eq "\n" && $p ne "\\") {
+			$level--;
+			$type = '';
+			$off++;
+			last;
+		}
+		$off++;
+	}
+	# We are truly at the end, so shuffle to the next line.
+	if ($off == $len) {
+		$loff = $len + 1;
+		$line++;
+		$remain--;
+	}
+
+	my $statement = substr($blk, $soff, $off - $soff + 1);
+	my $condition = substr($blk, $soff, $coff - $soff + 1);
+
+	#warn "STATEMENT<$statement>\n";
+	#warn "CONDITION<$condition>\n";
+
+	#print "coff<$coff> soff<$off> loff<$loff>\n";
+
+	return ($statement, $condition,
+			$line, $remain + 1, $off - $loff + 1, $level);
+}
+
+sub statement_lines {
+	my ($stmt) = @_;
+
+	# Strip the diff line prefixes and rip blank lines at start and end.
+	$stmt =~ s/(^|\n)./$1/g;
+	$stmt =~ s/^\s*//;
+	$stmt =~ s/\s*$//;
+
+	my @stmt_lines = ($stmt =~ /\n/g);
+
+	return $#stmt_lines + 2;
+}
+
+sub statement_rawlines {
+	my ($stmt) = @_;
+
+	my @stmt_lines = ($stmt =~ /\n/g);
+
+	return $#stmt_lines + 2;
+}
+
+sub statement_block_size {
+	my ($stmt) = @_;
+
+	$stmt =~ s/(^|\n)./$1/g;
+	$stmt =~ s/^\s*{//;
+	$stmt =~ s/}\s*$//;
+	$stmt =~ s/^\s*//;
+	$stmt =~ s/\s*$//;
+
+	my @stmt_lines = ($stmt =~ /\n/g);
+	my @stmt_statements = ($stmt =~ /;/g);
+
+	my $stmt_lines = $#stmt_lines + 2;
+	my $stmt_statements = $#stmt_statements + 1;
+
+	if ($stmt_lines > $stmt_statements) {
+		return $stmt_lines;
+	} else {
+		return $stmt_statements;
+	}
+}
+
+sub ctx_statement_full {
+	my ($linenr, $remain, $off) = @_;
+	my ($statement, $condition, $level);
+
+	my (@chunks);
+
+	# Grab the first conditional/block pair.
+	($statement, $condition, $linenr, $remain, $off, $level) =
+				ctx_statement_block($linenr, $remain, $off);
+	#print "F: c<$condition> s<$statement> remain<$remain>\n";
+	push(@chunks, [ $condition, $statement ]);
+	if (!($remain > 0 && $condition =~ /^\s*(?:\n[+-])?\s*(?:if|else|do)\b/s)) {
+		return ($level, $linenr, @chunks);
+	}
+
+	# Pull in the following conditional/block pairs and see if they
+	# could continue the statement.
+	for (;;) {
+		($statement, $condition, $linenr, $remain, $off, $level) =
+				ctx_statement_block($linenr, $remain, $off);
+		#print "C: c<$condition> s<$statement> remain<$remain>\n";
+		last if (!($remain > 0 && $condition =~ /^(?:\s*\n[+-])*\s*(?:else|do)\b/s));
+		#print "C: push\n";
+		push(@chunks, [ $condition, $statement ]);
+	}
+
+	return ($level, $linenr, @chunks);
+}
+
+sub ctx_block_get {
+	my ($linenr, $remain, $outer, $open, $close, $off) = @_;
+	my $line;
+	my $start = $linenr - 1;
+	my $blk = '';
+	my @o;
+	my @c;
+	my @res = ();
+
+	my $level = 0;
+	my @stack = ($level);
+	for ($line = $start; $remain > 0; $line++) {
+		next if ($rawlines[$line] =~ /^-/);
+		$remain--;
+
+		$blk .= $rawlines[$line];
+
+		# Handle nested #if/#else.
+		if ($lines[$line] =~ /^.\s*#\s*(?:ifndef|ifdef|if)\s/) {
+			push(@stack, $level);
+		} elsif ($lines[$line] =~ /^.\s*#\s*(?:else|elif)\b/) {
+			$level = $stack[$#stack - 1];
+		} elsif ($lines[$line] =~ /^.\s*#\s*endif\b/) {
+			$level = pop(@stack);
+		}
+
+		foreach my $c (split(//, $lines[$line])) {
+			##print "C<$c>L<$level><$open$close>O<$off>\n";
+			if ($off > 0) {
+				$off--;
+				next;
+			}
+
+			if ($c eq $close && $level > 0) {
+				$level--;
+				last if ($level == 0);
+			} elsif ($c eq $open) {
+				$level++;
+			}
+		}
+
+		if (!$outer || $level <= 1) {
+			push(@res, $rawlines[$line]);
+		}
+
+		last if ($level == 0);
+	}
+
+	return ($level, @res);
+}
+sub ctx_block_outer {
+	my ($linenr, $remain) = @_;
+
+	my ($level, @r) = ctx_block_get($linenr, $remain, 1, '{', '}', 0);
+	return @r;
+}
+sub ctx_block {
+	my ($linenr, $remain) = @_;
+
+	my ($level, @r) = ctx_block_get($linenr, $remain, 0, '{', '}', 0);
+	return @r;
+}
+sub ctx_statement {
+	my ($linenr, $remain, $off) = @_;
+
+	my ($level, @r) = ctx_block_get($linenr, $remain, 0, '(', ')', $off);
+	return @r;
+}
+sub ctx_block_level {
+	my ($linenr, $remain) = @_;
+
+	return ctx_block_get($linenr, $remain, 0, '{', '}', 0);
+}
+sub ctx_statement_level {
+	my ($linenr, $remain, $off) = @_;
+
+	return ctx_block_get($linenr, $remain, 0, '(', ')', $off);
+}
+
+sub ctx_locate_comment {
+	my ($first_line, $end_line) = @_;
+
+	# Catch a comment on the end of the line itself.
+	my ($current_comment) = ($rawlines[$end_line - 1] =~ m@.*(/\*.*\*/)\s*(?:\\\s*)?$@);
+	return $current_comment if (defined $current_comment);
+
+	# Look through the context and try and figure out if there is a
+	# comment.
+	my $in_comment = 0;
+	$current_comment = '';
+	for (my $linenr = $first_line; $linenr < $end_line; $linenr++) {
+		my $line = $rawlines[$linenr - 1];
+		#warn "           $line\n";
+		if ($linenr == $first_line and $line =~ m@^.\s*\*@) {
+			$in_comment = 1;
+		}
+		if ($line =~ m@/\*@) {
+			$in_comment = 1;
+		}
+		if (!$in_comment && $current_comment ne '') {
+			$current_comment = '';
+		}
+		$current_comment .= $line . "\n" if ($in_comment);
+		if ($line =~ m@\*/@) {
+			$in_comment = 0;
+		}
+	}
+
+	chomp($current_comment);
+	return($current_comment);
+}
+sub ctx_has_comment {
+	my ($first_line, $end_line) = @_;
+	my $cmt = ctx_locate_comment($first_line, $end_line);
+
+	##print "LINE: $rawlines[$end_line - 1 ]\n";
+	##print "CMMT: $cmt\n";
+
+	return ($cmt ne '');
+}
+
+sub raw_line {
+	my ($linenr, $cnt) = @_;
+
+	my $offset = $linenr - 1;
+	$cnt++;
+
+	my $line;
+	while ($cnt) {
+		$line = $rawlines[$offset++];
+		next if (defined($line) && $line =~ /^-/);
+		$cnt--;
+	}
+
+	return $line;
+}
+
+sub get_stat_real {
+	my ($linenr, $lc) = @_;
+
+	my $stat_real = raw_line($linenr, 0);
+	for (my $count = $linenr + 1; $count <= $lc; $count++) {
+		$stat_real = $stat_real . "\n" . raw_line($count, 0);
+	}
+
+	return $stat_real;
+}
+
+sub get_stat_here {
+	my ($linenr, $cnt, $here) = @_;
+
+	my $herectx = $here . "\n";
+	for (my $n = 0; $n < $cnt; $n++) {
+		$herectx .= raw_line($linenr, $n) . "\n";
+	}
+
+	return $herectx;
+}
+
+sub cat_vet {
+	my ($vet) = @_;
+	my ($res, $coded);
+
+	$res = '';
+	while ($vet =~ /([^[:cntrl:]]*)([[:cntrl:]]|$)/g) {
+		$res .= $1;
+		if ($2 ne '') {
+			$coded = sprintf("^%c", unpack('C', $2) + 64);
+			$res .= $coded;
+		}
+	}
+	$res =~ s/$/\$/;
+
+	return $res;
+}
+
+my $av_preprocessor = 0;
+my $av_pending;
+my @av_paren_type;
+my $av_pend_colon;
+
+sub annotate_reset {
+	$av_preprocessor = 0;
+	$av_pending = '_';
+	@av_paren_type = ('E');
+	$av_pend_colon = 'O';
+}
+
+sub annotate_values {
+	my ($stream, $type) = @_;
+
+	my $res;
+	my $var = '_' x length($stream);
+	my $cur = $stream;
+
+	print "$stream\n" if ($dbg_values > 1);
+
+	while (length($cur)) {
+		@av_paren_type = ('E') if ($#av_paren_type < 0);
+		print " <" . join('', @av_paren_type) .
+				"> <$type> <$av_pending>" if ($dbg_values > 1);
+		if ($cur =~ /^(\s+)/o) {
+			print "WS($1)\n" if ($dbg_values > 1);
+			if ($1 =~ /\n/ && $av_preprocessor) {
+				$type = pop(@av_paren_type);
+				$av_preprocessor = 0;
+			}
+
+		} elsif ($cur =~ /^(\(\s*$Type\s*)\)/ && $av_pending eq '_') {
+			print "CAST($1)\n" if ($dbg_values > 1);
+			push(@av_paren_type, $type);
+			$type = 'c';
+
+		} elsif ($cur =~ /^($Type)\s*(?:$Ident|,|\)|\(|\s*$)/) {
+			print "DECLARE($1)\n" if ($dbg_values > 1);
+			$type = 'T';
+
+		} elsif ($cur =~ /^($Modifier)\s*/) {
+			print "MODIFIER($1)\n" if ($dbg_values > 1);
+			$type = 'T';
+
+		} elsif ($cur =~ /^(\#\s*define\s*$Ident)(\(?)/o) {
+			print "DEFINE($1,$2)\n" if ($dbg_values > 1);
+			$av_preprocessor = 1;
+			push(@av_paren_type, $type);
+			if ($2 ne '') {
+				$av_pending = 'N';
+			}
+			$type = 'E';
+
+		} elsif ($cur =~ /^(\#\s*(?:undef\s*$Ident|include\b))/o) {
+			print "UNDEF($1)\n" if ($dbg_values > 1);
+			$av_preprocessor = 1;
+			push(@av_paren_type, $type);
+
+		} elsif ($cur =~ /^(\#\s*(?:ifdef|ifndef|if))/o) {
+			print "PRE_START($1)\n" if ($dbg_values > 1);
+			$av_preprocessor = 1;
+
+			push(@av_paren_type, $type);
+			push(@av_paren_type, $type);
+			$type = 'E';
+
+		} elsif ($cur =~ /^(\#\s*(?:else|elif))/o) {
+			print "PRE_RESTART($1)\n" if ($dbg_values > 1);
+			$av_preprocessor = 1;
+
+			push(@av_paren_type, $av_paren_type[$#av_paren_type]);
+
+			$type = 'E';
+
+		} elsif ($cur =~ /^(\#\s*(?:endif))/o) {
+			print "PRE_END($1)\n" if ($dbg_values > 1);
+
+			$av_preprocessor = 1;
+
+			# Assume all arms of the conditional end as this
+			# one does, and continue as if the #endif was not here.
+			pop(@av_paren_type);
+			push(@av_paren_type, $type);
+			$type = 'E';
+
+		} elsif ($cur =~ /^(\\\n)/o) {
+			print "PRECONT($1)\n" if ($dbg_values > 1);
+
+		} elsif ($cur =~ /^(__attribute__)\s*\(?/o) {
+			print "ATTR($1)\n" if ($dbg_values > 1);
+			$av_pending = $type;
+			$type = 'N';
+
+		} elsif ($cur =~ /^(sizeof)\s*(\()?/o) {
+			print "SIZEOF($1)\n" if ($dbg_values > 1);
+			if (defined $2) {
+				$av_pending = 'V';
+			}
+			$type = 'N';
+
+		} elsif ($cur =~ /^(if|while|for)\b/o) {
+			print "COND($1)\n" if ($dbg_values > 1);
+			$av_pending = 'E';
+			$type = 'N';
+
+		} elsif ($cur =~/^(case)/o) {
+			print "CASE($1)\n" if ($dbg_values > 1);
+			$av_pend_colon = 'C';
+			$type = 'N';
+
+		} elsif ($cur =~/^(return|else|goto|typeof|__typeof__)\b/o) {
+			print "KEYWORD($1)\n" if ($dbg_values > 1);
+			$type = 'N';
+
+		} elsif ($cur =~ /^(\()/o) {
+			print "PAREN('$1')\n" if ($dbg_values > 1);
+			push(@av_paren_type, $av_pending);
+			$av_pending = '_';
+			$type = 'N';
+
+		} elsif ($cur =~ /^(\))/o) {
+			my $new_type = pop(@av_paren_type);
+			if ($new_type ne '_') {
+				$type = $new_type;
+				print "PAREN('$1') -> $type\n"
+							if ($dbg_values > 1);
+			} else {
+				print "PAREN('$1')\n" if ($dbg_values > 1);
+			}
+
+		} elsif ($cur =~ /^($Ident)\s*\(/o) {
+			print "FUNC($1)\n" if ($dbg_values > 1);
+			$type = 'V';
+			$av_pending = 'V';
+
+		} elsif ($cur =~ /^($Ident\s*):(?:\s*\d+\s*(,|=|;))?/) {
+			if (defined $2 && $type eq 'C' || $type eq 'T') {
+				$av_pend_colon = 'B';
+			} elsif ($type eq 'E') {
+				$av_pend_colon = 'L';
+			}
+			print "IDENT_COLON($1,$type>$av_pend_colon)\n" if ($dbg_values > 1);
+			$type = 'V';
+
+		} elsif ($cur =~ /^($Ident|$Constant)/o) {
+			print "IDENT($1)\n" if ($dbg_values > 1);
+			$type = 'V';
+
+		} elsif ($cur =~ /^($Assignment)/o) {
+			print "ASSIGN($1)\n" if ($dbg_values > 1);
+			$type = 'N';
+
+		} elsif ($cur =~/^(;|{|})/) {
+			print "END($1)\n" if ($dbg_values > 1);
+			$type = 'E';
+			$av_pend_colon = 'O';
+
+		} elsif ($cur =~/^(,)/) {
+			print "COMMA($1)\n" if ($dbg_values > 1);
+			$type = 'C';
+
+		} elsif ($cur =~ /^(\?)/o) {
+			print "QUESTION($1)\n" if ($dbg_values > 1);
+			$type = 'N';
+
+		} elsif ($cur =~ /^(:)/o) {
+			print "COLON($1,$av_pend_colon)\n" if ($dbg_values > 1);
+
+			substr($var, length($res), 1, $av_pend_colon);
+			if ($av_pend_colon eq 'C' || $av_pend_colon eq 'L') {
+				$type = 'E';
+			} else {
+				$type = 'N';
+			}
+			$av_pend_colon = 'O';
+
+		} elsif ($cur =~ /^(\[)/o) {
+			print "CLOSE($1)\n" if ($dbg_values > 1);
+			$type = 'N';
+
+		} elsif ($cur =~ /^(-(?![->])|\+(?!\+)|\*|\&\&|\&)/o) {
+			my $variant;
+
+			print "OPV($1)\n" if ($dbg_values > 1);
+			if ($type eq 'V') {
+				$variant = 'B';
+			} else {
+				$variant = 'U';
+			}
+
+			substr($var, length($res), 1, $variant);
+			$type = 'N';
+
+		} elsif ($cur =~ /^($Operators)/o) {
+			print "OP($1)\n" if ($dbg_values > 1);
+			if ($1 ne '++' && $1 ne '--') {
+				$type = 'N';
+			}
+
+		} elsif ($cur =~ /(^.)/o) {
+			print "C($1)\n" if ($dbg_values > 1);
+		}
+		if (defined $1) {
+			$cur = substr($cur, length($1));
+			$res .= $type x length($1);
+		}
+	}
+
+	return ($res, $var);
+}
+
+sub possible {
+	my ($possible, $line) = @_;
+	my $notPermitted = qr{(?:
+		^(?:
+			$Modifier|
+			$Storage|
+			$Type|
+			DEFINE_\S+
+		)$|
+		^(?:
+			goto|
+			return|
+			case|
+			else|
+			asm|__asm__|
+			do|
+			\#|
+			\#\#|
+		)(?:\s|$)|
+		^(?:typedef|struct|enum)\b
+	    )}x;
+	warn "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);
+	if ($possible !~ $notPermitted) {
+		# Check for modifiers.
+		$possible =~ s/\s*$Storage\s*//g;
+		$possible =~ s/\s*$Sparse\s*//g;
+		if ($possible =~ /^\s*$/) {
+
+		} elsif ($possible =~ /\s/) {
+			$possible =~ s/\s*$Type\s*//g;
+			for my $modifier (split(' ', $possible)) {
+				if ($modifier !~ $notPermitted) {
+					warn "MODIFIER: $modifier ($possible) ($line)\n" if ($dbg_possible);
+					push(@modifierListFile, $modifier);
+				}
+			}
+
+		} else {
+			warn "POSSIBLE: $possible ($line)\n" if ($dbg_possible);
+			push(@typeListFile, $possible);
+		}
+		build_types();
+	} else {
+		warn "NOTPOSS: $possible ($line)\n" if ($dbg_possible > 1);
+	}
+}
+
+my $prefix = '';
+
+sub show_type {
+	my ($type) = @_;
+
+	$type =~ tr/[a-z]/[A-Z]/;
+
+	return defined $use_type{$type} if (scalar keys %use_type > 0);
+
+	return !defined $ignore_type{$type};
+}
+
+sub report {
+	my ($level, $type, $msg) = @_;
+
+	if (!show_type($type) ||
+	    (defined $tst_only && $msg !~ /\Q$tst_only\E/)) {
+		return 0;
+	}
+	my $output = '';
+	if ($color) {
+		if ($level eq 'ERROR') {
+			$output .= RED;
+		} elsif ($level eq 'WARNING') {
+			$output .= YELLOW;
+		} else {
+			$output .= GREEN;
+		}
+	}
+	$output .= $prefix . $level . ':';
+	if ($show_types) {
+		$output .= BLUE if ($color);
+		$output .= "$type:";
+	}
+	$output .= RESET if ($color);
+	$output .= ' ' . $msg . "\n";
+
+	if ($showfile) {
+		my @lines = split("\n", $output, -1);
+		splice(@lines, 1, 1);
+		$output = join("\n", @lines);
+	}
+	$output = (split('\n', $output))[0] . "\n" if ($terse);
+
+	push(our @report, $output);
+
+	return 1;
+}
+
+sub report_dump {
+	our @report;
+}
+
+sub fixup_current_range {
+	my ($lineRef, $offset, $length) = @_;
+
+	if ($$lineRef =~ /^\@\@ -\d+,\d+ \+(\d+),(\d+) \@\@/) {
+		my $o = $1;
+		my $l = $2;
+		my $no = $o + $offset;
+		my $nl = $l + $length;
+		$$lineRef =~ s/\+$o,$l \@\@/\+$no,$nl \@\@/;
+	}
+}
+
+sub fix_inserted_deleted_lines {
+	my ($linesRef, $insertedRef, $deletedRef) = @_;
+
+	my $range_last_linenr = 0;
+	my $delta_offset = 0;
+
+	my $old_linenr = 0;
+	my $new_linenr = 0;
+
+	my $next_insert = 0;
+	my $next_delete = 0;
+
+	my @lines = ();
+
+	my $inserted = @{$insertedRef}[$next_insert++];
+	my $deleted = @{$deletedRef}[$next_delete++];
+
+	foreach my $old_line (@{$linesRef}) {
+		my $save_line = 1;
+		my $line = $old_line;	#don't modify the array
+		if ($line =~ /^(?:\+\+\+|\-\-\-)\s+\S+/) {	#new filename
+			$delta_offset = 0;
+		} elsif ($line =~ /^\@\@ -\d+,\d+ \+\d+,\d+ \@\@/) {	#new hunk
+			$range_last_linenr = $new_linenr;
+			fixup_current_range(\$line, $delta_offset, 0);
+		}
+
+		while (defined($deleted) && ${$deleted}{'LINENR'} == $old_linenr) {
+			$deleted = @{$deletedRef}[$next_delete++];
+			$save_line = 0;
+			fixup_current_range(\$lines[$range_last_linenr], $delta_offset--, -1);
+		}
+
+		while (defined($inserted) && ${$inserted}{'LINENR'} == $old_linenr) {
+			push(@lines, ${$inserted}{'LINE'});
+			$inserted = @{$insertedRef}[$next_insert++];
+			$new_linenr++;
+			fixup_current_range(\$lines[$range_last_linenr], $delta_offset++, 1);
+		}
+
+		if ($save_line) {
+			push(@lines, $line);
+			$new_linenr++;
+		}
+
+		$old_linenr++;
+	}
+
+	return @lines;
+}
+
+sub fix_insert_line {
+	my ($linenr, $line) = @_;
+
+	my $inserted = {
+		LINENR => $linenr,
+		LINE => $line,
+	};
+	push(@fixed_inserted, $inserted);
+}
+
+sub fix_delete_line {
+	my ($linenr, $line) = @_;
+
+	my $deleted = {
+		LINENR => $linenr,
+		LINE => $line,
+	};
+
+	push(@fixed_deleted, $deleted);
+}
+
+sub ERROR {
+	my ($type, $msg) = @_;
+
+	if (report("ERROR", $type, $msg)) {
+		our $clean = 0;
+		our $cnt_error++;
+		return 1;
+	}
+	return 0;
+}
+sub WARN {
+	my ($type, $msg) = @_;
+
+	if (report("WARNING", $type, $msg)) {
+		our $clean = 0;
+		our $cnt_warn++;
+		return 1;
+	}
+	return 0;
+}
+sub CHK {
+	my ($type, $msg) = @_;
+
+	if ($check && report("CHECK", $type, $msg)) {
+		our $clean = 0;
+		our $cnt_chk++;
+		return 1;
+	}
+	return 0;
+}
+
+sub check_absolute_file {
+	my ($absolute, $herecurr) = @_;
+	my $file = $absolute;
+
+	##print "absolute<$absolute>\n";
+
+	# See if any suffix of this path is a path within the tree.
+	while ($file =~ s@^[^/]*/@@) {
+		if (-f "$root/$file") {
+			##print "file<$file>\n";
+			last;
+		}
+	}
+	if (! -f _)  {
+		return 0;
+	}
+
+	# It is, so see if the prefix is acceptable.
+	my $prefix = $absolute;
+	substr($prefix, -length($file)) = '';
+
+	##print "prefix<$prefix>\n";
+	if ($prefix ne ".../") {
+		WARN("USE_RELATIVE_PATH",
+		     "use relative pathname instead of absolute in changelog text\n" . $herecurr);
+	}
+}
+
+sub trim {
+	my ($string) = @_;
+
+	$string =~ s/^\s+|\s+$//g;
+
+	return $string;
+}
+
+sub ltrim {
+	my ($string) = @_;
+
+	$string =~ s/^\s+//;
+
+	return $string;
+}
+
+sub rtrim {
+	my ($string) = @_;
+
+	$string =~ s/\s+$//;
+
+	return $string;
+}
+
+sub string_find_replace {
+	my ($string, $find, $replace) = @_;
+
+	$string =~ s/$find/$replace/g;
+
+	return $string;
+}
+
+sub tabify {
+	my ($leading) = @_;
+
+	my $source_indent = 8;
+	my $max_spaces_before_tab = $source_indent - 1;
+	my $spaces_to_tab = " " x $source_indent;
+
+	#convert leading spaces to tabs
+	1 while $leading =~ s@^([\t]*)$spaces_to_tab@$1\t@g;
+	#Remove spaces before a tab
+	1 while $leading =~ s@^([\t]*)( {1,$max_spaces_before_tab})\t@$1\t@g;
+
+	return "$leading";
+}
+
+sub pos_last_openparen {
+	my ($line) = @_;
+
+	my $pos = 0;
+
+	my $opens = $line =~ tr/\(/\(/;
+	my $closes = $line =~ tr/\)/\)/;
+
+	my $last_openparen = 0;
+
+	if (($opens == 0) || ($closes >= $opens)) {
+		return -1;
+	}
+
+	my $len = length($line);
+
+	for ($pos = 0; $pos < $len; $pos++) {
+		my $string = substr($line, $pos);
+		if ($string =~ /^($FuncArg|$balanced_parens)/) {
+			$pos += length($1) - 1;
+		} elsif (substr($line, $pos, 1) eq '(') {
+			$last_openparen = $pos;
+		} elsif (index($string, '(') == -1) {
+			last;
+		}
+	}
+
+	return length(expand_tabs(substr($line, 0, $last_openparen))) + 1;
+}
+
+sub process {
+	my $filename = shift;
+
+	my $linenr=0;
+	my $prevline="";
+	my $prevrawline="";
+	my $stashline="";
+	my $stashrawline="";
+
+	my $length;
+	my $indent;
+	my $previndent=0;
+	my $stashindent=0;
+
+	our $clean = 1;
+	my $signoff = 0;
+	my $author = '';
+	my $authorsignoff = 0;
+	my $is_patch = 0;
+	my $is_binding_patch = -1;
+	my $in_header_lines = $file ? 0 : 1;
+	my $in_commit_log = 0;		#Scanning lines before patch
+	my $has_commit_log = 0;		#Encountered lines before patch
+	my $commit_log_lines = 0;	#Number of commit log lines
+	my $commit_log_possible_stack_dump = 0;
+	my $commit_log_long_line = 0;
+	my $commit_log_has_diff = 0;
+	my $reported_maintainer_file = 0;
+	my $reported_abi_update = 0;
+	my $last_abi_file = '';
+	my $non_utf8_charset = 0;
+
+	my $last_blank_line = 0;
+	my $last_coalesced_string_linenr = -1;
+
+	our @report = ();
+	our $cnt_lines = 0;
+	our $cnt_error = 0;
+	our $cnt_warn = 0;
+	our $cnt_chk = 0;
+
+	# Trace the real file/line as we go.
+	my $realfile = '';
+	my $realline = 0;
+	my $realcnt = 0;
+	my $here = '';
+	my $context_function;		#undef'd unless there's a known function
+	my $in_comment = 0;
+	my $comment_edge = 0;
+	my $first_line = 0;
+	my $p1_prefix = '';
+
+	my $prev_values = 'E';
+
+	# suppression flags
+	my %suppress_ifbraces;
+	my %suppress_whiletrailers;
+	my %suppress_export;
+	my $suppress_statement = 0;
+
+	my %signatures = ();
+
+	# Pre-scan the patch sanitizing the lines.
+	# Pre-scan the patch looking for any __setup documentation.
+	#
+	my @setup_docs = ();
+	my $setup_docs = 0;
+
+	my $camelcase_file_seeded = 0;
+
+	my $checklicenseline = 1;
+
+	sanitise_line_reset();
+	my $line;
+	foreach my $rawline (@rawlines) {
+		$linenr++;
+		$line = $rawline;
+
+		push(@fixed, $rawline) if ($fix);
+
+		if ($rawline=~/^\+\+\+\s+(\S+)/) {
+			$setup_docs = 0;
+			if ($1 =~ m@Documentation/admin-guide/kernel-parameters.rst$@) {
+				$setup_docs = 1;
+			}
+			#next;
+		}
+		if ($rawline =~ /^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
+			$realline=$1-1;
+			if (defined $2) {
+				$realcnt=$3+1;
+			} else {
+				$realcnt=1+1;
+			}
+			$in_comment = 0;
+
+			# Guestimate if this is a continuing comment.  Run
+			# the context looking for a comment "edge".  If this
+			# edge is a close comment then we must be in a comment
+			# at context start.
+			my $edge;
+			my $cnt = $realcnt;
+			for (my $ln = $linenr + 1; $cnt > 0; $ln++) {
+				next if (defined $rawlines[$ln - 1] &&
+					 $rawlines[$ln - 1] =~ /^-/);
+				$cnt--;
+				#print "RAW<$rawlines[$ln - 1]>\n";
+				last if (!defined $rawlines[$ln - 1]);
+				if ($rawlines[$ln - 1] =~ m@(/\*|\*/)@ &&
+				    $rawlines[$ln - 1] !~ m@"[^"]*(?:/\*|\*/)[^"]*"@) {
+					($edge) = $1;
+					last;
+				}
+			}
+			if (defined $edge && $edge eq '*/') {
+				$in_comment = 1;
+			}
+
+			# Guestimate if this is a continuing comment.  If this
+			# is the start of a diff block and this line starts
+			# ' *' then it is very likely a comment.
+			if (!defined $edge &&
+			    $rawlines[$linenr] =~ m@^.\s*(?:\*\*+| \*)(?:\s|$)@)
+			{
+				$in_comment = 1;
+			}
+
+			##print "COMMENT:$in_comment edge<$edge> $rawline\n";
+			sanitise_line_reset($in_comment);
+
+		} elsif ($realcnt && $rawline =~ /^(?:\+| |$)/) {
+			# Standardise the strings and chars within the input to
+			# simplify matching -- only bother with positive lines.
+			$line = sanitise_line($rawline);
+		}
+
+		# Check if ABI is being updated.  If so, there's probably no need to
+		# emit the "does ABI need updating?" message on file add/move/delete
+		if ($SOF &&
+		    ($line =~ /\+#define SOF_ABI_MAJOR*/ ||
+		     $line =~ /\+#define SOF_ABI_MINOR*/ ||
+		     $line =~ /\+#define SOF_ABI_PATCH*/)) {
+			$reported_abi_update = 1;
+		}
+
+		push(@lines, $line);
+
+		if ($realcnt > 1) {
+			$realcnt-- if ($line =~ /^(?:\+| |$)/);
+		} else {
+			$realcnt = 0;
+		}
+
+		#print "==>$rawline\n";
+		#print "-->$line\n";
+
+		if ($setup_docs && $line =~ /^\+/) {
+			push(@setup_docs, $line);
+		}
+	}
+
+	$prefix = '';
+
+	$realcnt = 0;
+	$linenr = 0;
+	$fixlinenr = -1;
+	foreach my $line (@lines) {
+		$linenr++;
+		$fixlinenr++;
+		my $sline = $line;	#copy of $line
+		$sline =~ s/$;/ /g;	#with comments as spaces
+
+		my $rawline = $rawlines[$linenr - 1];
+
+# check if it's a mode change, rename or start of a patch
+		if (!$in_commit_log &&
+		    ($line =~ /^ mode change [0-7]+ => [0-7]+ \S+\s*$/ ||
+		    ($line =~ /^rename (?:from|to) \S+\s*$/ ||
+		     $line =~ /^diff --git a\/[\w\/\.\_\-]+ b\/\S+\s*$/))) {
+			$is_patch = 1;
+		}
+
+#extract the line range in the file after the patch is applied
+		if (!$in_commit_log &&
+		    $line =~ /^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@(.*)/) {
+			my $context = $4;
+			$is_patch = 1;
+			$first_line = $linenr + 1;
+			$realline=$1-1;
+			if (defined $2) {
+				$realcnt=$3+1;
+			} else {
+				$realcnt=1+1;
+			}
+			annotate_reset();
+			$prev_values = 'E';
+
+			%suppress_ifbraces = ();
+			%suppress_whiletrailers = ();
+			%suppress_export = ();
+			$suppress_statement = 0;
+			if ($context =~ /\b(\w+)\s*\(/) {
+				$context_function = $1;
+			} else {
+				undef $context_function;
+			}
+			next;
+
+# track the line number as we move through the hunk, note that
+# new versions of GNU diff omit the leading space on completely
+# blank context lines so we need to count that too.
+		} elsif ($line =~ /^( |\+|$)/) {
+			$realline++;
+			$realcnt-- if ($realcnt != 0);
+
+			# Measure the line length and indent.
+			($length, $indent) = line_stats($rawline);
+
+			# Track the previous line.
+			($prevline, $stashline) = ($stashline, $line);
+			($previndent, $stashindent) = ($stashindent, $indent);
+			($prevrawline, $stashrawline) = ($stashrawline, $rawline);
+
+			#warn "line<$line>\n";
+
+		} elsif ($realcnt == 1) {
+			$realcnt--;
+		}
+
+		my $hunk_line = ($realcnt != 0);
+
+		$here = "#$linenr: " if (!$file);
+		$here = "#$realline: " if ($file);
+
+		my $found_file = 0;
+		# extract the filename as it passes
+		if ($line =~ /^diff --git.*?(\S+)$/) {
+			$realfile = $1;
+			$realfile =~ s@^([^/]*)/@@ if (!$file);
+			$in_commit_log = 0;
+			$found_file = 1;
+		} elsif ($line =~ /^\+\+\+\s+(\S+)/) {
+			$realfile = $1;
+			$realfile =~ s@^([^/]*)/@@ if (!$file);
+			$in_commit_log = 0;
+
+			$p1_prefix = $1;
+			if (!$file && $tree && $p1_prefix ne '' &&
+			    -e "$root/$p1_prefix") {
+				WARN("PATCH_PREFIX",
+				     "patch prefix '$p1_prefix' exists, appears to be a -p0 patch\n");
+			}
+
+			if ($realfile =~ m@^include/asm/@) {
+				ERROR("MODIFIED_INCLUDE_ASM",
+				      "do not modify files in include/asm, change architecture specific files in include/asm-<architecture>\n" . "$here$rawline\n");
+			}
+			$found_file = 1;
+		}
+
+#make up the handle for any error we report on this line
+		if ($showfile) {
+			$prefix = "$realfile:$realline: "
+		} elsif ($emacs) {
+			if ($file) {
+				$prefix = "$filename:$realline: ";
+			} else {
+				$prefix = "$filename:$linenr: ";
+			}
+		}
+
+		if ($found_file) {
+			if (is_maintained_obsolete($realfile)) {
+				WARN("OBSOLETE",
+				     "$realfile is marked as 'obsolete' in the MAINTAINERS hierarchy.  No unnecessary modifications please.\n");
+			}
+			if ($realfile =~ m@^(?:drivers/net/|net/|drivers/staging/)@) {
+				$check = 1;
+			} else {
+				$check = $check_orig;
+			}
+			$checklicenseline = 1;
+
+			if ($realfile !~ /^MAINTAINERS/) {
+				my $last_binding_patch = $is_binding_patch;
+
+				$is_binding_patch = () = $realfile =~ m@^(?:Documentation/devicetree/|include/dt-bindings/)@;
+
+				if (($last_binding_patch != -1) &&
+				    ($last_binding_patch ^ $is_binding_patch)) {
+					WARN("DT_SPLIT_BINDING_PATCH",
+					     "DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.txt\n");
+				}
+			}
+
+			next;
+		}
+
+		$here .= "FILE: $realfile:$realline:" if ($realcnt != 0);
+
+		my $hereline = "$here\n$rawline\n";
+		my $herecurr = "$here\n$rawline\n";
+		my $hereprev = "$here\n$prevrawline\n$rawline\n";
+
+		$cnt_lines++ if ($realcnt != 0);
+
+# Verify the existence of a commit log if appropriate
+# 2 is used because a $signature is counted in $commit_log_lines
+		if ($in_commit_log) {
+			if ($line !~ /^\s*$/) {
+				$commit_log_lines++;	#could be a $signature
+			}
+		} elsif ($has_commit_log && $commit_log_lines < 2) {
+			WARN("COMMIT_MESSAGE",
+			     "Missing commit description - Add an appropriate one\n");
+			$commit_log_lines = 2;	#warn only once
+		}
+
+# Check if the commit log has what seems like a diff which can confuse patch
+		if ($in_commit_log && !$commit_log_has_diff &&
+		    (($line =~ m@^\s+diff\b.*a/[\w/]+@ &&
+		      $line =~ m@^\s+diff\b.*a/([\w/]+)\s+b/$1\b@) ||
+		     $line =~ m@^\s*(?:\-\-\-\s+a/|\+\+\+\s+b/)@ ||
+		     $line =~ m/^\s*\@\@ \-\d+,\d+ \+\d+,\d+ \@\@/)) {
+			ERROR("DIFF_IN_COMMIT_MSG",
+			      "Avoid using diff content in the commit message - patch(1) might not work\n" . $herecurr);
+			$commit_log_has_diff = 1;
+		}
+
+# Check for incorrect file permissions
+		if ($line =~ /^new (file )?mode.*[7531]\d{0,2}$/) {
+			my $permhere = $here . "FILE: $realfile\n";
+			if ($realfile !~ m@scripts/@ &&
+			    $realfile !~ /\.(py|pl|awk|sh)$/) {
+				ERROR("EXECUTE_PERMISSIONS",
+				      "do not set execute permissions for source files\n" . $permhere);
+			}
+		}
+
+# Check the patch for a From:
+		if (decode("MIME-Header", $line) =~ /^From:\s*(.*)/) {
+			$author = $1;
+			$author = encode("utf8", $author) if ($line =~ /=\?utf-8\?/i);
+			$author =~ s/"//g;
+		}
+
+# Check the patch for a signoff:
+		if ($line =~ /^\s*signed-off-by:/i) {
+			$signoff++;
+			$in_commit_log = 0;
+			if ($author ne '') {
+				my $l = $line;
+				$l =~ s/"//g;
+				if ($l =~ /^\s*signed-off-by:\s*\Q$author\E/i) {
+				    $authorsignoff = 1;
+				}
+			}
+		}
+
+
+# Check if MAINTAINERS is being updated.  If so, there's probably no need to
+# emit the "does MAINTAINERS need updating?" message on file add/move/delete
+		if ($line =~ /^\s*MAINTAINERS\s*\|/) {
+			$reported_maintainer_file = 1;
+		}
+
+# Check signature styles
+		if (!$in_header_lines &&
+		    $line =~ /^(\s*)([a-z0-9_-]+by:|$signature_tags)(\s*)(.*)/i) {
+			my $space_before = $1;
+			my $sign_off = $2;
+			my $space_after = $3;
+			my $email = $4;
+			my $ucfirst_sign_off = ucfirst(lc($sign_off));
+
+			if ($sign_off !~ /$signature_tags/) {
+				WARN("BAD_SIGN_OFF",
+				     "Non-standard signature: $sign_off\n" . $herecurr);
+			}
+			if (defined $space_before && $space_before ne "") {
+				if (WARN("BAD_SIGN_OFF",
+					 "Do not use whitespace before $ucfirst_sign_off\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =
+					    "$ucfirst_sign_off $email";
+				}
+			}
+			if ($sign_off =~ /-by:$/i && $sign_off ne $ucfirst_sign_off) {
+				if (WARN("BAD_SIGN_OFF",
+					 "'$ucfirst_sign_off' is the preferred signature form\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =
+					    "$ucfirst_sign_off $email";
+				}
+
+			}
+			if (!defined $space_after || $space_after ne " ") {
+				if (WARN("BAD_SIGN_OFF",
+					 "Use a single space after $ucfirst_sign_off\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =
+					    "$ucfirst_sign_off $email";
+				}
+			}
+
+			my ($email_name, $email_address, $comment) = parse_email($email);
+			my $suggested_email = format_email(($email_name, $email_address));
+			if ($suggested_email eq "") {
+				ERROR("BAD_SIGN_OFF",
+				      "Unrecognized email address: '$email'\n" . $herecurr);
+			} else {
+				my $dequoted = $suggested_email;
+				$dequoted =~ s/^"//;
+				$dequoted =~ s/" </ </;
+				# Don't force email to have quotes
+				# Allow just an angle bracketed address
+				if ("$dequoted$comment" ne $email &&
+				    "<$email_address>$comment" ne $email &&
+				    "$suggested_email$comment" ne $email) {
+					WARN("BAD_SIGN_OFF",
+					     "email address '$email' might be better as '$suggested_email$comment'\n" . $herecurr);
+				}
+			}
+
+# Check for duplicate signatures
+			my $sig_nospace = $line;
+			$sig_nospace =~ s/\s//g;
+			$sig_nospace = lc($sig_nospace);
+			if (defined $signatures{$sig_nospace}) {
+				WARN("BAD_SIGN_OFF",
+				     "Duplicate signature\n" . $herecurr);
+			} else {
+				$signatures{$sig_nospace} = 1;
+			}
+
+# Check Co-developed-by: immediately followed by Signed-off-by: with same name and email
+			if ($sign_off =~ /^co-developed-by:$/i) {
+				if ($email eq $author) {
+					WARN("BAD_SIGN_OFF",
+					      "Co-developed-by: should not be used to attribute nominal patch author '$author'\n" . "$here\n" . $rawline);
+				}
+				if (!defined $lines[$linenr]) {
+					WARN("BAD_SIGN_OFF",
+                                             "Co-developed-by: must be immediately followed by Signed-off-by:\n" . "$here\n" . $rawline);
+				} elsif ($rawlines[$linenr] !~ /^\s*signed-off-by:\s*(.*)/i) {
+					WARN("BAD_SIGN_OFF",
+					     "Co-developed-by: must be immediately followed by Signed-off-by:\n" . "$here\n" . $rawline . "\n" .$rawlines[$linenr]);
+				} elsif ($1 ne $email) {
+					WARN("BAD_SIGN_OFF",
+					     "Co-developed-by and Signed-off-by: name/email do not match \n" . "$here\n" . $rawline . "\n" .$rawlines[$linenr]);
+				}
+			}
+		}
+
+# Check email subject for common tools that don't need to be mentioned
+		if ($in_header_lines &&
+		    $line =~ /^Subject:.*\b(?:checkpatch|sparse|smatch)\b[^:]/i) {
+			WARN("EMAIL_SUBJECT",
+			     "A patch subject line should describe the change not the tool that found it\n" . $herecurr);
+		}
+
+# Check for unwanted Gerrit info
+		if ($in_commit_log && $line =~ /^\s*change-id:/i) {
+			ERROR("GERRIT_CHANGE_ID",
+			      "Remove Gerrit Change-Id's before submitting upstream.\n" . $herecurr);
+		}
+
+# Check if the commit log is in a possible stack dump
+		if ($in_commit_log && !$commit_log_possible_stack_dump &&
+		    ($line =~ /^\s*(?:WARNING:|BUG:)/ ||
+		     $line =~ /^\s*\[\s*\d+\.\d{6,6}\s*\]/ ||
+					# timestamp
+		     $line =~ /^\s*\[\<[0-9a-fA-F]{8,}\>\]/) ||
+		     $line =~ /^(?:\s+\w+:\s+[0-9a-fA-F]+){3,3}/ ||
+		     $line =~ /^\s*\#\d+\s*\[[0-9a-fA-F]+\]\s*\w+ at [0-9a-fA-F]+/) {
+					# stack dump address styles
+			$commit_log_possible_stack_dump = 1;
+		}
+
+# Check for line lengths > 75 in commit log, warn once
+		if ($in_commit_log && !$commit_log_long_line &&
+		    length($line) > 75 &&
+		    !($line =~ /^\s*[a-zA-Z0-9_\/\.]+\s+\|\s+\d+/ ||
+					# file delta changes
+		      $line =~ /^\s*(?:[\w\.\-]+\/)++[\w\.\-]+:/ ||
+					# filename then :
+		      $line =~ /^\s*(?:Fixes:|Link:)/i ||
+					# A Fixes: or Link: line
+		      $commit_log_possible_stack_dump)) {
+			WARN("COMMIT_LOG_LONG_LINE",
+			     "Possible unwrapped commit description (prefer a maximum 75 chars per line)\n" . $herecurr);
+			$commit_log_long_line = 1;
+		}
+
+# Reset possible stack dump if a blank line is found
+		if ($in_commit_log && $commit_log_possible_stack_dump &&
+		    $line =~ /^\s*$/) {
+			$commit_log_possible_stack_dump = 0;
+		}
+
+# Check for git id commit length and improperly formed commit descriptions
+		if ($in_commit_log && !$commit_log_possible_stack_dump &&
+		    $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink):/i &&
+		    $line !~ /^This reverts commit [0-9a-f]{7,40}/ &&
+		    ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i ||
+		     ($line =~ /(?:\s|^)[0-9a-f]{12,40}(?:[\s"'\(\[]|$)/i &&
+		      $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i &&
+		      $line !~ /\bfixes:\s*[0-9a-f]{12,40}/i))) {
+			my $init_char = "c";
+			my $orig_commit = "";
+			my $short = 1;
+			my $long = 0;
+			my $case = 1;
+			my $space = 1;
+			my $hasdesc = 0;
+			my $hasparens = 0;
+			my $id = '0123456789ab';
+			my $orig_desc = "commit description";
+			my $description = "";
+
+			if ($line =~ /\b(c)ommit\s+([0-9a-f]{5,})\b/i) {
+				$init_char = $1;
+				$orig_commit = lc($2);
+			} elsif ($line =~ /\b([0-9a-f]{12,40})\b/i) {
+				$orig_commit = lc($1);
+			}
+
+			$short = 0 if ($line =~ /\bcommit\s+[0-9a-f]{12,40}/i);
+			$long = 1 if ($line =~ /\bcommit\s+[0-9a-f]{41,}/i);
+			$space = 0 if ($line =~ /\bcommit [0-9a-f]/i);
+			$case = 0 if ($line =~ /\b[Cc]ommit\s+[0-9a-f]{5,40}[^A-F]/);
+			if ($line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("([^"]+)"\)/i) {
+				$orig_desc = $1;
+				$hasparens = 1;
+			} elsif ($line =~ /\bcommit\s+[0-9a-f]{5,}\s*$/i &&
+				 defined $rawlines[$linenr] &&
+				 $rawlines[$linenr] =~ /^\s*\("([^"]+)"\)/) {
+				$orig_desc = $1;
+				$hasparens = 1;
+			} elsif ($line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("[^"]+$/i &&
+				 defined $rawlines[$linenr] &&
+				 $rawlines[$linenr] =~ /^\s*[^"]+"\)/) {
+				$line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("([^"]+)$/i;
+				$orig_desc = $1;
+				$rawlines[$linenr] =~ /^\s*([^"]+)"\)/;
+				$orig_desc .= " " . $1;
+				$hasparens = 1;
+			}
+
+			($id, $description) = git_commit_info($orig_commit,
+							      $id, $orig_desc);
+
+			if (defined($id) &&
+			   ($short || $long || $space || $case || ($orig_desc ne $description) || !$hasparens)) {
+				ERROR("GIT_COMMIT_ID",
+				      "Please use git commit description style 'commit <12+ chars of sha1> (\"<title line>\")' - ie: '${init_char}ommit $id (\"$description\")'\n" . $herecurr);
+			}
+		}
+
+# Check for added, moved or deleted files
+		if (!$SOF &&
+		    (!$reported_maintainer_file && !$in_commit_log &&
+		     ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ ||
+		      $line =~ /^rename (?:from|to) [\w\/\.\-]+\s*$/ ||
+		      ($line =~ /\{\s*([\w\/\.\-]*)\s*\=\>\s*([\w\/\.\-]*)\s*\}/ &&
+		       (defined($1) || defined($2)))))) {
+			$is_patch = 1;
+			$reported_maintainer_file = 1;
+			WARN("FILE_PATH_CHANGES",
+			     "added, moved or deleted file(s), does MAINTAINERS need updating?\n" . $herecurr);
+		}
+
+# Check for wrappage within a valid hunk of the file
+		if ($realcnt != 0 && $line !~ m{^(?:\+|-| |\\ No newline|$)}) {
+			ERROR("CORRUPTED_PATCH",
+			      "patch seems to be corrupt (line wrapped?)\n" .
+				$herecurr) if (!$emitted_corrupt++);
+		}
+
+# UTF-8 regex found at http://www.w3.org/International/questions/qa-forms-utf-8.en.php
+		if (($realfile =~ /^$/ || $line =~ /^\+/) &&
+		    $rawline !~ m/^$UTF8*$/) {
+			my ($utf8_prefix) = ($rawline =~ /^($UTF8*)/);
+
+			my $blank = copy_spacing($rawline);
+			my $ptr = substr($blank, 0, length($utf8_prefix)) . "^";
+			my $hereptr = "$hereline$ptr\n";
+
+			CHK("INVALID_UTF8",
+			    "Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
+		}
+
+# Check if it's the start of a commit log
+# (not a header line and we haven't seen the patch filename)
+		if ($in_header_lines && $realfile =~ /^$/ &&
+		    !($rawline =~ /^\s+(?:\S|$)/ ||
+		      $rawline =~ /^(?:commit\b|from\b|[\w-]+:)/i)) {
+			$in_header_lines = 0;
+			$in_commit_log = 1;
+			$has_commit_log = 1;
+		}
+
+# Check if there is UTF-8 in a commit log when a mail header has explicitly
+# declined it, i.e defined some charset where it is missing.
+		if ($in_header_lines &&
+		    $rawline =~ /^Content-Type:.+charset="(.+)".*$/ &&
+		    $1 !~ /utf-8/i) {
+			$non_utf8_charset = 1;
+		}
+
+		if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
+		    $rawline =~ /$NON_ASCII_UTF8/) {
+			WARN("UTF8_BEFORE_PATCH",
+			    "8-bit UTF-8 used in possible commit log\n" . $herecurr);
+		}
+
+# Check for absolute kernel paths in commit message
+		if ($tree && $in_commit_log) {
+			while ($line =~ m{(?:^|\s)(/\S*)}g) {
+				my $file = $1;
+
+				if ($file =~ m{^(.*?)(?::\d+)+:?$} &&
+				    check_absolute_file($1, $herecurr)) {
+					#
+				} else {
+					check_absolute_file($file, $herecurr);
+				}
+			}
+		}
+
+# Check for various typo / spelling mistakes
+		if (defined($misspellings) &&
+		    ($in_commit_log || $line =~ /^(?:\+|Subject:)/i)) {
+			while ($rawline =~ /(?:^|[^a-z@])($misspellings)(?:\b|$|[^a-z@])/gi) {
+				my $typo = $1;
+				my $typo_fix = $spelling_fix{lc($typo)};
+				$typo_fix = ucfirst($typo_fix) if ($typo =~ /^[A-Z]/);
+				$typo_fix = uc($typo_fix) if ($typo =~ /^[A-Z]+$/);
+				my $msg_level = \&WARN;
+				$msg_level = \&CHK if ($file);
+				if (&{$msg_level}("TYPO_SPELLING",
+						  "'$typo' may be misspelled - perhaps '$typo_fix'?\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/(^|[^A-Za-z@])($typo)($|[^A-Za-z@])/$1$typo_fix$3/;
+				}
+			}
+		}
+
+# check for invalid commit id
+		if ($in_commit_log && $line =~ /(^fixes:|\bcommit)\s+([0-9a-f]{6,40})\b/i) {
+			my $id;
+			my $description;
+			($id, $description) = git_commit_info($2, undef, undef);
+			if (!defined($id)) {
+				WARN("UNKNOWN_COMMIT_ID",
+				     "Unknown commit id '$2', maybe rebased or not pulled?\n" . $herecurr);
+			}
+		}
+
+# ignore non-hunk lines and lines being removed
+		next if (!$hunk_line || $line =~ /^-/);
+
+#trailing whitespace
+		if ($line =~ /^\+.*\015/) {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			if (ERROR("DOS_LINE_ENDINGS",
+				  "DOS line endings\n" . $herevet) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/[\s\015]+$//;
+			}
+		} elsif ($rawline =~ /^\+.*\S\s+$/ || $rawline =~ /^\+\s+$/) {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			if (ERROR("TRAILING_WHITESPACE",
+				  "trailing whitespace\n" . $herevet) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\s+$//;
+			}
+
+			$rpt_cleaners = 1;
+		}
+
+# Check for FSF mailing addresses.
+		if ($rawline =~ /\bwrite to the Free/i ||
+		    $rawline =~ /\b675\s+Mass\s+Ave/i ||
+		    $rawline =~ /\b59\s+Temple\s+Pl/i ||
+		    $rawline =~ /\b51\s+Franklin\s+St/i) {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			my $msg_level = \&ERROR;
+			$msg_level = \&CHK if ($file);
+			&{$msg_level}("FSF_MAILING_ADDRESS",
+				      "Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. Linux already includes a copy of the GPL.\n" . $herevet)
+		}
+
+# check for Kconfig help text having a real description
+# Only applies when adding the entry originally, after that we do not have
+# sufficient context to determine whether it is indeed long enough.
+		if ($realfile =~ /Kconfig/ &&
+		    # 'choice' is usually the last thing on the line (though
+		    # Kconfig supports named choices), so use a word boundary
+		    # (\b) rather than a whitespace character (\s)
+		    $line =~ /^\+\s*(?:config|menuconfig|choice)\b/) {
+			my $length = 0;
+			my $cnt = $realcnt;
+			my $ln = $linenr + 1;
+			my $f;
+			my $is_start = 0;
+			my $is_end = 0;
+			for (; $cnt > 0 && defined $lines[$ln - 1]; $ln++) {
+				$f = $lines[$ln - 1];
+				$cnt-- if ($lines[$ln - 1] !~ /^-/);
+				$is_end = $lines[$ln - 1] =~ /^\+/;
+
+				next if ($f =~ /^-/);
+				last if (!$file && $f =~ /^\@\@/);
+
+				if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) {
+					$is_start = 1;
+				} elsif ($lines[$ln - 1] =~ /^\+\s*(?:help|---help---)\s*$/) {
+					if ($lines[$ln - 1] =~ "---help---") {
+						WARN("CONFIG_DESCRIPTION",
+						     "prefer 'help' over '---help---' for new help texts\n" . $herecurr);
+					}
+					$length = -1;
+				}
+
+				$f =~ s/^.//;
+				$f =~ s/#.*//;
+				$f =~ s/^\s+//;
+				next if ($f =~ /^$/);
+
+				# This only checks context lines in the patch
+				# and so hopefully shouldn't trigger false
+				# positives, even though some of these are
+				# common words in help texts
+				if ($f =~ /^\s*(?:config|menuconfig|choice|endchoice|
+						  if|endif|menu|endmenu|source)\b/x) {
+					$is_end = 1;
+					last;
+				}
+				$length++;
+			}
+			if ($is_start && $is_end && $length < $min_conf_desc_length) {
+				WARN("CONFIG_DESCRIPTION",
+				     "please write a paragraph that describes the config symbol fully\n" . $herecurr);
+			}
+			#print "is_start<$is_start> is_end<$is_end> length<$length>\n";
+		}
+
+# check for MAINTAINERS entries that don't have the right form
+		if ($realfile =~ /^MAINTAINERS$/ &&
+		    $rawline =~ /^\+[A-Z]:/ &&
+		    $rawline !~ /^\+[A-Z]:\t\S/) {
+			if (WARN("MAINTAINERS_STYLE",
+				 "MAINTAINERS entries use one tab after TYPE:\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/^(\+[A-Z]):\s*/$1:\t/;
+			}
+		}
+
+# discourage the use of boolean for type definition attributes of Kconfig options
+		if ($realfile =~ /Kconfig/ &&
+		    $line =~ /^\+\s*\bboolean\b/) {
+			WARN("CONFIG_TYPE_BOOLEAN",
+			     "Use of boolean is deprecated, please use bool instead.\n" . $herecurr);
+		}
+
+		if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
+		    ($line =~ /\+(EXTRA_[A-Z]+FLAGS).*/)) {
+			my $flag = $1;
+			my $replacement = {
+				'EXTRA_AFLAGS' =>   'asflags-y',
+				'EXTRA_CFLAGS' =>   'ccflags-y',
+				'EXTRA_CPPFLAGS' => 'cppflags-y',
+				'EXTRA_LDFLAGS' =>  'ldflags-y',
+			};
+
+			WARN("DEPRECATED_VARIABLE",
+			     "Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});
+		}
+
+# check for DT compatible documentation
+		if (defined $root &&
+			(($realfile =~ /\.dtsi?$/ && $line =~ /^\+\s*compatible\s*=\s*\"/) ||
+			 ($realfile =~ /\.[ch]$/ && $line =~ /^\+.*\.compatible\s*=\s*\"/))) {
+
+			my @compats = $rawline =~ /\"([a-zA-Z0-9\-\,\.\+_]+)\"/g;
+
+			my $dt_path = $root . "/Documentation/devicetree/bindings/";
+			my $vp_file = $dt_path . "vendor-prefixes.yaml";
+
+			foreach my $compat (@compats) {
+				my $compat2 = $compat;
+				$compat2 =~ s/\,[a-zA-Z0-9]*\-/\,<\.\*>\-/;
+				my $compat3 = $compat;
+				$compat3 =~ s/\,([a-z]*)[0-9]*\-/\,$1<\.\*>\-/;
+				`grep -Erq "$compat|$compat2|$compat3" $dt_path`;
+				if ( $? >> 8 ) {
+					WARN("UNDOCUMENTED_DT_STRING",
+					     "DT compatible string \"$compat\" appears un-documented -- check $dt_path\n" . $herecurr);
+				}
+
+				next if $compat !~ /^([a-zA-Z0-9\-]+)\,/;
+				my $vendor = $1;
+				`grep -Eq "\\"\\^\Q$vendor\E,\\.\\*\\":" $vp_file`;
+				if ( $? >> 8 ) {
+					WARN("UNDOCUMENTED_DT_STRING",
+					     "DT compatible string vendor \"$vendor\" appears un-documented -- check $vp_file\n" . $herecurr);
+				}
+			}
+		}
+
+# check for using SPDX license tag at beginning of files
+		if ($realline == $checklicenseline) {
+			if ($rawline =~ /^[ \+]\s*\#\!\s*\//) {
+				$checklicenseline = 2;
+			} elsif ($rawline =~ /^\+/) {
+				my $comment = "";
+				if ($realfile =~ /\.(h|s|S)$/) {
+					$comment = '/*';
+				} elsif ($realfile =~ /\.(c|dts|dtsi)$/) {
+					$comment = '//';
+				} elsif (($checklicenseline == 2) || $realfile =~ /\.(sh|pl|py|awk|tc)$/) {
+					$comment = '#';
+				} elsif ($realfile =~ /\.rst$/) {
+					$comment = '..';
+				}
+
+# check SPDX comment style for .[chsS] files
+				if ($realfile =~ /\.[chsS]$/ &&
+				    $rawline =~ /SPDX-License-Identifier:/ &&
+				    $rawline !~ m@^\+\s*\Q$comment\E\s*@) {
+					WARN("SPDX_LICENSE_TAG",
+					     "Improper SPDX comment style for '$realfile', please use '$comment' instead\n" . $herecurr);
+				}
+
+				if ($comment !~ /^$/ &&
+				    $rawline !~ m@^\+\Q$comment\E SPDX-License-Identifier: @) {
+					WARN("SPDX_LICENSE_TAG",
+					     "Missing or malformed SPDX-License-Identifier tag in line $checklicenseline\n" . $herecurr);
+				} elsif ($rawline =~ /(SPDX-License-Identifier: .*)/) {
+					my $spdx_license = $1;
+					if (!is_SPDX_License_valid($spdx_license)) {
+						WARN("SPDX_LICENSE_TAG",
+						     "'$spdx_license' is not supported in LICENSES/...\n" . $herecurr);
+					}
+				}
+			}
+		}
+
+# check we are in a valid source file if not then ignore this hunk
+		next if ($realfile !~ /\.(h|c|s|S|sh|dtsi|dts)$/);
+
+# check for using SPDX-License-Identifier on the wrong line number
+		if ($realline != $checklicenseline &&
+		    $rawline =~ /\bSPDX-License-Identifier:/ &&
+		    substr($line, @-, @+ - @-) eq "$;" x (@+ - @-)) {
+			WARN("SPDX_LICENSE_TAG",
+			     "Misplaced SPDX-License-Identifier tag - use line $checklicenseline instead\n" . $herecurr);
+		}
+
+# line length limit (with some exclusions)
+#
+# There are a few types of lines that may extend beyond $max_line_length:
+#	logging functions like pr_info that end in a string
+#	lines with a single string
+#	#defines that are a single string
+#	lines with an RFC3986 like URL
+#
+# There are 3 different line length message types:
+# LONG_LINE_COMMENT	a comment starts before but extends beyond $max_line_length
+# LONG_LINE_STRING	a string starts before but extends beyond $max_line_length
+# LONG_LINE		all other lines longer than $max_line_length
+#
+# if LONG_LINE is ignored, the other 2 types are also ignored
+#
+
+		if ($line =~ /^\+/ && $length > $max_line_length) {
+			my $msg_type = "LONG_LINE";
+
+			# Check the allowed long line types first
+
+			# logging functions that end in a string that starts
+			# before $max_line_length
+			if ($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(?:KERN_\S+\s*|[^"]*))?($String\s*(?:|,|\)\s*;)\s*)$/ &&
+			    length(expand_tabs(substr($line, 1, length($line) - length($1) - 1))) <= $max_line_length) {
+				$msg_type = "";
+
+			# lines with only strings (w/ possible termination)
+			# #defines with only strings
+			} elsif ($line =~ /^\+\s*$String\s*(?:\s*|,|\)\s*;)\s*$/ ||
+				 $line =~ /^\+\s*#\s*define\s+\w+\s+$String$/) {
+				$msg_type = "";
+
+			# More special cases
+			} elsif ($line =~ /^\+.*\bEFI_GUID\s*\(/ ||
+				 $line =~ /^\+\s*(?:\w+)?\s*DEFINE_PER_CPU/) {
+				$msg_type = "";
+
+			# URL ($rawline is used in case the URL is in a comment)
+			} elsif ($rawline =~ /^\+.*\b[a-z][\w\.\+\-]*:\/\/\S+/i) {
+				$msg_type = "";
+
+			# Otherwise set the alternate message types
+
+			# a comment starts before $max_line_length
+			} elsif ($line =~ /($;[\s$;]*)$/ &&
+				 length(expand_tabs(substr($line, 1, length($line) - length($1) - 1))) <= $max_line_length) {
+				$msg_type = "LONG_LINE_COMMENT"
+
+			# a quoted string starts before $max_line_length
+			} elsif ($sline =~ /\s*($String(?:\s*(?:\\|,\s*|\)\s*;\s*))?)$/ &&
+				 length(expand_tabs(substr($line, 1, length($line) - length($1) - 1))) <= $max_line_length) {
+				$msg_type = "LONG_LINE_STRING"
+			}
+
+			if ($msg_type ne "" &&
+			    (show_type("LONG_LINE") || show_type($msg_type))) {
+				my $msg_level = \&WARN;
+				$msg_level = \&CHK if ($file);
+				&{$msg_level}($msg_type,
+					      "line length of $length exceeds $max_line_length columns\n" . $herecurr);
+			}
+		}
+
+# check for adding lines without a newline.
+		if ($line =~ /^\+/ && defined $lines[$linenr] && $lines[$linenr] =~ /^\\ No newline at end of file/) {
+			WARN("MISSING_EOF_NEWLINE",
+			     "adding a line without newline at end of file\n" . $herecurr);
+		}
+
+# check we are in a valid source file C or perl if not then ignore this hunk
+		next if ($realfile !~ /\.(h|c|pl|dtsi|dts)$/);
+
+# at the beginning of a line any tabs must come first and anything
+# more than 8 must use tabs.
+		if ($rawline =~ /^\+\s* \t\s*\S/ ||
+		    $rawline =~ /^\+\s*        \s*/) {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			$rpt_cleaners = 1;
+			if (ERROR("CODE_INDENT",
+				  "code indent should use tabs where possible\n" . $herevet) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/^\+([ \t]+)/"\+" . tabify($1)/e;
+			}
+		}
+
+# check for space before tabs.
+		if ($rawline =~ /^\+/ && $rawline =~ / \t/) {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			if (WARN("SPACE_BEFORE_TAB",
+				"please, no space before tabs\n" . $herevet) &&
+			    $fix) {
+				while ($fixed[$fixlinenr] =~
+					   s/(^\+.*) {8,8}\t/$1\t\t/) {}
+				while ($fixed[$fixlinenr] =~
+					   s/(^\+.*) +\t/$1\t/) {}
+			}
+		}
+
+# check for assignments on the start of a line
+		if ($sline =~ /^\+\s+($Assignment)[^=]/) {
+			CHK("ASSIGNMENT_CONTINUATIONS",
+			    "Assignment operator '$1' should be on the previous line\n" . $hereprev);
+		}
+
+# check for && or || at the start of a line
+		if ($rawline =~ /^\+\s*(&&|\|\|)/) {
+			CHK("LOGICAL_CONTINUATIONS",
+			    "Logical continuations should be on the previous line\n" . $hereprev);
+		}
+
+# check indentation starts on a tab stop
+		if ($perl_version_ok &&
+		    $sline =~ /^\+\t+( +)(?:$c90_Keywords\b|\{\s*$|\}\s*(?:else\b|while\b|\s*$)|$Declare\s*$Ident\s*[;=])/) {
+			my $indent = length($1);
+			if ($indent % 8) {
+				if (WARN("TABSTOP",
+					 "Statements should start on a tabstop\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s@(^\+\t+) +@$1 . "\t" x ($indent/8)@e;
+				}
+			}
+		}
+
+# check multi-line statement indentation matches previous line
+		if ($perl_version_ok &&
+		    $prevline =~ /^\+([ \t]*)((?:$c90_Keywords(?:\s+if)\s*)|(?:$Declare\s*)?(?:$Ident|\(\s*\*\s*$Ident\s*\))\s*|(?:\*\s*)*$Lval\s*=\s*$Ident\s*)\(.*(\&\&|\|\||,)\s*$/) {
+			$prevline =~ /^\+(\t*)(.*)$/;
+			my $oldindent = $1;
+			my $rest = $2;
+
+			my $pos = pos_last_openparen($rest);
+			if ($pos >= 0) {
+				$line =~ /^(\+| )([ \t]*)/;
+				my $newindent = $2;
+
+				my $goodtabindent = $oldindent .
+					"\t" x ($pos / 8) .
+					" "  x ($pos % 8);
+				my $goodspaceindent = $oldindent . " "  x $pos;
+
+				if ($newindent ne $goodtabindent &&
+				    $newindent ne $goodspaceindent) {
+
+					if (CHK("PARENTHESIS_ALIGNMENT",
+						"Alignment should match open parenthesis\n" . $hereprev) &&
+					    $fix && $line =~ /^\+/) {
+						$fixed[$fixlinenr] =~
+						    s/^\+[ \t]*/\+$goodtabindent/;
+					}
+				}
+			}
+		}
+
+# check for space after cast like "(int) foo" or "(struct foo) bar"
+# avoid checking a few false positives:
+#   "sizeof(<type>)" or "__alignof__(<type>)"
+#   function pointer declarations like "(*foo)(int) = bar;"
+#   structure definitions like "(struct foo) { 0 };"
+#   multiline macros that define functions
+#   known attributes or the __attribute__ keyword
+		if ($line =~ /^\+(.*)\(\s*$Type\s*\)([ \t]++)((?![={]|\\$|$Attribute|__attribute__))/ &&
+		    (!defined($1) || $1 !~ /\b(?:sizeof|__alignof__)\s*$/)) {
+			if (CHK("SPACING",
+				"No space is necessary after a cast\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/(\(\s*$Type\s*\))[ \t]+/$1/;
+			}
+		}
+
+# Block comment styles
+# Networking with an initial /*
+		if ($realfile =~ m@^(drivers/net/|net/)@ &&
+		    $prevrawline =~ /^\+[ \t]*\/\*[ \t]*$/ &&
+		    $rawline =~ /^\+[ \t]*\*/ &&
+		    $realline > 2) {
+			WARN("NETWORKING_BLOCK_COMMENT_STYLE",
+			     "networking block comments don't use an empty /* line, use /* Comment...\n" . $hereprev);
+		}
+
+# UAPI ABI version
+		if ($SOF && $realfile ne $last_abi_file &&
+		    $realfile =~ m@^(src/include/ipc/|src/include/kernel/|src/include/user/)@ &&
+		    $rawline =~ /^\+/ &&
+		    !$reported_abi_update) {
+			$last_abi_file = $realfile;
+			WARN("ABI update ??",
+			     "Please update ABI in accordance with http://semver.org\n" . $hereprev);
+		}
+
+# Block comments use * on subsequent lines
+		if ($prevline =~ /$;[ \t]*$/ &&			#ends in comment
+		    $prevrawline =~ /^\+.*?\/\*/ &&		#starting /*
+		    $prevrawline !~ /\*\/[ \t]*$/ &&		#no trailing */
+		    $rawline =~ /^\+/ &&			#line is new
+		    $rawline !~ /^\+[ \t]*\*/) {		#no leading *
+			WARN("BLOCK_COMMENT_STYLE",
+			     "Block comments use * on subsequent lines\n" . $hereprev);
+		}
+
+# Block comments use */ on trailing lines
+		if ($rawline !~ m@^\+[ \t]*\*/[ \t]*$@ &&	#trailing */
+		    $rawline !~ m@^\+.*/\*.*\*/[ \t]*$@ &&	#inline /*...*/
+		    $rawline !~ m@^\+.*\*{2,}/[ \t]*$@ &&	#trailing **/
+		    $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) {	#non blank */
+			WARN("BLOCK_COMMENT_STYLE",
+			     "Block comments use a trailing */ on a separate line\n" . $herecurr);
+		}
+
+# Block comment * alignment
+		if ($prevline =~ /$;[ \t]*$/ &&			#ends in comment
+		    $line =~ /^\+[ \t]*$;/ &&			#leading comment
+		    $rawline =~ /^\+[ \t]*\*/ &&		#leading *
+		    (($prevrawline =~ /^\+.*?\/\*/ &&		#leading /*
+		      $prevrawline !~ /\*\/[ \t]*$/) ||		#no trailing */
+		     $prevrawline =~ /^\+[ \t]*\*/)) {		#leading *
+			my $oldindent;
+			$prevrawline =~ m@^\+([ \t]*/?)\*@;
+			if (defined($1)) {
+				$oldindent = expand_tabs($1);
+			} else {
+				$prevrawline =~ m@^\+(.*/?)\*@;
+				$oldindent = expand_tabs($1);
+			}
+			$rawline =~ m@^\+([ \t]*)\*@;
+			my $newindent = $1;
+			$newindent = expand_tabs($newindent);
+			if (length($oldindent) ne length($newindent)) {
+				WARN("BLOCK_COMMENT_STYLE",
+				     "Block comments should align the * on each line\n" . $hereprev);
+			}
+		}
+
+# check for missing blank lines after struct/union declarations
+# with exceptions for various attributes and macros
+		if ($prevline =~ /^[\+ ]};?\s*$/ &&
+		    $line =~ /^\+/ &&
+		    !($line =~ /^\+\s*$/ ||
+		      $line =~ /^\+\s*EXPORT_SYMBOL/ ||
+		      $line =~ /^\+\s*MODULE_/i ||
+		      $line =~ /^\+\s*\#\s*(?:end|elif|else)/ ||
+		      $line =~ /^\+[a-z_]*init/ ||
+		      $line =~ /^\+\s*(?:static\s+)?[A-Z_]*ATTR/ ||
+		      $line =~ /^\+\s*DECLARE/ ||
+		      $line =~ /^\+\s*builtin_[\w_]*driver/ ||
+		      $line =~ /^\+\s*__setup/)) {
+			if (CHK("LINE_SPACING",
+				"Please use a blank line after function/struct/union/enum declarations\n" . $hereprev) &&
+			    $fix) {
+				fix_insert_line($fixlinenr, "\+");
+			}
+		}
+
+# check for multiple consecutive blank lines
+		if ($prevline =~ /^[\+ ]\s*$/ &&
+		    $line =~ /^\+\s*$/ &&
+		    $last_blank_line != ($linenr - 1)) {
+			if (CHK("LINE_SPACING",
+				"Please don't use multiple blank lines\n" . $hereprev) &&
+			    $fix) {
+				fix_delete_line($fixlinenr, $rawline);
+			}
+
+			$last_blank_line = $linenr;
+		}
+
+# check for missing blank lines after declarations
+		if ($sline =~ /^\+\s+\S/ &&			#Not at char 1
+			# actual declarations
+		    ($prevline =~ /^\+\s+$Declare\s*$Ident\s*[=,;:\[]/ ||
+			# function pointer declarations
+		     $prevline =~ /^\+\s+$Declare\s*\(\s*\*\s*$Ident\s*\)\s*[=,;:\[\(]/ ||
+			# foo bar; where foo is some local typedef or #define
+		     $prevline =~ /^\+\s+$Ident(?:\s+|\s*\*\s*)$Ident\s*[=,;\[]/ ||
+			# known declaration macros
+		     $prevline =~ /^\+\s+$declaration_macros/) &&
+			# for "else if" which can look like "$Ident $Ident"
+		    !($prevline =~ /^\+\s+$c90_Keywords\b/ ||
+			# other possible extensions of declaration lines
+		      $prevline =~ /(?:$Compare|$Assignment|$Operators)\s*$/ ||
+			# not starting a section or a macro "\" extended line
+		      $prevline =~ /(?:\{\s*|\\)$/) &&
+			# looks like a declaration
+		    !($sline =~ /^\+\s+$Declare\s*$Ident\s*[=,;:\[]/ ||
+			# function pointer declarations
+		      $sline =~ /^\+\s+$Declare\s*\(\s*\*\s*$Ident\s*\)\s*[=,;:\[\(]/ ||
+			# foo bar; where foo is some local typedef or #define
+		      $sline =~ /^\+\s+$Ident(?:\s+|\s*\*\s*)$Ident\s*[=,;\[]/ ||
+			# known declaration macros
+		      $sline =~ /^\+\s+$declaration_macros/ ||
+			# start of struct or union or enum
+		      $sline =~ /^\+\s+(?:static\s+)?(?:const\s+)?(?:union|struct|enum|typedef)\b/ ||
+			# start or end of block or continuation of declaration
+		      $sline =~ /^\+\s+(?:$|[\{\}\.\#\"\?\:\(\[])/ ||
+			# bitfield continuation
+		      $sline =~ /^\+\s+$Ident\s*:\s*\d+\s*[,;]/ ||
+			# other possible extensions of declaration lines
+		      $sline =~ /^\+\s+\(?\s*(?:$Compare|$Assignment|$Operators)/) &&
+			# indentation of previous and current line are the same
+		    (($prevline =~ /\+(\s+)\S/) && $sline =~ /^\+$1\S/)) {
+			if (WARN("LINE_SPACING",
+				 "Missing a blank line after declarations\n" . $hereprev) &&
+			    $fix) {
+				fix_insert_line($fixlinenr, "\+");
+			}
+		}
+
+# check for spaces at the beginning of a line.
+# Exceptions:
+#  1) within comments
+#  2) indented preprocessor commands
+#  3) hanging labels
+		if ($rawline =~ /^\+ / && $line !~ /^\+ *(?:$;|#|$Ident:)/)  {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			if (WARN("LEADING_SPACE",
+				 "please, no spaces at the start of a line\n" . $herevet) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/^\+([ \t]+)/"\+" . tabify($1)/e;
+			}
+		}
+
+# check we are in a valid C source file if not then ignore this hunk
+		next if ($realfile !~ /\.(h|c)$/);
+
+# check for unusual line ending [ or (
+		if ($line =~ /^\+.*([\[\(])\s*$/) {
+			CHK("OPEN_ENDED_LINE",
+			    "Lines should not end with a '$1'\n" . $herecurr);
+		}
+
+# check if this appears to be the start function declaration, save the name
+		if ($sline =~ /^\+\{\s*$/ &&
+		    $prevline =~ /^\+(?:(?:(?:$Storage|$Inline)\s*)*\s*$Type\s*)?($Ident)\(/) {
+			$context_function = $1;
+		}
+
+# check if this appears to be the end of function declaration
+		if ($sline =~ /^\+\}\s*$/) {
+			undef $context_function;
+		}
+
+# check indentation of any line with a bare else
+# (but not if it is a multiple line "if (foo) return bar; else return baz;")
+# if the previous line is a break or return and is indented 1 tab more...
+		if ($sline =~ /^\+([\t]+)(?:}[ \t]*)?else(?:[ \t]*{)?\s*$/) {
+			my $tabs = length($1) + 1;
+			if ($prevline =~ /^\+\t{$tabs,$tabs}break\b/ ||
+			    ($prevline =~ /^\+\t{$tabs,$tabs}return\b/ &&
+			     defined $lines[$linenr] &&
+			     $lines[$linenr] !~ /^[ \+]\t{$tabs,$tabs}return/)) {
+				WARN("UNNECESSARY_ELSE",
+				     "else is not generally useful after a break or return\n" . $hereprev);
+			}
+		}
+
+# check indentation of a line with a break;
+# if the previous line is a goto or return and is indented the same # of tabs
+		if ($sline =~ /^\+([\t]+)break\s*;\s*$/) {
+			my $tabs = $1;
+			if ($prevline =~ /^\+$tabs(?:goto|return)\b/) {
+				WARN("UNNECESSARY_BREAK",
+				     "break is not useful after a goto or return\n" . $hereprev);
+			}
+		}
+
+# check for RCS/CVS revision markers
+		if ($rawline =~ /^\+.*\$(Revision|Log|Id)(?:\$|)/) {
+			WARN("CVS_KEYWORD",
+			     "CVS style keyword markers, these will _not_ be updated\n". $herecurr);
+		}
+
+# check for old HOTPLUG __dev<foo> section markings
+		if ($line =~ /\b(__dev(init|exit)(data|const|))\b/) {
+			WARN("HOTPLUG_SECTION",
+			     "Using $1 is unnecessary\n" . $herecurr);
+		}
+
+# Check for potential 'bare' types
+		my ($stat, $cond, $line_nr_next, $remain_next, $off_next,
+		    $realline_next);
+#print "LINE<$line>\n";
+		if ($linenr > $suppress_statement &&
+		    $realcnt && $sline =~ /.\s*\S/) {
+			($stat, $cond, $line_nr_next, $remain_next, $off_next) =
+				ctx_statement_block($linenr, $realcnt, 0);
+			$stat =~ s/\n./\n /g;
+			$cond =~ s/\n./\n /g;
+
+#print "linenr<$linenr> <$stat>\n";
+			# If this statement has no statement boundaries within
+			# it there is no point in retrying a statement scan
+			# until we hit end of it.
+			my $frag = $stat; $frag =~ s/;+\s*$//;
+			if ($frag !~ /(?:{|;)/) {
+#print "skip<$line_nr_next>\n";
+				$suppress_statement = $line_nr_next;
+			}
+
+			# Find the real next line.
+			$realline_next = $line_nr_next;
+			if (defined $realline_next &&
+			    (!defined $lines[$realline_next - 1] ||
+			     substr($lines[$realline_next - 1], $off_next) =~ /^\s*$/)) {
+				$realline_next++;
+			}
+
+			my $s = $stat;
+			$s =~ s/{.*$//s;
+
+			# Ignore goto labels.
+			if ($s =~ /$Ident:\*$/s) {
+
+			# Ignore functions being called
+			} elsif ($s =~ /^.\s*$Ident\s*\(/s) {
+
+			} elsif ($s =~ /^.\s*else\b/s) {
+
+			# declarations always start with types
+			} elsif ($prev_values eq 'E' && $s =~ /^.\s*(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?((?:\s*$Ident)+?)\b(?:\s+$Sparse)?\s*\**\s*(?:$Ident|\(\*[^\)]*\))(?:\s*$Modifier)?\s*(?:;|=|,|\()/s) {
+				my $type = $1;
+				$type =~ s/\s+/ /g;
+				possible($type, "A:" . $s);
+
+			# definitions in global scope can only start with types
+			} elsif ($s =~ /^.(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?($Ident)\b\s*(?!:)/s) {
+				possible($1, "B:" . $s);
+			}
+
+			# any (foo ... *) is a pointer cast, and foo is a type
+			while ($s =~ /\(($Ident)(?:\s+$Sparse)*[\s\*]+\s*\)/sg) {
+				possible($1, "C:" . $s);
+			}
+
+			# Check for any sort of function declaration.
+			# int foo(something bar, other baz);
+			# void (*store_gdt)(x86_descr_ptr *);
+			if ($prev_values eq 'E' && $s =~ /^(.(?:typedef\s*)?(?:(?:$Storage|$Inline)\s*)*\s*$Type\s*(?:\b$Ident|\(\*\s*$Ident\))\s*)\(/s) {
+				my ($name_len) = length($1);
+
+				my $ctx = $s;
+				substr($ctx, 0, $name_len + 1, '');
+				$ctx =~ s/\)[^\)]*$//;
+
+				for my $arg (split(/\s*,\s*/, $ctx)) {
+					if ($arg =~ /^(?:const\s+)?($Ident)(?:\s+$Sparse)*\s*\**\s*(:?\b$Ident)?$/s || $arg =~ /^($Ident)$/s) {
+
+						possible($1, "D:" . $s);
+					}
+				}
+			}
+
+		}
+
+#
+# Checks which may be anchored in the context.
+#
+
+# Check for switch () and associated case and default
+# statements should be at the same indent.
+		if ($line=~/\bswitch\s*\(.*\)/) {
+			my $err = '';
+			my $sep = '';
+			my @ctx = ctx_block_outer($linenr, $realcnt);
+			shift(@ctx);
+			for my $ctx (@ctx) {
+				my ($clen, $cindent) = line_stats($ctx);
+				if ($ctx =~ /^\+\s*(case\s+|default:)/ &&
+							$indent != $cindent) {
+					$err .= "$sep$ctx\n";
+					$sep = '';
+				} else {
+					$sep = "[...]\n";
+				}
+			}
+			if ($err ne '') {
+				ERROR("SWITCH_CASE_INDENT_LEVEL",
+				      "switch and case should be at the same indent\n$hereline$err");
+			}
+		}
+
+# if/while/etc brace do not go on next line, unless defining a do while loop,
+# or if that brace on the next line is for something else
+		if ($line =~ /(.*)\b((?:if|while|for|switch|(?:[a-z_]+|)for_each[a-z_]+)\s*\(|do\b|else\b)/ && $line !~ /^.\s*\#/) {
+			my $pre_ctx = "$1$2";
+
+			my ($level, @ctx) = ctx_statement_level($linenr, $realcnt, 0);
+
+			if ($line =~ /^\+\t{6,}/) {
+				WARN("DEEP_INDENTATION",
+				     "Too many leading tabs - consider code refactoring\n" . $herecurr);
+			}
+
+			my $ctx_cnt = $realcnt - $#ctx - 1;
+			my $ctx = join("\n", @ctx);
+
+			my $ctx_ln = $linenr;
+			my $ctx_skip = $realcnt;
+
+			while ($ctx_skip > $ctx_cnt || ($ctx_skip == $ctx_cnt &&
+					defined $lines[$ctx_ln - 1] &&
+					$lines[$ctx_ln - 1] =~ /^-/)) {
+				##print "SKIP<$ctx_skip> CNT<$ctx_cnt>\n";
+				$ctx_skip-- if (!defined $lines[$ctx_ln - 1] || $lines[$ctx_ln - 1] !~ /^-/);
+				$ctx_ln++;
+			}
+
+			#print "realcnt<$realcnt> ctx_cnt<$ctx_cnt>\n";
+			#print "pre<$pre_ctx>\nline<$line>\nctx<$ctx>\nnext<$lines[$ctx_ln - 1]>\n";
+
+			if ($ctx !~ /{\s*/ && defined($lines[$ctx_ln - 1]) && $lines[$ctx_ln - 1] =~ /^\+\s*{/) {
+				ERROR("OPEN_BRACE",
+				      "that open brace { should be on the previous line\n" .
+					"$here\n$ctx\n$rawlines[$ctx_ln - 1]\n");
+			}
+			if ($level == 0 && $pre_ctx !~ /}\s*while\s*\($/ &&
+			    $ctx =~ /\)\s*\;\s*$/ &&
+			    defined $lines[$ctx_ln - 1])
+			{
+				my ($nlength, $nindent) = line_stats($lines[$ctx_ln - 1]);
+				if ($nindent > $indent) {
+					WARN("TRAILING_SEMICOLON",
+					     "trailing semicolon indicates no statements, indent implies otherwise\n" .
+						"$here\n$ctx\n$rawlines[$ctx_ln - 1]\n");
+				}
+			}
+		}
+
+# Check relative indent for conditionals and blocks.
+		if ($line =~ /\b(?:(?:if|while|for|(?:[a-z_]+|)for_each[a-z_]+)\s*\(|(?:do|else)\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
+			($stat, $cond, $line_nr_next, $remain_next, $off_next) =
+				ctx_statement_block($linenr, $realcnt, 0)
+					if (!defined $stat);
+			my ($s, $c) = ($stat, $cond);
+
+			substr($s, 0, length($c), '');
+
+			# remove inline comments
+			$s =~ s/$;/ /g;
+			$c =~ s/$;/ /g;
+
+			# Find out how long the conditional actually is.
+			my @newlines = ($c =~ /\n/gs);
+			my $cond_lines = 1 + $#newlines;
+
+			# Make sure we remove the line prefixes as we have
+			# none on the first line, and are going to readd them
+			# where necessary.
+			$s =~ s/\n./\n/gs;
+			while ($s =~ /\n\s+\\\n/) {
+				$cond_lines += $s =~ s/\n\s+\\\n/\n/g;
+			}
+
+			# We want to check the first line inside the block
+			# starting at the end of the conditional, so remove:
+			#  1) any blank line termination
+			#  2) any opening brace { on end of the line
+			#  3) any do (...) {
+			my $continuation = 0;
+			my $check = 0;
+			$s =~ s/^.*\bdo\b//;
+			$s =~ s/^\s*{//;
+			if ($s =~ s/^\s*\\//) {
+				$continuation = 1;
+			}
+			if ($s =~ s/^\s*?\n//) {
+				$check = 1;
+				$cond_lines++;
+			}
+
+			# Also ignore a loop construct at the end of a
+			# preprocessor statement.
+			if (($prevline =~ /^.\s*#\s*define\s/ ||
+			    $prevline =~ /\\\s*$/) && $continuation == 0) {
+				$check = 0;
+			}
+
+			my $cond_ptr = -1;
+			$continuation = 0;
+			while ($cond_ptr != $cond_lines) {
+				$cond_ptr = $cond_lines;
+
+				# If we see an #else/#elif then the code
+				# is not linear.
+				if ($s =~ /^\s*\#\s*(?:else|elif)/) {
+					$check = 0;
+				}
+
+				# Ignore:
+				#  1) blank lines, they should be at 0,
+				#  2) preprocessor lines, and
+				#  3) labels.
+				if ($continuation ||
+				    $s =~ /^\s*?\n/ ||
+				    $s =~ /^\s*#\s*?/ ||
+				    $s =~ /^\s*$Ident\s*:/) {
+					$continuation = ($s =~ /^.*?\\\n/) ? 1 : 0;
+					if ($s =~ s/^.*?\n//) {
+						$cond_lines++;
+					}
+				}
+			}
+
+			my (undef, $sindent) = line_stats("+" . $s);
+			my $stat_real = raw_line($linenr, $cond_lines);
+
+			# Check if either of these lines are modified, else
+			# this is not this patch's fault.
+			if (!defined($stat_real) ||
+			    $stat !~ /^\+/ && $stat_real !~ /^\+/) {
+				$check = 0;
+			}
+			if (defined($stat_real) && $cond_lines > 1) {
+				$stat_real = "[...]\n$stat_real";
+			}
+
+			#print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s> cond_lines<$cond_lines> stat_real<$stat_real> stat<$stat>\n";
+
+			if ($check && $s ne '' &&
+			    (($sindent % 8) != 0 ||
+			     ($sindent < $indent) ||
+			     ($sindent == $indent &&
+			      ($s !~ /^\s*(?:\}|\{|else\b)/)) ||
+			     ($sindent > $indent + 8))) {
+				WARN("SUSPECT_CODE_INDENT",
+				     "suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n");
+			}
+		}
+
+		# Track the 'values' across context and added lines.
+		my $opline = $line; $opline =~ s/^./ /;
+		my ($curr_values, $curr_vars) =
+				annotate_values($opline . "\n", $prev_values);
+		$curr_values = $prev_values . $curr_values;
+		if ($dbg_values) {
+			my $outline = $opline; $outline =~ s/\t/ /g;
+			print "$linenr > .$outline\n";
+			print "$linenr > $curr_values\n";
+			print "$linenr >  $curr_vars\n";
+		}
+		$prev_values = substr($curr_values, -1);
+
+#ignore lines not being added
+		next if ($line =~ /^[^\+]/);
+
+# check for dereferences that span multiple lines
+		if ($prevline =~ /^\+.*$Lval\s*(?:\.|->)\s*$/ &&
+		    $line =~ /^\+\s*(?!\#\s*(?!define\s+|if))\s*$Lval/) {
+			$prevline =~ /($Lval\s*(?:\.|->))\s*$/;
+			my $ref = $1;
+			$line =~ /^.\s*($Lval)/;
+			$ref .= $1;
+			$ref =~ s/\s//g;
+			WARN("MULTILINE_DEREFERENCE",
+			     "Avoid multiple line dereference - prefer '$ref'\n" . $hereprev);
+		}
+
+# check for declarations of signed or unsigned without int
+		while ($line =~ m{\b($Declare)\s*(?!char\b|short\b|int\b|long\b)\s*($Ident)?\s*[=,;\[\)\(]}g) {
+			my $type = $1;
+			my $var = $2;
+			$var = "" if (!defined $var);
+			if ($type =~ /^(?:(?:$Storage|$Inline|$Attribute)\s+)*((?:un)?signed)((?:\s*\*)*)\s*$/) {
+				my $sign = $1;
+				my $pointer = $2;
+
+				$pointer = "" if (!defined $pointer);
+
+				if (WARN("UNSPECIFIED_INT",
+					 "Prefer '" . trim($sign) . " int" . rtrim($pointer) . "' to bare use of '$sign" . rtrim($pointer) . "'\n" . $herecurr) &&
+				    $fix) {
+					my $decl = trim($sign) . " int ";
+					my $comp_pointer = $pointer;
+					$comp_pointer =~ s/\s//g;
+					$decl .= $comp_pointer;
+					$decl = rtrim($decl) if ($var eq "");
+					$fixed[$fixlinenr] =~ s@\b$sign\s*\Q$pointer\E\s*$var\b@$decl$var@;
+				}
+			}
+		}
+
+# TEST: allow direct testing of the type matcher.
+		if ($dbg_type) {
+			if ($line =~ /^.\s*$Declare\s*$/) {
+				ERROR("TEST_TYPE",
+				      "TEST: is type\n" . $herecurr);
+			} elsif ($dbg_type > 1 && $line =~ /^.+($Declare)/) {
+				ERROR("TEST_NOT_TYPE",
+				      "TEST: is not type ($1 is)\n". $herecurr);
+			}
+			next;
+		}
+# TEST: allow direct testing of the attribute matcher.
+		if ($dbg_attr) {
+			if ($line =~ /^.\s*$Modifier\s*$/) {
+				ERROR("TEST_ATTR",
+				      "TEST: is attr\n" . $herecurr);
+			} elsif ($dbg_attr > 1 && $line =~ /^.+($Modifier)/) {
+				ERROR("TEST_NOT_ATTR",
+				      "TEST: is not attr ($1 is)\n". $herecurr);
+			}
+			next;
+		}
+
+# check for initialisation to aggregates open brace on the next line
+		if ($line =~ /^.\s*{/ &&
+		    $prevline =~ /(?:^|[^=])=\s*$/) {
+			if (ERROR("OPEN_BRACE",
+				  "that open brace { should be on the previous line\n" . $hereprev) &&
+			    $fix && $prevline =~ /^\+/ && $line =~ /^\+/) {
+				fix_delete_line($fixlinenr - 1, $prevrawline);
+				fix_delete_line($fixlinenr, $rawline);
+				my $fixedline = $prevrawline;
+				$fixedline =~ s/\s*=\s*$/ = {/;
+				fix_insert_line($fixlinenr, $fixedline);
+				$fixedline = $line;
+				$fixedline =~ s/^(.\s*)\{\s*/$1/;
+				fix_insert_line($fixlinenr, $fixedline);
+			}
+		}
+
+#
+# Checks which are anchored on the added line.
+#
+
+# check for malformed paths in #include statements (uses RAW line)
+		if ($rawline =~ m{^.\s*\#\s*include\s+[<"](.*)[">]}) {
+			my $path = $1;
+			if ($path =~ m{//}) {
+				ERROR("MALFORMED_INCLUDE",
+				      "malformed #include filename\n" . $herecurr);
+			}
+			if ($path =~ "^uapi/" && $realfile =~ m@\binclude/uapi/@) {
+				ERROR("UAPI_INCLUDE",
+				      "No #include in ...include/uapi/... should use a uapi/ path prefix\n" . $herecurr);
+			}
+		}
+
+# no C99 // comments
+		if ($line =~ m{//}) {
+			if (ERROR("C99_COMMENTS",
+				  "do not use C99 // comments\n" . $herecurr) &&
+			    $fix) {
+				my $line = $fixed[$fixlinenr];
+				if ($line =~ /\/\/(.*)$/) {
+					my $comment = trim($1);
+					$fixed[$fixlinenr] =~ s@\/\/(.*)$@/\* $comment \*/@;
+				}
+			}
+		}
+		# Remove C99 comments.
+		$line =~ s@//.*@@;
+		$opline =~ s@//.*@@;
+
+# EXPORT_SYMBOL should immediately follow the thing it is exporting, consider
+# the whole statement.
+#print "APW <$lines[$realline_next - 1]>\n";
+		if (defined $realline_next &&
+		    exists $lines[$realline_next - 1] &&
+		    !defined $suppress_export{$realline_next} &&
+		    ($lines[$realline_next - 1] =~ /EXPORT_SYMBOL.*\((.*)\)/ ||
+		     $lines[$realline_next - 1] =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) {
+			# Handle definitions which produce identifiers with
+			# a prefix:
+			#   XXX(foo);
+			#   EXPORT_SYMBOL(something_foo);
+			my $name = $1;
+			if ($stat =~ /^(?:.\s*}\s*\n)?.([A-Z_]+)\s*\(\s*($Ident)/ &&
+			    $name =~ /^${Ident}_$2/) {
+#print "FOO C name<$name>\n";
+				$suppress_export{$realline_next} = 1;
+
+			} elsif ($stat !~ /(?:
+				\n.}\s*$|
+				^.DEFINE_$Ident\(\Q$name\E\)|
+				^.DECLARE_$Ident\(\Q$name\E\)|
+				^.LIST_HEAD\(\Q$name\E\)|
+				^.(?:$Storage\s+)?$Type\s*\(\s*\*\s*\Q$name\E\s*\)\s*\(|
+				\b\Q$name\E(?:\s+$Attribute)*\s*(?:;|=|\[|\()
+			    )/x) {
+#print "FOO A<$lines[$realline_next - 1]> stat<$stat> name<$name>\n";
+				$suppress_export{$realline_next} = 2;
+			} else {
+				$suppress_export{$realline_next} = 1;
+			}
+		}
+		if (!defined $suppress_export{$linenr} &&
+		    $prevline =~ /^.\s*$/ &&
+		    ($line =~ /EXPORT_SYMBOL.*\((.*)\)/ ||
+		     $line =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) {
+#print "FOO B <$lines[$linenr - 1]>\n";
+			$suppress_export{$linenr} = 2;
+		}
+		if (defined $suppress_export{$linenr} &&
+		    $suppress_export{$linenr} == 2) {
+			WARN("EXPORT_SYMBOL",
+			     "EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr);
+		}
+
+# check for global initialisers.
+		if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*($zero_initializer)\s*;/) {
+			if (ERROR("GLOBAL_INITIALISERS",
+				  "do not initialise globals to $1\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/(^.$Type\s*$Ident(?:\s+$Modifier)*)\s*=\s*$zero_initializer\s*;/$1;/;
+			}
+		}
+# check for static initialisers.
+		if ($line =~ /^\+.*\bstatic\s.*=\s*($zero_initializer)\s*;/) {
+			if (ERROR("INITIALISED_STATIC",
+				  "do not initialise statics to $1\n" .
+				      $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/(\bstatic\s.*?)\s*=\s*$zero_initializer\s*;/$1;/;
+			}
+		}
+
+# check for misordered declarations of char/short/int/long with signed/unsigned
+		while ($sline =~ m{(\b$TypeMisordered\b)}g) {
+			my $tmp = trim($1);
+			WARN("MISORDERED_TYPE",
+			     "type '$tmp' should be specified in [[un]signed] [short|int|long|long long] order\n" . $herecurr);
+		}
+
+# check for unnecessary <signed> int declarations of short/long/long long
+		while ($sline =~ m{\b($TypeMisordered(\s*\*)*|$C90_int_types)\b}g) {
+			my $type = trim($1);
+			next if ($type !~ /\bint\b/);
+			next if ($type !~ /\b(?:short|long\s+long|long)\b/);
+			my $new_type = $type;
+			$new_type =~ s/\b\s*int\s*\b/ /;
+			$new_type =~ s/\b\s*(?:un)?signed\b\s*/ /;
+			$new_type =~ s/^const\s+//;
+			$new_type = "unsigned $new_type" if ($type =~ /\bunsigned\b/);
+			$new_type = "const $new_type" if ($type =~ /^const\b/);
+			$new_type =~ s/\s+/ /g;
+			$new_type = trim($new_type);
+			if (WARN("UNNECESSARY_INT",
+				 "Prefer '$new_type' over '$type' as the int is unnecessary\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\b\Q$type\E\b/$new_type/;
+			}
+		}
+
+# check for static const char * arrays.
+		if ($line =~ /\bstatic\s+const\s+char\s*\*\s*(\w+)\s*\[\s*\]\s*=\s*/) {
+			WARN("STATIC_CONST_CHAR_ARRAY",
+			     "static const char * array should probably be static const char * const\n" .
+				$herecurr);
+		}
+
+# check for initialized const char arrays that should be static const
+		if ($line =~ /^\+\s*const\s+(char|unsigned\s+char|_*u8|(?:[us]_)?int8_t)\s+\w+\s*\[\s*(?:\w+\s*)?\]\s*=\s*"/) {
+			if (WARN("STATIC_CONST_CHAR_ARRAY",
+				 "const array should probably be static const\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/(^.\s*)const\b/${1}static const/;
+			}
+		}
+
+# check for static char foo[] = "bar" declarations.
+		if ($line =~ /\bstatic\s+char\s+(\w+)\s*\[\s*\]\s*=\s*"/) {
+			WARN("STATIC_CONST_CHAR_ARRAY",
+			     "static char array declaration should probably be static const char\n" .
+				$herecurr);
+		}
+
+# check for const <foo> const where <foo> is not a pointer or array type
+		if ($sline =~ /\bconst\s+($BasicType)\s+const\b/) {
+			my $found = $1;
+			if ($sline =~ /\bconst\s+\Q$found\E\s+const\b\s*\*/) {
+				WARN("CONST_CONST",
+				     "'const $found const *' should probably be 'const $found * const'\n" . $herecurr);
+			} elsif ($sline !~ /\bconst\s+\Q$found\E\s+const\s+\w+\s*\[/) {
+				WARN("CONST_CONST",
+				     "'const $found const' should probably be 'const $found'\n" . $herecurr);
+			}
+		}
+
+# check for non-global char *foo[] = {"bar", ...} declarations.
+		if ($line =~ /^.\s+(?:static\s+|const\s+)?char\s+\*\s*\w+\s*\[\s*\]\s*=\s*\{/) {
+			WARN("STATIC_CONST_CHAR_ARRAY",
+			     "char * array declaration might be better as static const\n" .
+				$herecurr);
+               }
+
+# check for sizeof(foo)/sizeof(foo[0]) that could be ARRAY_SIZE(foo)
+		if ($line =~ m@\bsizeof\s*\(\s*($Lval)\s*\)@) {
+			my $array = $1;
+			if ($line =~ m@\b(sizeof\s*\(\s*\Q$array\E\s*\)\s*/\s*sizeof\s*\(\s*\Q$array\E\s*\[\s*0\s*\]\s*\))@) {
+				my $array_div = $1;
+				if (WARN("ARRAY_SIZE",
+					 "Prefer ARRAY_SIZE($array)\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/\Q$array_div\E/ARRAY_SIZE($array)/;
+				}
+			}
+		}
+
+# check for function declarations without arguments like "int foo()"
+		if ($line =~ /(\b$Type\s+$Ident)\s*\(\s*\)/) {
+			if (ERROR("FUNCTION_WITHOUT_ARGS",
+				  "Bad function definition - $1() should probably be $1(void)\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/(\b($Type)\s+($Ident))\s*\(\s*\)/$2 $3(void)/;
+			}
+		}
+
+# check for new typedefs, only function parameters and sparse annotations
+# make sense.
+		if ($line =~ /\btypedef\s/ &&
+		    $line !~ /\btypedef\s+$Type\s*\(\s*\*?$Ident\s*\)\s*\(/ &&
+		    $line !~ /\btypedef\s+$Type\s+$Ident\s*\(/ &&
+		    $line !~ /\b$typeTypedefs\b/ &&
+		    $line !~ /\b__bitwise\b/) {
+			WARN("NEW_TYPEDEFS",
+			     "do not add new typedefs\n" . $herecurr);
+		}
+
+# * goes on variable not on type
+		# (char*[ const])
+		while ($line =~ m{(\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\))}g) {
+			#print "AA<$1>\n";
+			my ($ident, $from, $to) = ($1, $2, $2);
+
+			# Should start with a space.
+			$to =~ s/^(\S)/ $1/;
+			# Should not end with a space.
+			$to =~ s/\s+$//;
+			# '*'s should not have spaces between.
+			while ($to =~ s/\*\s+\*/\*\*/) {
+			}
+
+##			print "1: from<$from> to<$to> ident<$ident>\n";
+			if ($from ne $to) {
+				if (ERROR("POINTER_LOCATION",
+					  "\"(foo$from)\" should be \"(foo$to)\"\n" .  $herecurr) &&
+				    $fix) {
+					my $sub_from = $ident;
+					my $sub_to = $ident;
+					$sub_to =~ s/\Q$from\E/$to/;
+					$fixed[$fixlinenr] =~
+					    s@\Q$sub_from\E@$sub_to@;
+				}
+			}
+		}
+		while ($line =~ m{(\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident))}g) {
+			#print "BB<$1>\n";
+			my ($match, $from, $to, $ident) = ($1, $2, $2, $3);
+
+			# Should start with a space.
+			$to =~ s/^(\S)/ $1/;
+			# Should not end with a space.
+			$to =~ s/\s+$//;
+			# '*'s should not have spaces between.
+			while ($to =~ s/\*\s+\*/\*\*/) {
+			}
+			# Modifiers should have spaces.
+			$to =~ s/(\b$Modifier$)/$1 /;
+
+##			print "2: from<$from> to<$to> ident<$ident>\n";
+			if ($from ne $to && $ident !~ /^$Modifier$/) {
+				if (ERROR("POINTER_LOCATION",
+					  "\"foo${from}bar\" should be \"foo${to}bar\"\n" .  $herecurr) &&
+				    $fix) {
+
+					my $sub_from = $match;
+					my $sub_to = $match;
+					$sub_to =~ s/\Q$from\E/$to/;
+					$fixed[$fixlinenr] =~
+					    s@\Q$sub_from\E@$sub_to@;
+				}
+			}
+		}
+
+# avoid BUG() or BUG_ON()
+		if ($line =~ /\b(?:BUG|BUG_ON)\b/) {
+			my $msg_level = \&WARN;
+			$msg_level = \&CHK if ($file);
+			&{$msg_level}("AVOID_BUG",
+				      "Avoid crashing the kernel - try using WARN_ON & recovery code rather than BUG() or BUG_ON()\n" . $herecurr);
+		}
+
+# avoid LINUX_VERSION_CODE
+		if ($line =~ /\bLINUX_VERSION_CODE\b/) {
+			WARN("LINUX_VERSION_CODE",
+			     "LINUX_VERSION_CODE should be avoided, code should be for the version to which it is merged\n" . $herecurr);
+		}
+
+# check for uses of printk_ratelimit
+		if ($line =~ /\bprintk_ratelimit\s*\(/) {
+			WARN("PRINTK_RATELIMITED",
+			     "Prefer printk_ratelimited or pr_<level>_ratelimited to printk_ratelimit\n" . $herecurr);
+		}
+
+# printk should use KERN_* levels
+		if ($line =~ /\bprintk\s*\(\s*(?!KERN_[A-Z]+\b)/) {
+			WARN("PRINTK_WITHOUT_KERN_LEVEL",
+			     "printk() should include KERN_<LEVEL> facility level\n" . $herecurr);
+		}
+
+		if ($line =~ /\bprintk\s*\(\s*KERN_([A-Z]+)/) {
+			my $orig = $1;
+			my $level = lc($orig);
+			$level = "warn" if ($level eq "warning");
+			my $level2 = $level;
+			$level2 = "dbg" if ($level eq "debug");
+			WARN("PREFER_PR_LEVEL",
+			     "Prefer [subsystem eg: netdev]_$level2([subsystem]dev, ... then dev_$level2(dev, ... then pr_$level(...  to printk(KERN_$orig ...\n" . $herecurr);
+		}
+
+		if ($line =~ /\bpr_warning\s*\(/) {
+			if (WARN("PREFER_PR_LEVEL",
+				 "Prefer pr_warn(... to pr_warning(...\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/\bpr_warning\b/pr_warn/;
+			}
+		}
+
+		if ($line =~ /\bdev_printk\s*\(\s*KERN_([A-Z]+)/) {
+			my $orig = $1;
+			my $level = lc($orig);
+			$level = "warn" if ($level eq "warning");
+			$level = "dbg" if ($level eq "debug");
+			WARN("PREFER_DEV_LEVEL",
+			     "Prefer dev_$level(... to dev_printk(KERN_$orig, ...\n" . $herecurr);
+		}
+
+# ENOSYS means "bad syscall nr" and nothing else.  This will have a small
+# number of false positives, but assembly files are not checked, so at
+# least the arch entry code will not trigger this warning.
+		if ($line =~ /\bENOSYS\b/) {
+			WARN("ENOSYS",
+			     "ENOSYS means 'invalid syscall nr' and nothing else\n" . $herecurr);
+		}
+
+# function brace can't be on same line, except for #defines of do while,
+# or if closed on same line
+		if ($perl_version_ok &&
+		    $sline =~ /$Type\s*$Ident\s*$balanced_parens\s*\{/ &&
+		    $sline !~ /\#\s*define\b.*do\s*\{/ &&
+		    $sline !~ /}/) {
+			if (ERROR("OPEN_BRACE",
+				  "open brace '{' following function definitions go on the next line\n" . $herecurr) &&
+			    $fix) {
+				fix_delete_line($fixlinenr, $rawline);
+				my $fixed_line = $rawline;
+				$fixed_line =~ /(^..*$Type\s*$Ident\(.*\)\s*){(.*)$/;
+				my $line1 = $1;
+				my $line2 = $2;
+				fix_insert_line($fixlinenr, ltrim($line1));
+				fix_insert_line($fixlinenr, "\+{");
+				if ($line2 !~ /^\s*$/) {
+					fix_insert_line($fixlinenr, "\+\t" . trim($line2));
+				}
+			}
+		}
+
+# open braces for enum, union and struct go on the same line.
+		if ($line =~ /^.\s*{/ &&
+		    $prevline =~ /^.\s*(?:typedef\s+)?(enum|union|struct)(?:\s+$Ident)?\s*$/) {
+			if (ERROR("OPEN_BRACE",
+				  "open brace '{' following $1 go on the same line\n" . $hereprev) &&
+			    $fix && $prevline =~ /^\+/ && $line =~ /^\+/) {
+				fix_delete_line($fixlinenr - 1, $prevrawline);
+				fix_delete_line($fixlinenr, $rawline);
+				my $fixedline = rtrim($prevrawline) . " {";
+				fix_insert_line($fixlinenr, $fixedline);
+				$fixedline = $rawline;
+				$fixedline =~ s/^(.\s*)\{\s*/$1\t/;
+				if ($fixedline !~ /^\+\s*$/) {
+					fix_insert_line($fixlinenr, $fixedline);
+				}
+			}
+		}
+
+# missing space after union, struct or enum definition
+		if ($line =~ /^.\s*(?:typedef\s+)?(enum|union|struct)(?:\s+$Ident){1,2}[=\{]/) {
+			if (WARN("SPACING",
+				 "missing space after $1 definition\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/^(.\s*(?:typedef\s+)?(?:enum|union|struct)(?:\s+$Ident){1,2})([=\{])/$1 $2/;
+			}
+		}
+
+# Function pointer declarations
+# check spacing between type, funcptr, and args
+# canonical declaration is "type (*funcptr)(args...)"
+		if ($line =~ /^.\s*($Declare)\((\s*)\*(\s*)($Ident)(\s*)\)(\s*)\(/) {
+			my $declare = $1;
+			my $pre_pointer_space = $2;
+			my $post_pointer_space = $3;
+			my $funcname = $4;
+			my $post_funcname_space = $5;
+			my $pre_args_space = $6;
+
+# the $Declare variable will capture all spaces after the type
+# so check it for a missing trailing missing space but pointer return types
+# don't need a space so don't warn for those.
+			my $post_declare_space = "";
+			if ($declare =~ /(\s+)$/) {
+				$post_declare_space = $1;
+				$declare = rtrim($declare);
+			}
+			if ($declare !~ /\*$/ && $post_declare_space =~ /^$/) {
+				WARN("SPACING",
+				     "missing space after return type\n" . $herecurr);
+				$post_declare_space = " ";
+			}
+
+# unnecessary space "type  (*funcptr)(args...)"
+# This test is not currently implemented because these declarations are
+# equivalent to
+#	int  foo(int bar, ...)
+# and this is form shouldn't/doesn't generate a checkpatch warning.
+#
+#			elsif ($declare =~ /\s{2,}$/) {
+#				WARN("SPACING",
+#				     "Multiple spaces after return type\n" . $herecurr);
+#			}
+
+# unnecessary space "type ( *funcptr)(args...)"
+			if (defined $pre_pointer_space &&
+			    $pre_pointer_space =~ /^\s/) {
+				WARN("SPACING",
+				     "Unnecessary space after function pointer open parenthesis\n" . $herecurr);
+			}
+
+# unnecessary space "type (* funcptr)(args...)"
+			if (defined $post_pointer_space &&
+			    $post_pointer_space =~ /^\s/) {
+				WARN("SPACING",
+				     "Unnecessary space before function pointer name\n" . $herecurr);
+			}
+
+# unnecessary space "type (*funcptr )(args...)"
+			if (defined $post_funcname_space &&
+			    $post_funcname_space =~ /^\s/) {
+				WARN("SPACING",
+				     "Unnecessary space after function pointer name\n" . $herecurr);
+			}
+
+# unnecessary space "type (*funcptr) (args...)"
+			if (defined $pre_args_space &&
+			    $pre_args_space =~ /^\s/) {
+				WARN("SPACING",
+				     "Unnecessary space before function pointer arguments\n" . $herecurr);
+			}
+
+			if (show_type("SPACING") && $fix) {
+				$fixed[$fixlinenr] =~
+				    s/^(.\s*)$Declare\s*\(\s*\*\s*$Ident\s*\)\s*\(/$1 . $declare . $post_declare_space . '(*' . $funcname . ')('/ex;
+			}
+		}
+
+# check for spacing round square brackets; allowed:
+#  1. with a type on the left -- int [] a;
+#  2. at the beginning of a line for slice initialisers -- [0...10] = 5,
+#  3. inside a curly brace -- = { [0...10] = 5 }
+		while ($line =~ /(.*?\s)\[/g) {
+			my ($where, $prefix) = ($-[1], $1);
+			if ($prefix !~ /$Type\s+$/ &&
+			    ($where != 0 || $prefix !~ /^.\s+$/) &&
+			    $prefix !~ /[{,:]\s+$/) {
+				if (ERROR("BRACKET_SPACE",
+					  "space prohibited before open square bracket '['\n" . $herecurr) &&
+				    $fix) {
+				    $fixed[$fixlinenr] =~
+					s/^(\+.*?)\s+\[/$1\[/;
+				}
+			}
+		}
+
+# check for spaces between functions and their parentheses.
+		while ($line =~ /($Ident)\s+\(/g) {
+			my $name = $1;
+			my $ctx_before = substr($line, 0, $-[1]);
+			my $ctx = "$ctx_before$name";
+
+			# Ignore those directives where spaces _are_ permitted.
+			if ($name =~ /^(?:
+				if|for|while|switch|return|case|
+				volatile|__volatile__|
+				__attribute__|format|__extension__|
+				asm|__asm__)$/x)
+			{
+			# cpp #define statements have non-optional spaces, ie
+			# if there is a space between the name and the open
+			# parenthesis it is simply not a parameter group.
+			} elsif ($ctx_before =~ /^.\s*\#\s*define\s*$/) {
+
+			# cpp #elif statement condition may start with a (
+			} elsif ($ctx =~ /^.\s*\#\s*elif\s*$/) {
+
+			# If this whole things ends with a type its most
+			# likely a typedef for a function.
+			} elsif ($ctx =~ /$Type$/) {
+
+			} else {
+				if (WARN("SPACING",
+					 "space prohibited between function name and open parenthesis '('\n" . $herecurr) &&
+					     $fix) {
+					$fixed[$fixlinenr] =~
+					    s/\b$name\s+\(/$name\(/;
+				}
+			}
+		}
+
+# Check operator spacing.
+		if (!($line=~/\#\s*include/)) {
+			my $fixed_line = "";
+			my $line_fixed = 0;
+
+			my $ops = qr{
+				<<=|>>=|<=|>=|==|!=|
+				\+=|-=|\*=|\/=|%=|\^=|\|=|&=|
+				=>|->|<<|>>|<|>|=|!|~|
+				&&|\|\||,|\^|\+\+|--|&|\||\+|-|\*|\/|%|
+				\?:|\?|:
+			}x;
+			my @elements = split(/($ops|;)/, $opline);
+
+##			print("element count: <" . $#elements . ">\n");
+##			foreach my $el (@elements) {
+##				print("el: <$el>\n");
+##			}
+
+			my @fix_elements = ();
+			my $off = 0;
+
+			foreach my $el (@elements) {
+				push(@fix_elements, substr($rawline, $off, length($el)));
+				$off += length($el);
+			}
+
+			$off = 0;
+
+			my $blank = copy_spacing($opline);
+			my $last_after = -1;
+
+			for (my $n = 0; $n < $#elements; $n += 2) {
+
+				my $good = $fix_elements[$n] . $fix_elements[$n + 1];
+
+##				print("n: <$n> good: <$good>\n");
+
+				$off += length($elements[$n]);
+
+				# Pick up the preceding and succeeding characters.
+				my $ca = substr($opline, 0, $off);
+				my $cc = '';
+				if (length($opline) >= ($off + length($elements[$n + 1]))) {
+					$cc = substr($opline, $off + length($elements[$n + 1]));
+				}
+				my $cb = "$ca$;$cc";
+
+				my $a = '';
+				$a = 'V' if ($elements[$n] ne '');
+				$a = 'W' if ($elements[$n] =~ /\s$/);
+				$a = 'C' if ($elements[$n] =~ /$;$/);
+				$a = 'B' if ($elements[$n] =~ /(\[|\()$/);
+				$a = 'O' if ($elements[$n] eq '');
+				$a = 'E' if ($ca =~ /^\s*$/);
+
+				my $op = $elements[$n + 1];
+
+				my $c = '';
+				if (defined $elements[$n + 2]) {
+					$c = 'V' if ($elements[$n + 2] ne '');
+					$c = 'W' if ($elements[$n + 2] =~ /^\s/);
+					$c = 'C' if ($elements[$n + 2] =~ /^$;/);
+					$c = 'B' if ($elements[$n + 2] =~ /^(\)|\]|;)/);
+					$c = 'O' if ($elements[$n + 2] eq '');
+					$c = 'E' if ($elements[$n + 2] =~ /^\s*\\$/);
+				} else {
+					$c = 'E';
+				}
+
+				my $ctx = "${a}x${c}";
+
+				my $at = "(ctx:$ctx)";
+
+				my $ptr = substr($blank, 0, $off) . "^";
+				my $hereptr = "$hereline$ptr\n";
+
+				# Pull out the value of this operator.
+				my $op_type = substr($curr_values, $off + 1, 1);
+
+				# Get the full operator variant.
+				my $opv = $op . substr($curr_vars, $off, 1);
+
+				# Ignore operators passed as parameters.
+				if ($op_type ne 'V' &&
+				    $ca =~ /\s$/ && $cc =~ /^\s*[,\)]/) {
+
+#				# Ignore comments
+#				} elsif ($op =~ /^$;+$/) {
+
+				# ; should have either the end of line or a space or \ after it
+				} elsif ($op eq ';') {
+					if ($ctx !~ /.x[WEBC]/ &&
+					    $cc !~ /^\\/ && $cc !~ /^;/) {
+						if (ERROR("SPACING",
+							  "space required after that '$op' $at\n" . $hereptr)) {
+							$good = $fix_elements[$n] . trim($fix_elements[$n + 1]) . " ";
+							$line_fixed = 1;
+						}
+					}
+
+				# // is a comment
+				} elsif ($op eq '//') {
+
+				#   :   when part of a bitfield
+				} elsif ($opv eq ':B') {
+					# skip the bitfield test for now
+
+				# No spaces for:
+				#   ->
+				} elsif ($op eq '->') {
+					if ($ctx =~ /Wx.|.xW/) {
+						if (ERROR("SPACING",
+							  "spaces prohibited around that '$op' $at\n" . $hereptr)) {
+							$good = rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+							if (defined $fix_elements[$n + 2]) {
+								$fix_elements[$n + 2] =~ s/^\s+//;
+							}
+							$line_fixed = 1;
+						}
+					}
+
+				# , must not have a space before and must have a space on the right.
+				} elsif ($op eq ',') {
+					my $rtrim_before = 0;
+					my $space_after = 0;
+					if ($ctx =~ /Wx./) {
+						if (ERROR("SPACING",
+							  "space prohibited before that '$op' $at\n" . $hereptr)) {
+							$line_fixed = 1;
+							$rtrim_before = 1;
+						}
+					}
+					if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/) {
+						if (ERROR("SPACING",
+							  "space required after that '$op' $at\n" . $hereptr)) {
+							$line_fixed = 1;
+							$last_after = $n;
+							$space_after = 1;
+						}
+					}
+					if ($rtrim_before || $space_after) {
+						if ($rtrim_before) {
+							$good = rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+						} else {
+							$good = $fix_elements[$n] . trim($fix_elements[$n + 1]);
+						}
+						if ($space_after) {
+							$good .= " ";
+						}
+					}
+
+				# '*' as part of a type definition -- reported already.
+				} elsif ($opv eq '*_') {
+					#warn "'*' is part of type\n";
+
+				# unary operators should have a space before and
+				# none after.  May be left adjacent to another
+				# unary operator, or a cast
+				} elsif ($op eq '!' || $op eq '~' ||
+					 $opv eq '*U' || $opv eq '-U' ||
+					 $opv eq '&U' || $opv eq '&&U') {
+					if ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) {
+						if (ERROR("SPACING",
+							  "space required before that '$op' $at\n" . $hereptr)) {
+							if ($n != $last_after + 2) {
+								$good = $fix_elements[$n] . " " . ltrim($fix_elements[$n + 1]);
+								$line_fixed = 1;
+							}
+						}
+					}
+					if ($op eq '*' && $cc =~/\s*$Modifier\b/) {
+						# A unary '*' may be const
+
+					} elsif ($ctx =~ /.xW/) {
+						if (ERROR("SPACING",
+							  "space prohibited after that '$op' $at\n" . $hereptr)) {
+							$good = $fix_elements[$n] . rtrim($fix_elements[$n + 1]);
+							if (defined $fix_elements[$n + 2]) {
+								$fix_elements[$n + 2] =~ s/^\s+//;
+							}
+							$line_fixed = 1;
+						}
+					}
+
+				# unary ++ and unary -- are allowed no space on one side.
+				} elsif ($op eq '++' or $op eq '--') {
+					if ($ctx !~ /[WEOBC]x[^W]/ && $ctx !~ /[^W]x[WOBEC]/) {
+						if (ERROR("SPACING",
+							  "space required one side of that '$op' $at\n" . $hereptr)) {
+							$good = $fix_elements[$n] . trim($fix_elements[$n + 1]) . " ";
+							$line_fixed = 1;
+						}
+					}
+					if ($ctx =~ /Wx[BE]/ ||
+					    ($ctx =~ /Wx./ && $cc =~ /^;/)) {
+						if (ERROR("SPACING",
+							  "space prohibited before that '$op' $at\n" . $hereptr)) {
+							$good = rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+							$line_fixed = 1;
+						}
+					}
+					if ($ctx =~ /ExW/) {
+						if (ERROR("SPACING",
+							  "space prohibited after that '$op' $at\n" . $hereptr)) {
+							$good = $fix_elements[$n] . trim($fix_elements[$n + 1]);
+							if (defined $fix_elements[$n + 2]) {
+								$fix_elements[$n + 2] =~ s/^\s+//;
+							}
+							$line_fixed = 1;
+						}
+					}
+
+				# << and >> may either have or not have spaces both sides
+				} elsif ($op eq '<<' or $op eq '>>' or
+					 $op eq '&' or $op eq '^' or $op eq '|' or
+					 $op eq '+' or $op eq '-' or
+					 $op eq '*' or $op eq '/' or
+					 $op eq '%')
+				{
+					if ($check) {
+						if (defined $fix_elements[$n + 2] && $ctx !~ /[EW]x[EW]/) {
+							if (CHK("SPACING",
+								"spaces preferred around that '$op' $at\n" . $hereptr)) {
+								$good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
+								$fix_elements[$n + 2] =~ s/^\s+//;
+								$line_fixed = 1;
+							}
+						} elsif (!defined $fix_elements[$n + 2] && $ctx !~ /Wx[OE]/) {
+							if (CHK("SPACING",
+								"space preferred before that '$op' $at\n" . $hereptr)) {
+								$good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]);
+								$line_fixed = 1;
+							}
+						}
+					} elsif ($ctx =~ /Wx[^WCE]|[^WCE]xW/) {
+						if (ERROR("SPACING",
+							  "need consistent spacing around '$op' $at\n" . $hereptr)) {
+							$good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
+							if (defined $fix_elements[$n + 2]) {
+								$fix_elements[$n + 2] =~ s/^\s+//;
+							}
+							$line_fixed = 1;
+						}
+					}
+
+				# A colon needs no spaces before when it is
+				# terminating a case value or a label.
+				} elsif ($opv eq ':C' || $opv eq ':L') {
+					if ($ctx =~ /Wx./) {
+						if (ERROR("SPACING",
+							  "space prohibited before that '$op' $at\n" . $hereptr)) {
+							$good = rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+							$line_fixed = 1;
+						}
+					}
+
+				# All the others need spaces both sides.
+				} elsif ($ctx !~ /[EWC]x[CWE]/) {
+					my $ok = 0;
+
+					# Ignore email addresses <foo@bar>
+					if (($op eq '<' &&
+					     $cc =~ /^\S+\@\S+>/) ||
+					    ($op eq '>' &&
+					     $ca =~ /<\S+\@\S+$/))
+					{
+					    	$ok = 1;
+					}
+
+					# for asm volatile statements
+					# ignore a colon with another
+					# colon immediately before or after
+					if (($op eq ':') &&
+					    ($ca =~ /:$/ || $cc =~ /^:/)) {
+						$ok = 1;
+					}
+
+					# messages are ERROR, but ?: are CHK
+					if ($ok == 0) {
+						my $msg_level = \&ERROR;
+						$msg_level = \&CHK if (($op eq '?:' || $op eq '?' || $op eq ':') && $ctx =~ /VxV/);
+
+						if (&{$msg_level}("SPACING",
+								  "spaces required around that '$op' $at\n" . $hereptr)) {
+							$good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
+							if (defined $fix_elements[$n + 2]) {
+								$fix_elements[$n + 2] =~ s/^\s+//;
+							}
+							$line_fixed = 1;
+						}
+					}
+				}
+				$off += length($elements[$n + 1]);
+
+##				print("n: <$n> GOOD: <$good>\n");
+
+				$fixed_line = $fixed_line . $good;
+			}
+
+			if (($#elements % 2) == 0) {
+				$fixed_line = $fixed_line . $fix_elements[$#elements];
+			}
+
+			if ($fix && $line_fixed && $fixed_line ne $fixed[$fixlinenr]) {
+				$fixed[$fixlinenr] = $fixed_line;
+			}
+
+
+		}
+
+# check for whitespace before a non-naked semicolon
+		if ($line =~ /^\+.*\S\s+;\s*$/) {
+			if (WARN("SPACING",
+				 "space prohibited before semicolon\n" . $herecurr) &&
+			    $fix) {
+				1 while $fixed[$fixlinenr] =~
+				    s/^(\+.*\S)\s+;/$1;/;
+			}
+		}
+
+# check for multiple assignments
+		if ($line =~ /^.\s*$Lval\s*=\s*$Lval\s*=(?!=)/) {
+			CHK("MULTIPLE_ASSIGNMENTS",
+			    "multiple assignments should be avoided\n" . $herecurr);
+		}
+
+## # check for multiple declarations, allowing for a function declaration
+## # continuation.
+## 		if ($line =~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Ident.*/ &&
+## 		    $line !~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Type\s*$Ident.*/) {
+##
+## 			# Remove any bracketed sections to ensure we do not
+## 			# falsly report the parameters of functions.
+## 			my $ln = $line;
+## 			while ($ln =~ s/\([^\(\)]*\)//g) {
+## 			}
+## 			if ($ln =~ /,/) {
+## 				WARN("MULTIPLE_DECLARATION",
+##				     "declaring multiple variables together should be avoided\n" . $herecurr);
+## 			}
+## 		}
+
+#need space before brace following if, while, etc
+		if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
+		    $line =~ /\b(?:else|do)\{/) {
+			if (ERROR("SPACING",
+				  "space required before the open brace '{'\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/^(\+.*(?:do|else|\)))\{/$1 {/;
+			}
+		}
+
+## # check for blank lines before declarations
+##		if ($line =~ /^.\t+$Type\s+$Ident(?:\s*=.*)?;/ &&
+##		    $prevrawline =~ /^.\s*$/) {
+##			WARN("SPACING",
+##			     "No blank lines before declarations\n" . $hereprev);
+##		}
+##
+
+# closing brace should have a space following it when it has anything
+# on the line
+		if ($line =~ /}(?!(?:,|;|\)|\}))\S/) {
+			if (ERROR("SPACING",
+				  "space required after that close brace '}'\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/}((?!(?:,|;|\)))\S)/} $1/;
+			}
+		}
+
+# check spacing on square brackets
+		if ($line =~ /\[\s/ && $line !~ /\[\s*$/) {
+			if (ERROR("SPACING",
+				  "space prohibited after that open square bracket '['\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/\[\s+/\[/;
+			}
+		}
+		if ($line =~ /\s\]/) {
+			if (ERROR("SPACING",
+				  "space prohibited before that close square bracket ']'\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/\s+\]/\]/;
+			}
+		}
+
+# check spacing on parentheses
+		if ($line =~ /\(\s/ && $line !~ /\(\s*(?:\\)?$/ &&
+		    $line !~ /for\s*\(\s+;/) {
+			if (ERROR("SPACING",
+				  "space prohibited after that open parenthesis '('\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/\(\s+/\(/;
+			}
+		}
+		if ($line =~ /(\s+)\)/ && $line !~ /^.\s*\)/ &&
+		    $line !~ /for\s*\(.*;\s+\)/ &&
+		    $line !~ /:\s+\)/) {
+			if (ERROR("SPACING",
+				  "space prohibited before that close parenthesis ')'\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/\s+\)/\)/;
+			}
+		}
+
+# check unnecessary parentheses around addressof/dereference single $Lvals
+# ie: &(foo->bar) should be &foo->bar and *(foo->bar) should be *foo->bar
+
+		while ($line =~ /(?:[^&]&\s*|\*)\(\s*($Ident\s*(?:$Member\s*)+)\s*\)/g) {
+			my $var = $1;
+			if (CHK("UNNECESSARY_PARENTHESES",
+				"Unnecessary parentheses around $var\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\(\s*\Q$var\E\s*\)/$var/;
+			}
+		}
+
+# check for unnecessary parentheses around function pointer uses
+# ie: (foo->bar)(); should be foo->bar();
+# but not "if (foo->bar) (" to avoid some false positives
+		if ($line =~ /(\bif\s*|)(\(\s*$Ident\s*(?:$Member\s*)+\))[ \t]*\(/ && $1 !~ /^if/) {
+			my $var = $2;
+			if (CHK("UNNECESSARY_PARENTHESES",
+				"Unnecessary parentheses around function pointer $var\n" . $herecurr) &&
+			    $fix) {
+				my $var2 = deparenthesize($var);
+				$var2 =~ s/\s//g;
+				$fixed[$fixlinenr] =~ s/\Q$var\E/$var2/;
+			}
+		}
+
+# check for unnecessary parentheses around comparisons in if uses
+# when !drivers/staging or command-line uses --strict
+		if (($realfile !~ m@^(?:drivers/staging/)@ || $check_orig) &&
+		    $perl_version_ok && defined($stat) &&
+		    $stat =~ /(^.\s*if\s*($balanced_parens))/) {
+			my $if_stat = $1;
+			my $test = substr($2, 1, -1);
+			my $herectx;
+			while ($test =~ /(?:^|[^\w\&\!\~])+\s*\(\s*([\&\!\~]?\s*$Lval\s*(?:$Compare\s*$FuncArg)?)\s*\)/g) {
+				my $match = $1;
+				# avoid parentheses around potential macro args
+				next if ($match =~ /^\s*\w+\s*$/);
+				if (!defined($herectx)) {
+					$herectx = $here . "\n";
+					my $cnt = statement_rawlines($if_stat);
+					for (my $n = 0; $n < $cnt; $n++) {
+						my $rl = raw_line($linenr, $n);
+						$herectx .=  $rl . "\n";
+						last if $rl =~ /^[ \+].*\{/;
+					}
+				}
+				CHK("UNNECESSARY_PARENTHESES",
+				    "Unnecessary parentheses around '$match'\n" . $herectx);
+			}
+		}
+
+#goto labels aren't indented, allow a single space however
+		if ($line=~/^.\s+[A-Za-z\d_]+:(?![0-9]+)/ and
+		   !($line=~/^. [A-Za-z\d_]+:/) and !($line=~/^.\s+default:/)) {
+			if (WARN("INDENTED_LABEL",
+				 "labels should not be indented\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/^(.)\s+/$1/;
+			}
+		}
+
+# return is not a function
+		if (defined($stat) && $stat =~ /^.\s*return(\s*)\(/s) {
+			my $spacing = $1;
+			if ($perl_version_ok &&
+			    $stat =~ /^.\s*return\s*($balanced_parens)\s*;\s*$/) {
+				my $value = $1;
+				$value = deparenthesize($value);
+				if ($value =~ m/^\s*$FuncArg\s*(?:\?|$)/) {
+					ERROR("RETURN_PARENTHESES",
+					      "return is not a function, parentheses are not required\n" . $herecurr);
+				}
+			} elsif ($spacing !~ /\s+/) {
+				ERROR("SPACING",
+				      "space required before the open parenthesis '('\n" . $herecurr);
+			}
+		}
+
+# unnecessary return in a void function
+# at end-of-function, with the previous line a single leading tab, then return;
+# and the line before that not a goto label target like "out:"
+		if ($sline =~ /^[ \+]}\s*$/ &&
+		    $prevline =~ /^\+\treturn\s*;\s*$/ &&
+		    $linenr >= 3 &&
+		    $lines[$linenr - 3] =~ /^[ +]/ &&
+		    $lines[$linenr - 3] !~ /^[ +]\s*$Ident\s*:/) {
+			WARN("RETURN_VOID",
+			     "void function return statements are not generally useful\n" . $hereprev);
+               }
+
+# if statements using unnecessary parentheses - ie: if ((foo == bar))
+		if ($perl_version_ok &&
+		    $line =~ /\bif\s*((?:\(\s*){2,})/) {
+			my $openparens = $1;
+			my $count = $openparens =~ tr@\(@\(@;
+			my $msg = "";
+			if ($line =~ /\bif\s*(?:\(\s*){$count,$count}$LvalOrFunc\s*($Compare)\s*$LvalOrFunc(?:\s*\)){$count,$count}/) {
+				my $comp = $4;	#Not $1 because of $LvalOrFunc
+				$msg = " - maybe == should be = ?" if ($comp eq "==");
+				WARN("UNNECESSARY_PARENTHESES",
+				     "Unnecessary parentheses$msg\n" . $herecurr);
+			}
+		}
+
+# comparisons with a constant or upper case identifier on the left
+#	avoid cases like "foo + BAR < baz"
+#	only fix matches surrounded by parentheses to avoid incorrect
+#	conversions like "FOO < baz() + 5" being "misfixed" to "baz() > FOO + 5"
+		if ($perl_version_ok &&
+		    $line =~ /^\+(.*)\b($Constant|[A-Z_][A-Z0-9_]*)\s*($Compare)\s*($LvalOrFunc)/) {
+			my $lead = $1;
+			my $const = $2;
+			my $comp = $3;
+			my $to = $4;
+			my $newcomp = $comp;
+			if ($lead !~ /(?:$Operators|\.)\s*$/ &&
+			    $to !~ /^(?:Constant|[A-Z_][A-Z0-9_]*)$/ &&
+			    WARN("CONSTANT_COMPARISON",
+				 "Comparisons should place the constant on the right side of the test\n" . $herecurr) &&
+			    $fix) {
+				if ($comp eq "<") {
+					$newcomp = ">";
+				} elsif ($comp eq "<=") {
+					$newcomp = ">=";
+				} elsif ($comp eq ">") {
+					$newcomp = "<";
+				} elsif ($comp eq ">=") {
+					$newcomp = "<=";
+				}
+				$fixed[$fixlinenr] =~ s/\(\s*\Q$const\E\s*$Compare\s*\Q$to\E\s*\)/($to $newcomp $const)/;
+			}
+		}
+
+# Return of what appears to be an errno should normally be negative
+		if ($sline =~ /\breturn(?:\s*\(+\s*|\s+)(E[A-Z]+)(?:\s*\)+\s*|\s*)[;:,]/) {
+			my $name = $1;
+			if ($name ne 'EOF' && $name ne 'ERROR') {
+				WARN("USE_NEGATIVE_ERRNO",
+				     "return of an errno should typically be negative (ie: return -$1)\n" . $herecurr);
+			}
+		}
+
+# Need a space before open parenthesis after if, while etc
+		if ($line =~ /\b(if|while|for|switch)\(/) {
+			if (ERROR("SPACING",
+				  "space required before the open parenthesis '('\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/\b(if|while|for|switch)\(/$1 \(/;
+			}
+		}
+
+# Check for illegal assignment in if conditional -- and check for trailing
+# statements after the conditional.
+		if ($line =~ /do\s*(?!{)/) {
+			($stat, $cond, $line_nr_next, $remain_next, $off_next) =
+				ctx_statement_block($linenr, $realcnt, 0)
+					if (!defined $stat);
+			my ($stat_next) = ctx_statement_block($line_nr_next,
+						$remain_next, $off_next);
+			$stat_next =~ s/\n./\n /g;
+			##print "stat<$stat> stat_next<$stat_next>\n";
+
+			if ($stat_next =~ /^\s*while\b/) {
+				# If the statement carries leading newlines,
+				# then count those as offsets.
+				my ($whitespace) =
+					($stat_next =~ /^((?:\s*\n[+-])*\s*)/s);
+				my $offset =
+					statement_rawlines($whitespace) - 1;
+
+				$suppress_whiletrailers{$line_nr_next +
+								$offset} = 1;
+			}
+		}
+		if (!defined $suppress_whiletrailers{$linenr} &&
+		    defined($stat) && defined($cond) &&
+		    $line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
+			my ($s, $c) = ($stat, $cond);
+
+			if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/s) {
+				ERROR("ASSIGN_IN_IF",
+				      "do not use assignment in if condition\n" . $herecurr);
+			}
+
+			# Find out what is on the end of the line after the
+			# conditional.
+			substr($s, 0, length($c), '');
+			$s =~ s/\n.*//g;
+			$s =~ s/$;//g; 	# Remove any comments
+			if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ &&
+			    $c !~ /}\s*while\s*/)
+			{
+				# Find out how long the conditional actually is.
+				my @newlines = ($c =~ /\n/gs);
+				my $cond_lines = 1 + $#newlines;
+				my $stat_real = '';
+
+				$stat_real = raw_line($linenr, $cond_lines)
+							. "\n" if ($cond_lines);
+				if (defined($stat_real) && $cond_lines > 1) {
+					$stat_real = "[...]\n$stat_real";
+				}
+
+				ERROR("TRAILING_STATEMENTS",
+				      "trailing statements should be on next line\n" . $herecurr . $stat_real);
+			}
+		}
+
+# Check for bitwise tests written as boolean
+		if ($line =~ /
+			(?:
+				(?:\[|\(|\&\&|\|\|)
+				\s*0[xX][0-9]+\s*
+				(?:\&\&|\|\|)
+			|
+				(?:\&\&|\|\|)
+				\s*0[xX][0-9]+\s*
+				(?:\&\&|\|\||\)|\])
+			)/x)
+		{
+			WARN("HEXADECIMAL_BOOLEAN_TEST",
+			     "boolean test with hexadecimal, perhaps just 1 \& or \|?\n" . $herecurr);
+		}
+
+# if and else should not have general statements after it
+		if ($line =~ /^.\s*(?:}\s*)?else\b(.*)/) {
+			my $s = $1;
+			$s =~ s/$;//g; 	# Remove any comments
+			if ($s !~ /^\s*(?:\sif|(?:{|)\s*\\?\s*$)/) {
+				ERROR("TRAILING_STATEMENTS",
+				      "trailing statements should be on next line\n" . $herecurr);
+			}
+		}
+# if should not continue a brace
+		if ($line =~ /}\s*if\b/) {
+			ERROR("TRAILING_STATEMENTS",
+			      "trailing statements should be on next line (or did you mean 'else if'?)\n" .
+				$herecurr);
+		}
+# case and default should not have general statements after them
+		if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
+		    $line !~ /\G(?:
+			(?:\s*$;*)(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
+			\s*return\s+
+		    )/xg)
+		{
+			ERROR("TRAILING_STATEMENTS",
+			      "trailing statements should be on next line\n" . $herecurr);
+		}
+
+		# Check for }<nl>else {, these must be at the same
+		# indent level to be relevant to each other.
+		if ($prevline=~/}\s*$/ and $line=~/^.\s*else\s*/ &&
+		    $previndent == $indent) {
+			if (ERROR("ELSE_AFTER_BRACE",
+				  "else should follow close brace '}'\n" . $hereprev) &&
+			    $fix && $prevline =~ /^\+/ && $line =~ /^\+/) {
+				fix_delete_line($fixlinenr - 1, $prevrawline);
+				fix_delete_line($fixlinenr, $rawline);
+				my $fixedline = $prevrawline;
+				$fixedline =~ s/}\s*$//;
+				if ($fixedline !~ /^\+\s*$/) {
+					fix_insert_line($fixlinenr, $fixedline);
+				}
+				$fixedline = $rawline;
+				$fixedline =~ s/^(.\s*)else/$1} else/;
+				fix_insert_line($fixlinenr, $fixedline);
+			}
+		}
+
+		if ($prevline=~/}\s*$/ and $line=~/^.\s*while\s*/ &&
+		    $previndent == $indent) {
+			my ($s, $c) = ctx_statement_block($linenr, $realcnt, 0);
+
+			# Find out what is on the end of the line after the
+			# conditional.
+			substr($s, 0, length($c), '');
+			$s =~ s/\n.*//g;
+
+			if ($s =~ /^\s*;/) {
+				if (ERROR("WHILE_AFTER_BRACE",
+					  "while should follow close brace '}'\n" . $hereprev) &&
+				    $fix && $prevline =~ /^\+/ && $line =~ /^\+/) {
+					fix_delete_line($fixlinenr - 1, $prevrawline);
+					fix_delete_line($fixlinenr, $rawline);
+					my $fixedline = $prevrawline;
+					my $trailing = $rawline;
+					$trailing =~ s/^\+//;
+					$trailing = trim($trailing);
+					$fixedline =~ s/}\s*$/} $trailing/;
+					fix_insert_line($fixlinenr, $fixedline);
+				}
+			}
+		}
+
+#Specific variable tests
+		while ($line =~ m{($Constant|$Lval)}g) {
+			my $var = $1;
+
+#CamelCase
+			if ($var !~ /^$Constant$/ &&
+			    $var =~ /[A-Z][a-z]|[a-z][A-Z]/ &&
+#Ignore Page<foo> variants
+			    $var !~ /^(?:Clear|Set|TestClear|TestSet|)Page[A-Z]/ &&
+#Ignore SI style variants like nS, mV and dB (ie: max_uV, regulator_min_uA_show)
+			    $var !~ /^(?:[a-z_]*?)_?[a-z][A-Z](?:_[a-z_]+)?$/ &&
+#Ignore some three character SI units explicitly, like MiB and KHz
+			    $var !~ /^(?:[a-z_]*?)_?(?:[KMGT]iB|[KMGT]?Hz)(?:_[a-z_]+)?$/) {
+				while ($var =~ m{($Ident)}g) {
+					my $word = $1;
+					next if ($word !~ /[A-Z][a-z]|[a-z][A-Z]/);
+					if ($check) {
+						seed_camelcase_includes();
+						if (!$file && !$camelcase_file_seeded) {
+							seed_camelcase_file($realfile);
+							$camelcase_file_seeded = 1;
+						}
+					}
+					if (!defined $camelcase{$word}) {
+						$camelcase{$word} = 1;
+						CHK("CAMELCASE",
+						    "Avoid CamelCase: <$word>\n" . $herecurr);
+					}
+				}
+			}
+		}
+
+#no spaces allowed after \ in define
+		if ($line =~ /\#\s*define.*\\\s+$/) {
+			if (WARN("WHITESPACE_AFTER_LINE_CONTINUATION",
+				 "Whitespace after \\ makes next lines useless\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\s+$//;
+			}
+		}
+
+# warn if <asm/foo.h> is #included and <linux/foo.h> is available and includes
+# itself <asm/foo.h> (uses RAW line)
+		if ($tree && $rawline =~ m{^.\s*\#\s*include\s*\<asm\/(.*)\.h\>}) {
+			my $file = "$1.h";
+			my $checkfile = "include/linux/$file";
+			if (-f "$root/$checkfile" &&
+			    $realfile ne $checkfile &&
+			    $1 !~ /$allowed_asm_includes/)
+			{
+				my $asminclude = `grep -Ec "#include\\s+<asm/$file>" $root/$checkfile`;
+				if ($asminclude > 0) {
+					if ($realfile =~ m{^arch/}) {
+						CHK("ARCH_INCLUDE_LINUX",
+						    "Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
+					} else {
+						WARN("INCLUDE_LINUX",
+						     "Use #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
+					}
+				}
+			}
+		}
+
+# multi-statement macros should be enclosed in a do while loop, grab the
+# first statement and ensure its the whole macro if its not enclosed
+# in a known good container
+		if ($realfile !~ m@/vmlinux.lds.h$@ &&
+		    $line =~ /^.\s*\#\s*define\s*$Ident(\()?/) {
+			my $ln = $linenr;
+			my $cnt = $realcnt;
+			my ($off, $dstat, $dcond, $rest);
+			my $ctx = '';
+			my $has_flow_statement = 0;
+			my $has_arg_concat = 0;
+			($dstat, $dcond, $ln, $cnt, $off) =
+				ctx_statement_block($linenr, $realcnt, 0);
+			$ctx = $dstat;
+			#print "dstat<$dstat> dcond<$dcond> cnt<$cnt> off<$off>\n";
+			#print "LINE<$lines[$ln-1]> len<" . length($lines[$ln-1]) . "\n";
+
+			$has_flow_statement = 1 if ($ctx =~ /\b(goto|return)\b/);
+			$has_arg_concat = 1 if ($ctx =~ /\#\#/ && $ctx !~ /\#\#\s*(?:__VA_ARGS__|args)\b/);
+
+			$dstat =~ s/^.\s*\#\s*define\s+$Ident(\([^\)]*\))?\s*//;
+			my $define_args = $1;
+			my $define_stmt = $dstat;
+			my @def_args = ();
+
+			if (defined $define_args && $define_args ne "") {
+				$define_args = substr($define_args, 1, length($define_args) - 2);
+				$define_args =~ s/\s*//g;
+				$define_args =~ s/\\\+?//g;
+				@def_args = split(",", $define_args);
+			}
+
+			$dstat =~ s/$;//g;
+			$dstat =~ s/\\\n.//g;
+			$dstat =~ s/^\s*//s;
+			$dstat =~ s/\s*$//s;
+
+			# Flatten any parentheses and braces
+			while ($dstat =~ s/\([^\(\)]*\)/1/ ||
+			       $dstat =~ s/\{[^\{\}]*\}/1/ ||
+			       $dstat =~ s/.\[[^\[\]]*\]/1/)
+			{
+			}
+
+			# Flatten any obvious string concatentation.
+			while ($dstat =~ s/($String)\s*$Ident/$1/ ||
+			       $dstat =~ s/$Ident\s*($String)/$1/)
+			{
+			}
+
+			# Make asm volatile uses seem like a generic function
+			$dstat =~ s/\b_*asm_*\s+_*volatile_*\b/asm_volatile/g;
+
+			my $exceptions = qr{
+				$Declare|
+				module_param_named|
+				MODULE_PARM_DESC|
+				DECLARE_PER_CPU|
+				DEFINE_PER_CPU|
+				__typeof__\(|
+				union|
+				struct|
+				\.$Ident\s*=\s*|
+				^\"|\"$|
+				^\[
+			}x;
+			#print "REST<$rest> dstat<$dstat> ctx<$ctx>\n";
+
+			$ctx =~ s/\n*$//;
+			my $stmt_cnt = statement_rawlines($ctx);
+			my $herectx = get_stat_here($linenr, $stmt_cnt, $here);
+
+			if ($dstat ne '' &&
+			    $dstat !~ /^(?:$Ident|-?$Constant),$/ &&			# 10, // foo(),
+			    $dstat !~ /^(?:$Ident|-?$Constant);$/ &&			# foo();
+			    $dstat !~ /^[!~-]?(?:$Lval|$Constant)$/ &&		# 10 // foo() // !foo // ~foo // -foo // foo->bar // foo.bar->baz
+			    $dstat !~ /^'X'$/ && $dstat !~ /^'XX'$/ &&			# character constants
+			    $dstat !~ /$exceptions/ &&
+			    $dstat !~ /^\.$Ident\s*=/ &&				# .foo =
+			    $dstat !~ /^(?:\#\s*$Ident|\#\s*$Constant)\s*$/ &&		# stringification #foo
+			    $dstat !~ /^do\s*$Constant\s*while\s*$Constant;?$/ &&	# do {...} while (...); // do {...} while (...)
+			    $dstat !~ /^for\s*$Constant$/ &&				# for (...)
+			    $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&	# for (...) bar()
+			    $dstat !~ /^do\s*{/ &&					# do {...
+			    $dstat !~ /^\(\{/ &&						# ({...
+			    $ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
+			{
+				if ($dstat =~ /^\s*if\b/) {
+					ERROR("MULTISTATEMENT_MACRO_USE_DO_WHILE",
+					      "Macros starting with if should be enclosed by a do - while loop to avoid possible if/else logic defects\n" . "$herectx");
+				} elsif ($dstat =~ /;/) {
+					ERROR("MULTISTATEMENT_MACRO_USE_DO_WHILE",
+					      "Macros with multiple statements should be enclosed in a do - while loop\n" . "$herectx");
+				} else {
+					ERROR("COMPLEX_MACRO",
+					      "Macros with complex values should be enclosed in parentheses\n" . "$herectx");
+				}
+
+			}
+
+			# Make $define_stmt single line, comment-free, etc
+			my @stmt_array = split('\n', $define_stmt);
+			my $first = 1;
+			$define_stmt = "";
+			foreach my $l (@stmt_array) {
+				$l =~ s/\\$//;
+				if ($first) {
+					$define_stmt = $l;
+					$first = 0;
+				} elsif ($l =~ /^[\+ ]/) {
+					$define_stmt .= substr($l, 1);
+				}
+			}
+			$define_stmt =~ s/$;//g;
+			$define_stmt =~ s/\s+/ /g;
+			$define_stmt = trim($define_stmt);
+
+# check if any macro arguments are reused (ignore '...' and 'type')
+			foreach my $arg (@def_args) {
+			        next if ($arg =~ /\.\.\./);
+			        next if ($arg =~ /^type$/i);
+				my $tmp_stmt = $define_stmt;
+				$tmp_stmt =~ s/\b(sizeof|typeof|__typeof__|__builtin\w+|typecheck\s*\(\s*$Type\s*,|\#+)\s*\(*\s*$arg\s*\)*\b//g;
+				$tmp_stmt =~ s/\#+\s*$arg\b//g;
+				$tmp_stmt =~ s/\b$arg\s*\#\#//g;
+				my $use_cnt = () = $tmp_stmt =~ /\b$arg\b/g;
+				if ($use_cnt > 1) {
+					CHK("MACRO_ARG_REUSE",
+					    "Macro argument reuse '$arg' - possible side-effects?\n" . "$herectx");
+				    }
+# check if any macro arguments may have other precedence issues
+				if ($tmp_stmt =~ m/($Operators)?\s*\b$arg\b\s*($Operators)?/m &&
+				    ((defined($1) && $1 ne ',') ||
+				     (defined($2) && $2 ne ','))) {
+					CHK("MACRO_ARG_PRECEDENCE",
+					    "Macro argument '$arg' may be better as '($arg)' to avoid precedence issues\n" . "$herectx");
+				}
+			}
+
+# check for macros with flow control, but without ## concatenation
+# ## concatenation is commonly a macro that defines a function so ignore those
+			if ($has_flow_statement && !$has_arg_concat) {
+				my $cnt = statement_rawlines($ctx);
+				my $herectx = get_stat_here($linenr, $cnt, $here);
+
+				WARN("MACRO_WITH_FLOW_CONTROL",
+				     "Macros with flow control statements should be avoided\n" . "$herectx");
+			}
+
+# check for line continuations outside of #defines, preprocessor #, and asm
+
+		} else {
+			if ($prevline !~ /^..*\\$/ &&
+			    $line !~ /^\+\s*\#.*\\$/ &&		# preprocessor
+			    $line !~ /^\+.*\b(__asm__|asm)\b.*\\$/ &&	# asm
+			    $line =~ /^\+.*\\$/) {
+				WARN("LINE_CONTINUATIONS",
+				     "Avoid unnecessary line continuations\n" . $herecurr);
+			}
+		}
+
+# do {} while (0) macro tests:
+# single-statement macros do not need to be enclosed in do while (0) loop,
+# macro should not end with a semicolon
+		if ($perl_version_ok &&
+		    $realfile !~ m@/vmlinux.lds.h$@ &&
+		    $line =~ /^.\s*\#\s*define\s+$Ident(\()?/) {
+			my $ln = $linenr;
+			my $cnt = $realcnt;
+			my ($off, $dstat, $dcond, $rest);
+			my $ctx = '';
+			($dstat, $dcond, $ln, $cnt, $off) =
+				ctx_statement_block($linenr, $realcnt, 0);
+			$ctx = $dstat;
+
+			$dstat =~ s/\\\n.//g;
+			$dstat =~ s/$;/ /g;
+
+			if ($dstat =~ /^\+\s*#\s*define\s+$Ident\s*${balanced_parens}\s*do\s*{(.*)\s*}\s*while\s*\(\s*0\s*\)\s*([;\s]*)\s*$/) {
+				my $stmts = $2;
+				my $semis = $3;
+
+				$ctx =~ s/\n*$//;
+				my $cnt = statement_rawlines($ctx);
+				my $herectx = get_stat_here($linenr, $cnt, $here);
+
+				if (($stmts =~ tr/;/;/) == 1 &&
+				    $stmts !~ /^\s*(if|while|for|switch)\b/) {
+					WARN("SINGLE_STATEMENT_DO_WHILE_MACRO",
+					     "Single statement macros should not use a do {} while (0) loop\n" . "$herectx");
+				}
+				if (defined $semis && $semis ne "") {
+					WARN("DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON",
+					     "do {} while (0) macros should not be semicolon terminated\n" . "$herectx");
+				}
+			} elsif ($dstat =~ /^\+\s*#\s*define\s+$Ident.*;\s*$/) {
+				$ctx =~ s/\n*$//;
+				my $cnt = statement_rawlines($ctx);
+				my $herectx = get_stat_here($linenr, $cnt, $here);
+
+				WARN("TRAILING_SEMICOLON",
+				     "macros should not use a trailing semicolon\n" . "$herectx");
+			}
+		}
+
+# check for redundant bracing round if etc
+		if ($line =~ /(^.*)\bif\b/ && $1 !~ /else\s*$/) {
+			my ($level, $endln, @chunks) =
+				ctx_statement_full($linenr, $realcnt, 1);
+			#print "chunks<$#chunks> linenr<$linenr> endln<$endln> level<$level>\n";
+			#print "APW: <<$chunks[1][0]>><<$chunks[1][1]>>\n";
+			if ($#chunks > 0 && $level == 0) {
+				my @allowed = ();
+				my $allow = 0;
+				my $seen = 0;
+				my $herectx = $here . "\n";
+				my $ln = $linenr - 1;
+				for my $chunk (@chunks) {
+					my ($cond, $block) = @{$chunk};
+
+					# If the condition carries leading newlines, then count those as offsets.
+					my ($whitespace) = ($cond =~ /^((?:\s*\n[+-])*\s*)/s);
+					my $offset = statement_rawlines($whitespace) - 1;
+
+					$allowed[$allow] = 0;
+					#print "COND<$cond> whitespace<$whitespace> offset<$offset>\n";
+
+					# We have looked at and allowed this specific line.
+					$suppress_ifbraces{$ln + $offset} = 1;
+
+					$herectx .= "$rawlines[$ln + $offset]\n[...]\n";
+					$ln += statement_rawlines($block) - 1;
+
+					substr($block, 0, length($cond), '');
+
+					$seen++ if ($block =~ /^\s*{/);
+
+					#print "cond<$cond> block<$block> allowed<$allowed[$allow]>\n";
+					if (statement_lines($cond) > 1) {
+						#print "APW: ALLOWED: cond<$cond>\n";
+						$allowed[$allow] = 1;
+					}
+					if ($block =~/\b(?:if|for|while)\b/) {
+						#print "APW: ALLOWED: block<$block>\n";
+						$allowed[$allow] = 1;
+					}
+					if (statement_block_size($block) > 1) {
+						#print "APW: ALLOWED: lines block<$block>\n";
+						$allowed[$allow] = 1;
+					}
+					$allow++;
+				}
+				if ($seen) {
+					my $sum_allowed = 0;
+					foreach (@allowed) {
+						$sum_allowed += $_;
+					}
+					if ($sum_allowed == 0) {
+						WARN("BRACES",
+						     "braces {} are not necessary for any arm of this statement\n" . $herectx);
+					} elsif ($sum_allowed != $allow &&
+						 $seen != $allow) {
+						CHK("BRACES",
+						    "braces {} should be used on all arms of this statement\n" . $herectx);
+					}
+				}
+			}
+		}
+		if (!defined $suppress_ifbraces{$linenr - 1} &&
+					$line =~ /\b(if|while|for|else)\b/) {
+			my $allowed = 0;
+
+			# Check the pre-context.
+			if (substr($line, 0, $-[0]) =~ /(\}\s*)$/) {
+				#print "APW: ALLOWED: pre<$1>\n";
+				$allowed = 1;
+			}
+
+			my ($level, $endln, @chunks) =
+				ctx_statement_full($linenr, $realcnt, $-[0]);
+
+			# Check the condition.
+			my ($cond, $block) = @{$chunks[0]};
+			#print "CHECKING<$linenr> cond<$cond> block<$block>\n";
+			if (defined $cond) {
+				substr($block, 0, length($cond), '');
+			}
+			if (statement_lines($cond) > 1) {
+				#print "APW: ALLOWED: cond<$cond>\n";
+				$allowed = 1;
+			}
+			if ($block =~/\b(?:if|for|while)\b/) {
+				#print "APW: ALLOWED: block<$block>\n";
+				$allowed = 1;
+			}
+			if (statement_block_size($block) > 1) {
+				#print "APW: ALLOWED: lines block<$block>\n";
+				$allowed = 1;
+			}
+			# Check the post-context.
+			if (defined $chunks[1]) {
+				my ($cond, $block) = @{$chunks[1]};
+				if (defined $cond) {
+					substr($block, 0, length($cond), '');
+				}
+				if ($block =~ /^\s*\{/) {
+					#print "APW: ALLOWED: chunk-1 block<$block>\n";
+					$allowed = 1;
+				}
+			}
+			if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
+				my $cnt = statement_rawlines($block);
+				my $herectx = get_stat_here($linenr, $cnt, $here);
+
+				WARN("BRACES",
+				     "braces {} are not necessary for single statement blocks\n" . $herectx);
+			}
+		}
+
+# check for single line unbalanced braces
+		if ($sline =~ /^.\s*\}\s*else\s*$/ ||
+		    $sline =~ /^.\s*else\s*\{\s*$/) {
+			CHK("BRACES", "Unbalanced braces around else statement\n" . $herecurr);
+		}
+
+# check for unnecessary blank lines around braces
+		if (($line =~ /^.\s*}\s*$/ && $prevrawline =~ /^.\s*$/)) {
+			if (CHK("BRACES",
+				"Blank lines aren't necessary before a close brace '}'\n" . $hereprev) &&
+			    $fix && $prevrawline =~ /^\+/) {
+				fix_delete_line($fixlinenr - 1, $prevrawline);
+			}
+		}
+		if (($rawline =~ /^.\s*$/ && $prevline =~ /^..*{\s*$/)) {
+			if (CHK("BRACES",
+				"Blank lines aren't necessary after an open brace '{'\n" . $hereprev) &&
+			    $fix) {
+				fix_delete_line($fixlinenr, $rawline);
+			}
+		}
+
+# no volatiles please
+		my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
+		if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {
+			WARN("VOLATILE",
+			     "Use of volatile is usually wrong: see Documentation/process/volatile-considered-harmful.rst\n" . $herecurr);
+		}
+
+# Check for user-visible strings broken across lines, which breaks the ability
+# to grep for the string.  Make exceptions when the previous string ends in a
+# newline (multiple lines in one string constant) or '\t', '\r', ';', or '{'
+# (common in inline assembly) or is a octal \123 or hexadecimal \xaf value
+		if ($line =~ /^\+\s*$String/ &&
+		    $prevline =~ /"\s*$/ &&
+		    $prevrawline !~ /(?:\\(?:[ntr]|[0-7]{1,3}|x[0-9a-fA-F]{1,2})|;\s*|\{\s*)"\s*$/) {
+			if (WARN("SPLIT_STRING",
+				 "quoted string split across lines\n" . $hereprev) &&
+				     $fix &&
+				     $prevrawline =~ /^\+.*"\s*$/ &&
+				     $last_coalesced_string_linenr != $linenr - 1) {
+				my $extracted_string = get_quoted_string($line, $rawline);
+				my $comma_close = "";
+				if ($rawline =~ /\Q$extracted_string\E(\s*\)\s*;\s*$|\s*,\s*)/) {
+					$comma_close = $1;
+				}
+
+				fix_delete_line($fixlinenr - 1, $prevrawline);
+				fix_delete_line($fixlinenr, $rawline);
+				my $fixedline = $prevrawline;
+				$fixedline =~ s/"\s*$//;
+				$fixedline .= substr($extracted_string, 1) . trim($comma_close);
+				fix_insert_line($fixlinenr - 1, $fixedline);
+				$fixedline = $rawline;
+				$fixedline =~ s/\Q$extracted_string\E\Q$comma_close\E//;
+				if ($fixedline !~ /\+\s*$/) {
+					fix_insert_line($fixlinenr, $fixedline);
+				}
+				$last_coalesced_string_linenr = $linenr;
+			}
+		}
+
+# check for missing a space in a string concatenation
+		if ($prevrawline =~ /[^\\]\w"$/ && $rawline =~ /^\+[\t ]+"\w/) {
+			WARN('MISSING_SPACE',
+			     "break quoted strings at a space character\n" . $hereprev);
+		}
+
+# check for an embedded function name in a string when the function is known
+# This does not work very well for -f --file checking as it depends on patch
+# context providing the function name or a single line form for in-file
+# function declarations
+		if (!$SOF &&
+		    $line =~ /^\+.*$String/ &&
+		    defined($context_function) &&
+		    get_quoted_string($line, $rawline) =~ /\b$context_function\b/ &&
+		    length(get_quoted_string($line, $rawline)) != (length($context_function) + 2)) {
+			WARN("EMBEDDED_FUNCTION_NAME",
+			     "Prefer using '\"%s...\", __func__' to using '$context_function', this function's name, in a string\n" . $herecurr);
+		}
+
+# check for spaces before a quoted newline
+		if ($rawline =~ /^.*\".*\s\\n/) {
+			if (WARN("QUOTED_WHITESPACE_BEFORE_NEWLINE",
+				 "unnecessary whitespace before a quoted newline\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/^(\+.*\".*)\s+\\n/$1\\n/;
+			}
+
+		}
+
+# concatenated string without spaces between elements
+		if ($line =~ /$String[A-Za-z0-9_]/ || $line =~ /[A-Za-z0-9_]$String/) {
+			if (CHK("CONCATENATED_STRING",
+				"Concatenated strings should use spaces between elements\n" . $herecurr) &&
+			    $fix) {
+				while ($line =~ /($String)/g) {
+					my $extracted_string = substr($rawline, $-[0], $+[0] - $-[0]);
+					$fixed[$fixlinenr] =~ s/\Q$extracted_string\E([A-Za-z0-9_])/$extracted_string $1/;
+					$fixed[$fixlinenr] =~ s/([A-Za-z0-9_])\Q$extracted_string\E/$1 $extracted_string/;
+				}
+			}
+		}
+
+# uncoalesced string fragments
+		if ($line =~ /$String\s*"/) {
+			if (WARN("STRING_FRAGMENTS",
+				 "Consecutive strings are generally better as a single string\n" . $herecurr) &&
+			    $fix) {
+				while ($line =~ /($String)(?=\s*")/g) {
+					my $extracted_string = substr($rawline, $-[0], $+[0] - $-[0]);
+					$fixed[$fixlinenr] =~ s/\Q$extracted_string\E\s*"/substr($extracted_string, 0, -1)/e;
+				}
+			}
+		}
+
+# check for non-standard and hex prefixed decimal printf formats
+		my $show_L = 1;	#don't show the same defect twice
+		my $show_Z = 1;
+		while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
+			my $string = substr($rawline, $-[1], $+[1] - $-[1]);
+			$string =~ s/%%/__/g;
+			# check for %L
+			if ($show_L && $string =~ /%[\*\d\.\$]*L([diouxX])/) {
+				WARN("PRINTF_L",
+				     "\%L$1 is non-standard C, use %ll$1\n" . $herecurr);
+				$show_L = 0;
+			}
+			# check for %Z
+			if ($show_Z && $string =~ /%[\*\d\.\$]*Z([diouxX])/) {
+				WARN("PRINTF_Z",
+				     "%Z$1 is non-standard C, use %z$1\n" . $herecurr);
+				$show_Z = 0;
+			}
+			# check for 0x<decimal>
+			if ($string =~ /0x%[\*\d\.\$\Llzth]*[diou]/) {
+				ERROR("PRINTF_0XDECIMAL",
+				      "Prefixing 0x with decimal output is defective\n" . $herecurr);
+			}
+		}
+
+# check for line continuations in quoted strings with odd counts of "
+		if ($rawline =~ /\\$/ && $sline =~ tr/"/"/ % 2) {
+			WARN("LINE_CONTINUATIONS",
+			     "Avoid line continuations in quoted strings\n" . $herecurr);
+		}
+
+# warn about #if 0
+		if ($line =~ /^.\s*\#\s*if\s+0\b/) {
+			WARN("IF_0",
+			     "Consider removing the code enclosed by this #if 0 and its #endif\n" . $herecurr);
+		}
+
+# warn about #if 1
+		if ($line =~ /^.\s*\#\s*if\s+1\b/) {
+			WARN("IF_1",
+			     "Consider removing the #if 1 and its #endif\n" . $herecurr);
+		}
+
+# check for needless "if (<foo>) fn(<foo>)" uses
+		if ($prevline =~ /\bif\s*\(\s*($Lval)\s*\)/) {
+			my $tested = quotemeta($1);
+			my $expr = '\s*\(\s*' . $tested . '\s*\)\s*;';
+			if ($line =~ /\b(kfree|usb_free_urb|debugfs_remove(?:_recursive)?|(?:kmem_cache|mempool|dma_pool)_destroy)$expr/) {
+				my $func = $1;
+				if (WARN('NEEDLESS_IF',
+					 "$func(NULL) is safe and this check is probably not required\n" . $hereprev) &&
+				    $fix) {
+					my $do_fix = 1;
+					my $leading_tabs = "";
+					my $new_leading_tabs = "";
+					if ($lines[$linenr - 2] =~ /^\+(\t*)if\s*\(\s*$tested\s*\)\s*$/) {
+						$leading_tabs = $1;
+					} else {
+						$do_fix = 0;
+					}
+					if ($lines[$linenr - 1] =~ /^\+(\t+)$func\s*\(\s*$tested\s*\)\s*;\s*$/) {
+						$new_leading_tabs = $1;
+						if (length($leading_tabs) + 1 ne length($new_leading_tabs)) {
+							$do_fix = 0;
+						}
+					} else {
+						$do_fix = 0;
+					}
+					if ($do_fix) {
+						fix_delete_line($fixlinenr - 1, $prevrawline);
+						$fixed[$fixlinenr] =~ s/^\+$new_leading_tabs/\+$leading_tabs/;
+					}
+				}
+			}
+		}
+
+# check for unnecessary "Out of Memory" messages
+		if ($line =~ /^\+.*\b$logFunctions\s*\(/ &&
+		    $prevline =~ /^[ \+]\s*if\s*\(\s*(\!\s*|NULL\s*==\s*)?($Lval)(\s*==\s*NULL\s*)?\s*\)/ &&
+		    (defined $1 || defined $3) &&
+		    $linenr > 3) {
+			my $testval = $2;
+			my $testline = $lines[$linenr - 3];
+
+			my ($s, $c) = ctx_statement_block($linenr - 3, $realcnt, 0);
+#			print("line: <$line>\nprevline: <$prevline>\ns: <$s>\nc: <$c>\n\n\n");
+
+			if ($s =~ /(?:^|\n)[ \+]\s*(?:$Type\s*)?\Q$testval\E\s*=\s*(?:\([^\)]*\)\s*)?\s*$allocFunctions\s*\(/ &&
+			    $s !~ /\b__GFP_NOWARN\b/ ) {
+				WARN("OOM_MESSAGE",
+				     "Possible unnecessary 'out of memory' message\n" . $hereprev);
+			}
+		}
+
+# check for logging functions with KERN_<LEVEL>
+		if ($line !~ /printk(?:_ratelimited|_once)?\s*\(/ &&
+		    $line =~ /\b$logFunctions\s*\(.*\b(KERN_[A-Z]+)\b/) {
+			my $level = $1;
+			if (WARN("UNNECESSARY_KERN_LEVEL",
+				 "Possible unnecessary $level\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\s*$level\s*//;
+			}
+		}
+
+# check for logging continuations
+		if ($line =~ /\bprintk\s*\(\s*KERN_CONT\b|\bpr_cont\s*\(/) {
+			WARN("LOGGING_CONTINUATION",
+			     "Avoid logging continuation uses where feasible\n" . $herecurr);
+		}
+
+# check for mask then right shift without a parentheses
+		if ($perl_version_ok &&
+		    $line =~ /$LvalOrFunc\s*\&\s*($LvalOrFunc)\s*>>/ &&
+		    $4 !~ /^\&/) { # $LvalOrFunc may be &foo, ignore if so
+			WARN("MASK_THEN_SHIFT",
+			     "Possible precedence defect with mask then right shift - may need parentheses\n" . $herecurr);
+		}
+
+# check for pointer comparisons to NULL
+		if ($perl_version_ok) {
+			while ($line =~ /\b$LvalOrFunc\s*(==|\!=)\s*NULL\b/g) {
+				my $val = $1;
+				my $equal = "!";
+				$equal = "" if ($4 eq "!=");
+				if (CHK("COMPARISON_TO_NULL",
+					"Comparison to NULL could be written \"${equal}${val}\"\n" . $herecurr) &&
+					    $fix) {
+					$fixed[$fixlinenr] =~ s/\b\Q$val\E\s*(?:==|\!=)\s*NULL\b/$equal$val/;
+				}
+			}
+		}
+
+# check for bad placement of section $InitAttribute (e.g.: __initdata)
+		if ($line =~ /(\b$InitAttribute\b)/) {
+			my $attr = $1;
+			if ($line =~ /^\+\s*static\s+(?:const\s+)?(?:$attr\s+)?($NonptrTypeWithAttr)\s+(?:$attr\s+)?($Ident(?:\[[^]]*\])?)\s*[=;]/) {
+				my $ptr = $1;
+				my $var = $2;
+				if ((($ptr =~ /\b(union|struct)\s+$attr\b/ &&
+				      ERROR("MISPLACED_INIT",
+					    "$attr should be placed after $var\n" . $herecurr)) ||
+				     ($ptr !~ /\b(union|struct)\s+$attr\b/ &&
+				      WARN("MISPLACED_INIT",
+					   "$attr should be placed after $var\n" . $herecurr))) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/(\bstatic\s+(?:const\s+)?)(?:$attr\s+)?($NonptrTypeWithAttr)\s+(?:$attr\s+)?($Ident(?:\[[^]]*\])?)\s*([=;])\s*/"$1" . trim(string_find_replace($2, "\\s*$attr\\s*", " ")) . " " . trim(string_find_replace($3, "\\s*$attr\\s*", "")) . " $attr" . ("$4" eq ";" ? ";" : " = ")/e;
+				}
+			}
+		}
+
+# check for $InitAttributeData (ie: __initdata) with const
+		if ($line =~ /\bconst\b/ && $line =~ /($InitAttributeData)/) {
+			my $attr = $1;
+			$attr =~ /($InitAttributePrefix)(.*)/;
+			my $attr_prefix = $1;
+			my $attr_type = $2;
+			if (ERROR("INIT_ATTRIBUTE",
+				  "Use of const init definition must use ${attr_prefix}initconst\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/$InitAttributeData/${attr_prefix}initconst/;
+			}
+		}
+
+# check for $InitAttributeConst (ie: __initconst) without const
+		if ($line !~ /\bconst\b/ && $line =~ /($InitAttributeConst)/) {
+			my $attr = $1;
+			if (ERROR("INIT_ATTRIBUTE",
+				  "Use of $attr requires a separate use of const\n" . $herecurr) &&
+			    $fix) {
+				my $lead = $fixed[$fixlinenr] =~
+				    /(^\+\s*(?:static\s+))/;
+				$lead = rtrim($1);
+				$lead = "$lead " if ($lead !~ /^\+$/);
+				$lead = "${lead}const ";
+				$fixed[$fixlinenr] =~ s/(^\+\s*(?:static\s+))/$lead/;
+			}
+		}
+
+# check for __read_mostly with const non-pointer (should just be const)
+		if ($line =~ /\b__read_mostly\b/ &&
+		    $line =~ /($Type)\s*$Ident/ && $1 !~ /\*\s*$/ && $1 =~ /\bconst\b/) {
+			if (ERROR("CONST_READ_MOSTLY",
+				  "Invalid use of __read_mostly with const type\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\s+__read_mostly\b//;
+			}
+		}
+
+# don't use __constant_<foo> functions outside of include/uapi/
+		if ($realfile !~ m@^include/uapi/@ &&
+		    $line =~ /(__constant_(?:htons|ntohs|[bl]e(?:16|32|64)_to_cpu|cpu_to_[bl]e(?:16|32|64)))\s*\(/) {
+			my $constant_func = $1;
+			my $func = $constant_func;
+			$func =~ s/^__constant_//;
+			if (WARN("CONSTANT_CONVERSION",
+				 "$constant_func should be $func\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\b$constant_func\b/$func/g;
+			}
+		}
+
+# prefer usleep_range over udelay
+		if ($line =~ /\budelay\s*\(\s*(\d+)\s*\)/) {
+			my $delay = $1;
+			# ignore udelay's < 10, however
+			if (! ($delay < 10) ) {
+				CHK("USLEEP_RANGE",
+				    "usleep_range is preferred over udelay; see Documentation/timers/timers-howto.rst\n" . $herecurr);
+			}
+			if ($delay > 2000) {
+				WARN("LONG_UDELAY",
+				     "long udelay - prefer mdelay; see arch/arm/include/asm/delay.h\n" . $herecurr);
+			}
+		}
+
+# warn about unexpectedly long msleep's
+		if ($line =~ /\bmsleep\s*\((\d+)\);/) {
+			if ($1 < 20) {
+				WARN("MSLEEP",
+				     "msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.rst\n" . $herecurr);
+			}
+		}
+
+# check for comparisons of jiffies
+		if ($line =~ /\bjiffies\s*$Compare|$Compare\s*jiffies\b/) {
+			WARN("JIFFIES_COMPARISON",
+			     "Comparing jiffies is almost always wrong; prefer time_after, time_before and friends\n" . $herecurr);
+		}
+
+# check for comparisons of get_jiffies_64()
+		if ($line =~ /\bget_jiffies_64\s*\(\s*\)\s*$Compare|$Compare\s*get_jiffies_64\s*\(\s*\)/) {
+			WARN("JIFFIES_COMPARISON",
+			     "Comparing get_jiffies_64() is almost always wrong; prefer time_after64, time_before64 and friends\n" . $herecurr);
+		}
+
+# warn about #ifdefs in C files
+#		if ($line =~ /^.\s*\#\s*if(|n)def/ && ($realfile =~ /\.c$/)) {
+#			print "#ifdef in C files should be avoided\n";
+#			print "$herecurr";
+#			$clean = 0;
+#		}
+
+# warn about spacing in #ifdefs
+		if ($line =~ /^.\s*\#\s*(ifdef|ifndef|elif)\s\s+/) {
+			if (ERROR("SPACING",
+				  "exactly one space required after that #$1\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~
+				    s/^(.\s*\#\s*(ifdef|ifndef|elif))\s{2,}/$1 /;
+			}
+
+		}
+
+# check for spinlock_t definitions without a comment.
+		if ($line =~ /^.\s*(struct\s+mutex|spinlock_t)\s+\S+;/ ||
+		    $line =~ /^.\s*(DEFINE_MUTEX)\s*\(/) {
+			my $which = $1;
+			if (!ctx_has_comment($first_line, $linenr)) {
+				CHK("UNCOMMENTED_DEFINITION",
+				    "$1 definition without comment\n" . $herecurr);
+			}
+		}
+# check for memory barriers without a comment.
+
+		my $barriers = qr{
+			mb|
+			rmb|
+			wmb|
+			read_barrier_depends
+		}x;
+		my $barrier_stems = qr{
+			mb__before_atomic|
+			mb__after_atomic|
+			store_release|
+			load_acquire|
+			store_mb|
+			(?:$barriers)
+		}x;
+		my $all_barriers = qr{
+			(?:$barriers)|
+			smp_(?:$barrier_stems)|
+			virt_(?:$barrier_stems)
+		}x;
+
+		if ($line =~ /\b(?:$all_barriers)\s*\(/) {
+			if (!ctx_has_comment($first_line, $linenr)) {
+				WARN("MEMORY_BARRIER",
+				     "memory barrier without comment\n" . $herecurr);
+			}
+		}
+
+		my $underscore_smp_barriers = qr{__smp_(?:$barrier_stems)}x;
+
+		if ($realfile !~ m@^include/asm-generic/@ &&
+		    $realfile !~ m@/barrier\.h$@ &&
+		    $line =~ m/\b(?:$underscore_smp_barriers)\s*\(/ &&
+		    $line !~ m/^.\s*\#\s*define\s+(?:$underscore_smp_barriers)\s*\(/) {
+			WARN("MEMORY_BARRIER",
+			     "__smp memory barriers shouldn't be used outside barrier.h and asm-generic\n" . $herecurr);
+		}
+
+# check for waitqueue_active without a comment.
+		if ($line =~ /\bwaitqueue_active\s*\(/) {
+			if (!ctx_has_comment($first_line, $linenr)) {
+				WARN("WAITQUEUE_ACTIVE",
+				     "waitqueue_active without comment\n" . $herecurr);
+			}
+		}
+
+# check for smp_read_barrier_depends and read_barrier_depends
+		if (!$file && $line =~ /\b(smp_|)read_barrier_depends\s*\(/) {
+			WARN("READ_BARRIER_DEPENDS",
+			     "$1read_barrier_depends should only be used in READ_ONCE or DEC Alpha code\n" . $herecurr);
+		}
+
+# check of hardware specific defines
+		if ($line =~ m@^.\s*\#\s*if.*\b(__i386__|__powerpc64__|__sun__|__s390x__)\b@ && $realfile !~ m@include/asm-@) {
+			CHK("ARCH_DEFINES",
+			    "architecture specific defines should be avoided\n" .  $herecurr);
+		}
+
+# check that the storage class is not after a type
+		if ($line =~ /\b($Type)\s+($Storage)\b/) {
+			WARN("STORAGE_CLASS",
+			     "storage class '$2' should be located before type '$1'\n" . $herecurr);
+		}
+# Check that the storage class is at the beginning of a declaration
+		if ($line =~ /\b$Storage\b/ &&
+		    $line !~ /^.\s*$Storage/ &&
+		    $line =~ /^.\s*(.+?)\$Storage\s/ &&
+		    $1 !~ /[\,\)]\s*$/) {
+			WARN("STORAGE_CLASS",
+			     "storage class should be at the beginning of the declaration\n" . $herecurr);
+		}
+
+# check the location of the inline attribute, that it is between
+# storage class and type.
+		if ($line =~ /\b$Type\s+$Inline\b/ ||
+		    $line =~ /\b$Inline\s+$Storage\b/) {
+			ERROR("INLINE_LOCATION",
+			      "inline keyword should sit between storage class and type\n" . $herecurr);
+		}
+
+# Check for __inline__ and __inline, prefer inline
+		if ($realfile !~ m@\binclude/uapi/@ &&
+		    $line =~ /\b(__inline__|__inline)\b/) {
+			if (WARN("INLINE",
+				 "plain inline is preferred over $1\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\b(__inline__|__inline)\b/inline/;
+
+			}
+		}
+
+# Check for __attribute__ packed, prefer __packed
+		if ($realfile !~ m@\binclude/uapi/@ &&
+		    $line =~ /\b__attribute__\s*\(\s*\(.*\bpacked\b/) {
+			WARN("PREFER_PACKED",
+			     "__packed is preferred over __attribute__((packed))\n" . $herecurr);
+		}
+
+# Check for __attribute__ aligned, prefer __aligned
+		if ($realfile !~ m@\binclude/uapi/@ &&
+		    $line =~ /\b__attribute__\s*\(\s*\(.*aligned/) {
+			WARN("PREFER_ALIGNED",
+			     "__aligned(size) is preferred over __attribute__((aligned(size)))\n" . $herecurr);
+		}
+
+# Check for __attribute__ section, prefer __section
+		if ($realfile !~ m@\binclude/uapi/@ &&
+		    $line =~ /\b__attribute__\s*\(\s*\(.*_*section_*\s*\(\s*("[^"]*")/) {
+			my $old = substr($rawline, $-[1], $+[1] - $-[1]);
+			my $new = substr($old, 1, -1);
+			if (WARN("PREFER_SECTION",
+				 "__section($new) is preferred over __attribute__((section($old)))\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\b__attribute__\s*\(\s*\(\s*_*section_*\s*\(\s*\Q$old\E\s*\)\s*\)\s*\)/__section($new)/;
+			}
+		}
+
+# Check for __attribute__ format(printf, prefer __printf
+		if ($realfile !~ m@\binclude/uapi/@ &&
+		    $line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf/) {
+			if (WARN("PREFER_PRINTF",
+				 "__printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf\s*,\s*(.*)\)\s*\)\s*\)/"__printf(" . trim($1) . ")"/ex;
+
+			}
+		}
+
+# Check for __attribute__ format(scanf, prefer __scanf
+		if ($realfile !~ m@\binclude/uapi/@ &&
+		    $line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\b/) {
+			if (WARN("PREFER_SCANF",
+				 "__scanf(string-index, first-to-check) is preferred over __attribute__((format(scanf, string-index, first-to-check)))\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\s*,\s*(.*)\)\s*\)\s*\)/"__scanf(" . trim($1) . ")"/ex;
+			}
+		}
+
+# Check for __attribute__ weak, or __weak declarations (may have link issues)
+		if ($perl_version_ok &&
+		    $line =~ /(?:$Declare|$DeclareMisordered)\s*$Ident\s*$balanced_parens\s*(?:$Attribute)?\s*;/ &&
+		    ($line =~ /\b__attribute__\s*\(\s*\(.*\bweak\b/ ||
+		     $line =~ /\b__weak\b/)) {
+			ERROR("WEAK_DECLARATION",
+			      "Using weak declarations can have unintended link defects\n" . $herecurr);
+		}
+
+# check for c99 types like uint8_t used outside of uapi/ and tools/
+		if (!$SOF &&
+		    $realfile !~ m@\binclude/uapi/@ &&
+		    $realfile !~ m@\btools/@ &&
+		    $line =~ /\b($Declare)\s*$Ident\s*[=;,\[]/) {
+			my $type = $1;
+			if ($type =~ /\b($typeC99Typedefs)\b/) {
+				$type = $1;
+				my $kernel_type = 'u';
+				$kernel_type = 's' if ($type =~ /^_*[si]/);
+				$type =~ /(\d+)/;
+				$kernel_type .= $1;
+				if (CHK("PREFER_KERNEL_TYPES",
+					"Prefer kernel type '$kernel_type' over '$type'\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/\b$type\b/$kernel_type/;
+				}
+			}
+		}
+
+# check for cast of C90 native int or longer types constants
+		if ($line =~ /(\(\s*$C90_int_types\s*\)\s*)($Constant)\b/) {
+			my $cast = $1;
+			my $const = $2;
+			if (WARN("TYPECAST_INT_CONSTANT",
+				 "Unnecessary typecast of c90 int constant\n" . $herecurr) &&
+			    $fix) {
+				my $suffix = "";
+				my $newconst = $const;
+				$newconst =~ s/${Int_type}$//;
+				$suffix .= 'U' if ($cast =~ /\bunsigned\b/);
+				if ($cast =~ /\blong\s+long\b/) {
+					$suffix .= 'LL';
+				} elsif ($cast =~ /\blong\b/) {
+					$suffix .= 'L';
+				}
+				$fixed[$fixlinenr] =~ s/\Q$cast\E$const\b/$newconst$suffix/;
+			}
+		}
+
+# check for sizeof(&)
+		if ($line =~ /\bsizeof\s*\(\s*\&/) {
+			WARN("SIZEOF_ADDRESS",
+			     "sizeof(& should be avoided\n" . $herecurr);
+		}
+
+# check for sizeof without parenthesis
+		if ($line =~ /\bsizeof\s+((?:\*\s*|)$Lval|$Type(?:\s+$Lval|))/) {
+			if (WARN("SIZEOF_PARENTHESIS",
+				 "sizeof $1 should be sizeof($1)\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\bsizeof\s+((?:\*\s*|)$Lval|$Type(?:\s+$Lval|))/"sizeof(" . trim($1) . ")"/ex;
+			}
+		}
+
+# check for struct spinlock declarations
+		if ($line =~ /^.\s*\bstruct\s+spinlock\s+\w+\s*;/) {
+			WARN("USE_SPINLOCK_T",
+			     "struct spinlock should be spinlock_t\n" . $herecurr);
+		}
+
+# check for seq_printf uses that could be seq_puts
+		if ($sline =~ /\bseq_printf\s*\(.*"\s*\)\s*;\s*$/) {
+			my $fmt = get_quoted_string($line, $rawline);
+			$fmt =~ s/%%//g;
+			if ($fmt !~ /%/) {
+				if (WARN("PREFER_SEQ_PUTS",
+					 "Prefer seq_puts to seq_printf\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/\bseq_printf\b/seq_puts/;
+				}
+			}
+		}
+
+# check for memcpy uses that should be memcpy_s
+		if ($SOF && ($line =~ /memcpy\s*\(.*/)) {
+			my $fmt = get_quoted_string($line, $rawline);
+			$fmt =~ s/%%//g;
+			if ($fmt !~ /%/) {
+				if (WARN("PREFER_MEMCPY_S",
+					 "Use safe version of memcpy - memcpy_s whenever possible\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/memcpy\b/memcpy_s/;
+				}
+			}
+		}
+
+# check for vsprintf extension %p<foo> misuses
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $stat =~ /^\+(?![^\{]*\{\s*).*\b(\w+)\s*\(.*$String\s*,/s &&
+		    $1 !~ /^_*volatile_*$/) {
+			my $stat_real;
+
+			my $lc = $stat =~ tr@\n@@;
+			$lc = $lc + $linenr;
+		        for (my $count = $linenr; $count <= $lc; $count++) {
+				my $specifier;
+				my $extension;
+				my $bad_specifier = "";
+				my $fmt = get_quoted_string($lines[$count - 1], raw_line($count, 0));
+				$fmt =~ s/%%//g;
+
+				while ($fmt =~ /(\%[\*\d\.]*p(\w))/g) {
+					$specifier = $1;
+					$extension = $2;
+					if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOxt]/) {
+						$bad_specifier = $specifier;
+						last;
+					}
+					if ($extension eq "x" && !defined($stat_real)) {
+						if (!defined($stat_real)) {
+							$stat_real = get_stat_real($linenr, $lc);
+						}
+						WARN("VSPRINTF_SPECIFIER_PX",
+						     "Using vsprintf specifier '\%px' potentially exposes the kernel memory layout, if you don't really need the address please consider using '\%p'.\n" . "$here\n$stat_real\n");
+					}
+				}
+				if ($bad_specifier ne "") {
+					my $stat_real = get_stat_real($linenr, $lc);
+					my $ext_type = "Invalid";
+					my $use = "";
+					if ($bad_specifier =~ /p[Ff]/) {
+						$ext_type = "Deprecated";
+						$use = " - use %pS instead";
+						$use =~ s/pS/ps/ if ($bad_specifier =~ /pf/);
+					}
+
+					WARN("VSPRINTF_POINTER_EXTENSION",
+					     "$ext_type vsprintf pointer extension '$bad_specifier'$use\n" . "$here\n$stat_real\n");
+				}
+			}
+		}
+
+# Check for misused memsets
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/) {
+
+			my $ms_addr = $2;
+			my $ms_val = $7;
+			my $ms_size = $12;
+
+			if ($ms_size =~ /^(0x|)0$/i) {
+				ERROR("MEMSET",
+				      "memset to 0's uses 0 as the 2nd argument, not the 3rd\n" . "$here\n$stat\n");
+			} elsif ($ms_size =~ /^(0x|)1$/i) {
+				WARN("MEMSET",
+				     "single byte memset is suspicious. Swapped 2nd/3rd argument?\n" . "$here\n$stat\n");
+			}
+		}
+
+# Check for memcpy(foo, bar, ETH_ALEN) that could be ether_addr_copy(foo, bar)
+#		if ($perl_version_ok &&
+#		    defined $stat &&
+#		    $stat =~ /^\+(?:.*?)\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
+#			if (WARN("PREFER_ETHER_ADDR_COPY",
+#				 "Prefer ether_addr_copy() over memcpy() if the Ethernet addresses are __aligned(2)\n" . "$here\n$stat\n") &&
+#			    $fix) {
+#				$fixed[$fixlinenr] =~ s/\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/ether_addr_copy($2, $7)/;
+#			}
+#		}
+
+# Check for memcmp(foo, bar, ETH_ALEN) that could be ether_addr_equal*(foo, bar)
+#		if ($perl_version_ok &&
+#		    defined $stat &&
+#		    $stat =~ /^\+(?:.*?)\bmemcmp\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
+#			WARN("PREFER_ETHER_ADDR_EQUAL",
+#			     "Prefer ether_addr_equal() or ether_addr_equal_unaligned() over memcmp()\n" . "$here\n$stat\n")
+#		}
+
+# check for memset(foo, 0x0, ETH_ALEN) that could be eth_zero_addr
+# check for memset(foo, 0xFF, ETH_ALEN) that could be eth_broadcast_addr
+#		if ($perl_version_ok &&
+#		    defined $stat &&
+#		    $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
+#
+#			my $ms_val = $7;
+#
+#			if ($ms_val =~ /^(?:0x|)0+$/i) {
+#				if (WARN("PREFER_ETH_ZERO_ADDR",
+#					 "Prefer eth_zero_addr over memset()\n" . "$here\n$stat\n") &&
+#				    $fix) {
+#					$fixed[$fixlinenr] =~ s/\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*,\s*ETH_ALEN\s*\)/eth_zero_addr($2)/;
+#				}
+#			} elsif ($ms_val =~ /^(?:0xff|255)$/i) {
+#				if (WARN("PREFER_ETH_BROADCAST_ADDR",
+#					 "Prefer eth_broadcast_addr() over memset()\n" . "$here\n$stat\n") &&
+#				    $fix) {
+#					$fixed[$fixlinenr] =~ s/\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*,\s*ETH_ALEN\s*\)/eth_broadcast_addr($2)/;
+#				}
+#			}
+#		}
+
+# typecasts on min/max could be min_t/max_t
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $stat =~ /^\+(?:.*?)\b(min|max)\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\)/) {
+			if (defined $2 || defined $7) {
+				my $call = $1;
+				my $cast1 = deparenthesize($2);
+				my $arg1 = $3;
+				my $cast2 = deparenthesize($7);
+				my $arg2 = $8;
+				my $cast;
+
+				if ($cast1 ne "" && $cast2 ne "" && $cast1 ne $cast2) {
+					$cast = "$cast1 or $cast2";
+				} elsif ($cast1 ne "") {
+					$cast = $cast1;
+				} else {
+					$cast = $cast2;
+				}
+				WARN("MINMAX",
+				     "$call() should probably be ${call}_t($cast, $arg1, $arg2)\n" . "$here\n$stat\n");
+			}
+		}
+
+# check usleep_range arguments
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $stat =~ /^\+(?:.*?)\busleep_range\s*\(\s*($FuncArg)\s*,\s*($FuncArg)\s*\)/) {
+			my $min = $1;
+			my $max = $7;
+			if ($min eq $max) {
+				WARN("USLEEP_RANGE",
+				     "usleep_range should not use min == max args; see Documentation/timers/timers-howto.rst\n" . "$here\n$stat\n");
+			} elsif ($min =~ /^\d+$/ && $max =~ /^\d+$/ &&
+				 $min > $max) {
+				WARN("USLEEP_RANGE",
+				     "usleep_range args reversed, use min then max; see Documentation/timers/timers-howto.rst\n" . "$here\n$stat\n");
+			}
+		}
+
+# check for naked sscanf
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $line =~ /\bsscanf\b/ &&
+		    ($stat !~ /$Ident\s*=\s*sscanf\s*$balanced_parens/ &&
+		     $stat !~ /\bsscanf\s*$balanced_parens\s*(?:$Compare)/ &&
+		     $stat !~ /(?:$Compare)\s*\bsscanf\s*$balanced_parens/)) {
+			my $lc = $stat =~ tr@\n@@;
+			$lc = $lc + $linenr;
+			my $stat_real = get_stat_real($linenr, $lc);
+			WARN("NAKED_SSCANF",
+			     "unchecked sscanf return value\n" . "$here\n$stat_real\n");
+		}
+
+# check for simple sscanf that should be kstrto<foo>
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $line =~ /\bsscanf\b/) {
+			my $lc = $stat =~ tr@\n@@;
+			$lc = $lc + $linenr;
+			my $stat_real = get_stat_real($linenr, $lc);
+			if ($stat_real =~ /\bsscanf\b\s*\(\s*$FuncArg\s*,\s*("[^"]+")/) {
+				my $format = $6;
+				my $count = $format =~ tr@%@%@;
+				if ($count == 1 &&
+				    $format =~ /^"\%(?i:ll[udxi]|[udxi]ll|ll|[hl]h?[udxi]|[udxi][hl]h?|[hl]h?|[udxi])"$/) {
+					WARN("SSCANF_TO_KSTRTO",
+					     "Prefer kstrto<type> to single variable sscanf\n" . "$here\n$stat_real\n");
+				}
+			}
+		}
+
+# check for new externs in .h files.
+		if ($realfile =~ /\.h$/ &&
+		    $line =~ /^\+\s*(extern\s+)$Type\s*$Ident\s*\(/s) {
+			if (CHK("AVOID_EXTERNS",
+				"extern prototypes should be avoided in .h files\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/(.*)\bextern\b\s*(.*)/$1$2/;
+			}
+		}
+
+# check for new externs in .c files.
+		if ($realfile =~ /\.c$/ && defined $stat &&
+		    $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s)
+		{
+			my $function_name = $1;
+			my $paren_space = $2;
+
+			my $s = $stat;
+			if (defined $cond) {
+				substr($s, 0, length($cond), '');
+			}
+			if ($s =~ /^\s*;/ &&
+			    $function_name ne 'uninitialized_var')
+			{
+				WARN("AVOID_EXTERNS",
+				     "externs should be avoided in .c files\n" .  $herecurr);
+			}
+
+			if ($paren_space =~ /\n/) {
+				WARN("FUNCTION_ARGUMENTS",
+				     "arguments for function declarations should follow identifier\n" . $herecurr);
+			}
+
+		} elsif ($realfile =~ /\.c$/ && defined $stat &&
+		    $stat =~ /^.\s*extern\s+/)
+		{
+			WARN("AVOID_EXTERNS",
+			     "externs should be avoided in .c files\n" .  $herecurr);
+		}
+
+# check for function declarations that have arguments without identifier names
+		if (defined $stat &&
+		    $stat =~ /^.\s*(?:extern\s+)?$Type\s*(?:$Ident|\(\s*\*\s*$Ident\s*\))\s*\(\s*([^{]+)\s*\)\s*;/s &&
+		    $1 ne "void") {
+			my $args = trim($1);
+			while ($args =~ m/\s*($Type\s*(?:$Ident|\(\s*\*\s*$Ident?\s*\)\s*$balanced_parens)?)/g) {
+				my $arg = trim($1);
+				if ($arg =~ /^$Type$/ && $arg !~ /enum\s+$Ident$/) {
+					WARN("FUNCTION_ARGUMENTS",
+					     "function definition argument '$arg' should also have an identifier name\n" . $herecurr);
+				}
+			}
+		}
+
+# check for function definitions
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $stat =~ /^.\s*(?:$Storage\s+)?$Type\s*($Ident)\s*$balanced_parens\s*{/s) {
+			$context_function = $1;
+
+# check for multiline function definition with misplaced open brace
+			my $ok = 0;
+			my $cnt = statement_rawlines($stat);
+			my $herectx = $here . "\n";
+			for (my $n = 0; $n < $cnt; $n++) {
+				my $rl = raw_line($linenr, $n);
+				$herectx .=  $rl . "\n";
+				$ok = 1 if ($rl =~ /^[ \+]\{/);
+				$ok = 1 if ($rl =~ /\{/ && $n == 0);
+				last if $rl =~ /^[ \+].*\{/;
+			}
+			if (!$ok) {
+				ERROR("OPEN_BRACE",
+				      "open brace '{' following function definitions go on the next line\n" . $herectx);
+			}
+		}
+
+# checks for new __setup's
+		if ($rawline =~ /\b__setup\("([^"]*)"/) {
+			my $name = $1;
+
+			if (!grep(/$name/, @setup_docs)) {
+				CHK("UNDOCUMENTED_SETUP",
+				    "__setup appears un-documented -- check Documentation/admin-guide/kernel-parameters.rst\n" . $herecurr);
+			}
+		}
+
+# check for pointless casting of alloc functions
+		if ($line =~ /\*\s*\)\s*$allocFunctions\b/) {
+			WARN("UNNECESSARY_CASTS",
+			     "unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr);
+		}
+
+# alloc style
+# p = alloc(sizeof(struct foo), ...) should be p = alloc(sizeof(*p), ...)
+		if ($perl_version_ok &&
+		    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k|v)[mz]alloc(?:_node)?)\s*\(\s*(sizeof\s*\(\s*struct\s+$Lval\s*\))/) {
+			CHK("ALLOC_SIZEOF_STRUCT",
+			    "Prefer $3(sizeof(*$1)...) over $3($4...)\n" . $herecurr);
+		}
+
+# check for k[mz]alloc with multiplies that could be kmalloc_array/kcalloc
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $stat =~ /^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,/) {
+			my $oldfunc = $3;
+			my $a1 = $4;
+			my $a2 = $10;
+			my $newfunc = "kmalloc_array";
+			$newfunc = "kcalloc" if ($oldfunc eq "kzalloc");
+			my $r1 = $a1;
+			my $r2 = $a2;
+			if ($a1 =~ /^sizeof\s*\S/) {
+				$r1 = $a2;
+				$r2 = $a1;
+			}
+			if ($r1 !~ /^sizeof\b/ && $r2 =~ /^sizeof\s*\S/ &&
+			    !($r1 =~ /^$Constant$/ || $r1 =~ /^[A-Z_][A-Z0-9_]*$/)) {
+				my $cnt = statement_rawlines($stat);
+				my $herectx = get_stat_here($linenr, $cnt, $here);
+
+				if (WARN("ALLOC_WITH_MULTIPLY",
+					 "Prefer $newfunc over $oldfunc with multiply\n" . $herectx) &&
+				    $cnt == 1 &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/$1 . ' = ' . "$newfunc(" . trim($r1) . ', ' . trim($r2)/e;
+				}
+			}
+		}
+
+# check for krealloc arg reuse
+		if ($perl_version_ok &&
+		    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*($Lval)\s*,/ &&
+		    $1 eq $3) {
+			WARN("KREALLOC_ARG_REUSE",
+			     "Reusing the krealloc arg is almost always a bug\n" . $herecurr);
+		}
+
+# check for alloc argument mismatch
+		if ($line =~ /\b(kcalloc|kmalloc_array)\s*\(\s*sizeof\b/) {
+			WARN("ALLOC_ARRAY_ARGS",
+			     "$1 uses number as first arg, sizeof is generally wrong\n" . $herecurr);
+		}
+
+# check for multiple semicolons
+		if ($line =~ /;\s*;\s*$/) {
+			if (WARN("ONE_SEMICOLON",
+				 "Statements terminations use 1 semicolon\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/(\s*;\s*){2,}$/;/g;
+			}
+		}
+
+# check for #defines like: 1 << <digit> that could be BIT(digit), it is not exported to uapi
+		if ($realfile !~ m@^include/uapi/@ &&
+		    $line =~ /#\s*define\s+\w+\s+\(?\s*1\s*([ulUL]*)\s*\<\<\s*(?:\d+|$Ident)\s*\)?/) {
+			my $ull = "";
+			$ull = "_ULL" if (defined($1) && $1 =~ /ll/i);
+			if (CHK("BIT_MACRO",
+				"Prefer using the BIT$ull macro\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\(?\s*1\s*[ulUL]*\s*<<\s*(\d+|$Ident)\s*\)?/BIT${ull}($1)/;
+			}
+		}
+
+# check for #if defined CONFIG_<FOO> || defined CONFIG_<FOO>_MODULE
+		if ($line =~ /^\+\s*#\s*if\s+defined(?:\s*\(?\s*|\s+)(CONFIG_[A-Z_]+)\s*\)?\s*\|\|\s*defined(?:\s*\(?\s*|\s+)\1_MODULE\s*\)?\s*$/) {
+			my $config = $1;
+			if (WARN("PREFER_IS_ENABLED",
+				 "Prefer IS_ENABLED(<FOO>) to CONFIG_<FOO> || CONFIG_<FOO>_MODULE\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] = "\+#if IS_ENABLED($config)";
+			}
+		}
+
+# check for case / default statements not preceded by break/fallthrough/switch
+		if ($line =~ /^.\s*(?:case\s+(?:$Ident|$Constant)\s*|default):/) {
+			my $has_break = 0;
+			my $has_statement = 0;
+			my $count = 0;
+			my $prevline = $linenr;
+			while ($prevline > 1 && ($file || $count < 3) && !$has_break) {
+				$prevline--;
+				my $rline = $rawlines[$prevline - 1];
+				my $fline = $lines[$prevline - 1];
+				last if ($fline =~ /^\@\@/);
+				next if ($fline =~ /^\-/);
+				next if ($fline =~ /^.(?:\s*(?:case\s+(?:$Ident|$Constant)[\s$;]*|default):[\s$;]*)*$/);
+				$has_break = 1 if ($rline =~ /fall[\s_-]*(through|thru)/i);
+				next if ($fline =~ /^.[\s$;]*$/);
+				$has_statement = 1;
+				$count++;
+				$has_break = 1 if ($fline =~ /\bswitch\b|\b(?:break\s*;[\s$;]*$|exit\s*\(\b|return\b|goto\b|continue\b)/);
+			}
+			if (!$has_break && $has_statement) {
+				WARN("MISSING_BREAK",
+				     "Possible switch case/default not preceded by break or fallthrough comment\n" . $herecurr);
+			}
+		}
+
+# check for switch/default statements without a break;
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $stat =~ /^\+[$;\s]*(?:case[$;\s]+\w+[$;\s]*:[$;\s]*|)*[$;\s]*\bdefault[$;\s]*:[$;\s]*;/g) {
+			my $cnt = statement_rawlines($stat);
+			my $herectx = get_stat_here($linenr, $cnt, $here);
+
+			WARN("DEFAULT_NO_BREAK",
+			     "switch default: should use break\n" . $herectx);
+		}
+
+# check for gcc specific __FUNCTION__
+		if ($line =~ /\b__FUNCTION__\b/) {
+			if (WARN("USE_FUNC",
+				 "__func__ should be used instead of gcc specific __FUNCTION__\n"  . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\b__FUNCTION__\b/__func__/g;
+			}
+		}
+
+# check for uses of __DATE__, __TIME__, __TIMESTAMP__
+		while ($line =~ /\b(__(?:DATE|TIME|TIMESTAMP)__)\b/g) {
+			ERROR("DATE_TIME",
+			      "Use of the '$1' macro makes the build non-deterministic\n" . $herecurr);
+		}
+
+# check for use of yield()
+		if ($line =~ /\byield\s*\(\s*\)/) {
+			WARN("YIELD",
+			     "Using yield() is generally wrong. See yield() kernel-doc (sched/core.c)\n"  . $herecurr);
+		}
+
+# check for comparisons against true and false
+		if ($line =~ /\+\s*(.*?)\b(true|false|$Lval)\s*(==|\!=)\s*(true|false|$Lval)\b(.*)$/i) {
+			my $lead = $1;
+			my $arg = $2;
+			my $test = $3;
+			my $otype = $4;
+			my $trail = $5;
+			my $op = "!";
+
+			($arg, $otype) = ($otype, $arg) if ($arg =~ /^(?:true|false)$/i);
+
+			my $type = lc($otype);
+			if ($type =~ /^(?:true|false)$/) {
+				if (("$test" eq "==" && "$type" eq "true") ||
+				    ("$test" eq "!=" && "$type" eq "false")) {
+					$op = "";
+				}
+
+				CHK("BOOL_COMPARISON",
+				    "Using comparison to $otype is error prone\n" . $herecurr);
+
+## maybe suggesting a correct construct would better
+##				    "Using comparison to $otype is error prone.  Perhaps use '${lead}${op}${arg}${trail}'\n" . $herecurr);
+
+			}
+		}
+
+# check for semaphores initialized locked
+		if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) {
+			WARN("CONSIDER_COMPLETION",
+			     "consider using a completion\n" . $herecurr);
+		}
+
+# recommend kstrto* over simple_strto* and strict_strto*
+		if ($line =~ /\b((simple|strict)_(strto(l|ll|ul|ull)))\s*\(/) {
+			WARN("CONSIDER_KSTRTO",
+			     "$1 is obsolete, use k$3 instead\n" . $herecurr);
+		}
+
+# check for __initcall(), use device_initcall() explicitly or more appropriate function please
+		if ($line =~ /^.\s*__initcall\s*\(/) {
+			WARN("USE_DEVICE_INITCALL",
+			     "please use device_initcall() or more appropriate function instead of __initcall() (see include/linux/init.h)\n" . $herecurr);
+		}
+
+# check for spin_is_locked(), suggest lockdep instead
+		if ($line =~ /\bspin_is_locked\(/) {
+			WARN("USE_LOCKDEP",
+			     "Where possible, use lockdep_assert_held instead of assertions based on spin_is_locked\n" . $herecurr);
+		}
+
+# check for deprecated apis
+		if ($line =~ /\b($deprecated_apis_search)\b\s*\(/) {
+			my $deprecated_api = $1;
+			my $new_api = $deprecated_apis{$deprecated_api};
+			WARN("DEPRECATED_API",
+			     "Deprecated use of '$deprecated_api', prefer '$new_api' instead\n" . $herecurr);
+		}
+
+# check for various structs that are normally const (ops, kgdb, device_tree)
+# and avoid what seem like struct definitions 'struct foo {'
+		if ($line !~ /\bconst\b/ &&
+		    $line =~ /\bstruct\s+($const_structs)\b(?!\s*\{)/) {
+			WARN("CONST_STRUCT",
+			     "struct $1 should normally be const\n" . $herecurr);
+		}
+
+# use of NR_CPUS is usually wrong
+# ignore definitions of NR_CPUS and usage to define arrays as likely right
+		if ($line =~ /\bNR_CPUS\b/ &&
+		    $line !~ /^.\s*\s*#\s*if\b.*\bNR_CPUS\b/ &&
+		    $line !~ /^.\s*\s*#\s*define\b.*\bNR_CPUS\b/ &&
+		    $line !~ /^.\s*$Declare\s.*\[[^\]]*NR_CPUS[^\]]*\]/ &&
+		    $line !~ /\[[^\]]*\.\.\.[^\]]*NR_CPUS[^\]]*\]/ &&
+		    $line !~ /\[[^\]]*NR_CPUS[^\]]*\.\.\.[^\]]*\]/)
+		{
+			WARN("NR_CPUS",
+			     "usage of NR_CPUS is often wrong - consider using cpu_possible(), num_possible_cpus(), for_each_possible_cpu(), etc\n" . $herecurr);
+		}
+
+# Use of __ARCH_HAS_<FOO> or ARCH_HAVE_<BAR> is wrong.
+		if ($line =~ /\+\s*#\s*define\s+((?:__)?ARCH_(?:HAS|HAVE)\w*)\b/) {
+			ERROR("DEFINE_ARCH_HAS",
+			      "#define of '$1' is wrong - use Kconfig variables or standard guards instead\n" . $herecurr);
+		}
+
+# likely/unlikely comparisons similar to "(likely(foo) > 0)"
+		if ($perl_version_ok &&
+		    $line =~ /\b((?:un)?likely)\s*\(\s*$FuncArg\s*\)\s*$Compare/) {
+			WARN("LIKELY_MISUSE",
+			     "Using $1 should generally have parentheses around the comparison\n" . $herecurr);
+		}
+
+# nested likely/unlikely calls
+		if ($line =~ /\b(?:(?:un)?likely)\s*\(\s*!?\s*(IS_ERR(?:_OR_NULL|_VALUE)?|WARN)/) {
+			WARN("LIKELY_MISUSE",
+			     "nested (un)?likely() calls, $1 already uses unlikely() internally\n" . $herecurr);
+		}
+
+# whine mightly about in_atomic
+		if ($line =~ /\bin_atomic\s*\(/) {
+			if ($realfile =~ m@^drivers/@) {
+				ERROR("IN_ATOMIC",
+				      "do not use in_atomic in drivers\n" . $herecurr);
+			} elsif ($realfile !~ m@^kernel/@) {
+				WARN("IN_ATOMIC",
+				     "use of in_atomic() is incorrect outside core kernel code\n" . $herecurr);
+			}
+		}
+
+# check for mutex_trylock_recursive usage
+		if ($line =~ /mutex_trylock_recursive/) {
+			ERROR("LOCKING",
+			      "recursive locking is bad, do not use this ever.\n" . $herecurr);
+		}
+
+# check for lockdep_set_novalidate_class
+		if ($line =~ /^.\s*lockdep_set_novalidate_class\s*\(/ ||
+		    $line =~ /__lockdep_no_validate__\s*\)/ ) {
+			if ($realfile !~ m@^kernel/lockdep@ &&
+			    $realfile !~ m@^include/linux/lockdep@ &&
+			    $realfile !~ m@^drivers/base/core@) {
+				ERROR("LOCKDEP",
+				      "lockdep_no_validate class is reserved for device->mutex.\n" . $herecurr);
+			}
+		}
+
+		if ($line =~ /debugfs_create_\w+.*\b$mode_perms_world_writable\b/ ||
+		    $line =~ /DEVICE_ATTR.*\b$mode_perms_world_writable\b/) {
+			WARN("EXPORTED_WORLD_WRITABLE",
+			     "Exporting world writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr);
+		}
+
+# check for DEVICE_ATTR uses that could be DEVICE_ATTR_<FOO>
+# and whether or not function naming is typical and if
+# DEVICE_ATTR permissions uses are unusual too
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $stat =~ /\bDEVICE_ATTR\s*\(\s*(\w+)\s*,\s*\(?\s*(\s*(?:${multi_mode_perms_string_search}|0[0-7]{3,3})\s*)\s*\)?\s*,\s*(\w+)\s*,\s*(\w+)\s*\)/) {
+			my $var = $1;
+			my $perms = $2;
+			my $show = $3;
+			my $store = $4;
+			my $octal_perms = perms_to_octal($perms);
+			if ($show =~ /^${var}_show$/ &&
+			    $store =~ /^${var}_store$/ &&
+			    $octal_perms eq "0644") {
+				if (WARN("DEVICE_ATTR_RW",
+					 "Use DEVICE_ATTR_RW\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/\bDEVICE_ATTR\s*\(\s*$var\s*,\s*\Q$perms\E\s*,\s*$show\s*,\s*$store\s*\)/DEVICE_ATTR_RW(${var})/;
+				}
+			} elsif ($show =~ /^${var}_show$/ &&
+				 $store =~ /^NULL$/ &&
+				 $octal_perms eq "0444") {
+				if (WARN("DEVICE_ATTR_RO",
+					 "Use DEVICE_ATTR_RO\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/\bDEVICE_ATTR\s*\(\s*$var\s*,\s*\Q$perms\E\s*,\s*$show\s*,\s*NULL\s*\)/DEVICE_ATTR_RO(${var})/;
+				}
+			} elsif ($show =~ /^NULL$/ &&
+				 $store =~ /^${var}_store$/ &&
+				 $octal_perms eq "0200") {
+				if (WARN("DEVICE_ATTR_WO",
+					 "Use DEVICE_ATTR_WO\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/\bDEVICE_ATTR\s*\(\s*$var\s*,\s*\Q$perms\E\s*,\s*NULL\s*,\s*$store\s*\)/DEVICE_ATTR_WO(${var})/;
+				}
+			} elsif ($octal_perms eq "0644" ||
+				 $octal_perms eq "0444" ||
+				 $octal_perms eq "0200") {
+				my $newshow = "$show";
+				$newshow = "${var}_show" if ($show ne "NULL" && $show ne "${var}_show");
+				my $newstore = $store;
+				$newstore = "${var}_store" if ($store ne "NULL" && $store ne "${var}_store");
+				my $rename = "";
+				if ($show ne $newshow) {
+					$rename .= " '$show' to '$newshow'";
+				}
+				if ($store ne $newstore) {
+					$rename .= " '$store' to '$newstore'";
+				}
+				WARN("DEVICE_ATTR_FUNCTIONS",
+				     "Consider renaming function(s)$rename\n" . $herecurr);
+			} else {
+				WARN("DEVICE_ATTR_PERMS",
+				     "DEVICE_ATTR unusual permissions '$perms' used\n" . $herecurr);
+			}
+		}
+
+# Mode permission misuses where it seems decimal should be octal
+# This uses a shortcut match to avoid unnecessary uses of a slow foreach loop
+# o Ignore module_param*(...) uses with a decimal 0 permission as that has a
+#   specific definition of not visible in sysfs.
+# o Ignore proc_create*(...) uses with a decimal 0 permission as that means
+#   use the default permissions
+		if ($perl_version_ok &&
+		    defined $stat &&
+		    $line =~ /$mode_perms_search/) {
+			foreach my $entry (@mode_permission_funcs) {
+				my $func = $entry->[0];
+				my $arg_pos = $entry->[1];
+
+				my $lc = $stat =~ tr@\n@@;
+				$lc = $lc + $linenr;
+				my $stat_real = get_stat_real($linenr, $lc);
+
+				my $skip_args = "";
+				if ($arg_pos > 1) {
+					$arg_pos--;
+					$skip_args = "(?:\\s*$FuncArg\\s*,\\s*){$arg_pos,$arg_pos}";
+				}
+				my $test = "\\b$func\\s*\\(${skip_args}($FuncArg(?:\\|\\s*$FuncArg)*)\\s*[,\\)]";
+				if ($stat =~ /$test/) {
+					my $val = $1;
+					$val = $6 if ($skip_args ne "");
+					if (!($func =~ /^(?:module_param|proc_create)/ && $val eq "0") &&
+					    (($val =~ /^$Int$/ && $val !~ /^$Octal$/) ||
+					     ($val =~ /^$Octal$/ && length($val) ne 4))) {
+						ERROR("NON_OCTAL_PERMISSIONS",
+						      "Use 4 digit octal (0777) not decimal permissions\n" . "$here\n" . $stat_real);
+					}
+					if ($val =~ /^$Octal$/ && (oct($val) & 02)) {
+						ERROR("EXPORTED_WORLD_WRITABLE",
+						      "Exporting writable files is usually an error. Consider more restrictive permissions.\n" . "$here\n" . $stat_real);
+					}
+				}
+			}
+		}
+
+# check for uses of S_<PERMS> that could be octal for readability
+		while ($line =~ m{\b($multi_mode_perms_string_search)\b}g) {
+			my $oval = $1;
+			my $octal = perms_to_octal($oval);
+			if (WARN("SYMBOLIC_PERMS",
+				 "Symbolic permissions '$oval' are not preferred. Consider using octal permissions '$octal'.\n" . $herecurr) &&
+			    $fix) {
+				$fixed[$fixlinenr] =~ s/\Q$oval\E/$octal/;
+			}
+		}
+
+# validate content of MODULE_LICENSE against list from include/linux/module.h
+		if ($line =~ /\bMODULE_LICENSE\s*\(\s*($String)\s*\)/) {
+			my $extracted_string = get_quoted_string($line, $rawline);
+			my $valid_licenses = qr{
+						GPL|
+						GPL\ v2|
+						GPL\ and\ additional\ rights|
+						Dual\ BSD/GPL|
+						Dual\ MIT/GPL|
+						Dual\ MPL/GPL|
+						Proprietary
+					}x;
+			if ($extracted_string !~ /^"(?:$valid_licenses)"$/x) {
+				WARN("MODULE_LICENSE",
+				     "unknown module license " . $extracted_string . "\n" . $herecurr);
+			}
+		}
+
+# check for sysctl duplicate constants
+		if ($line =~ /\.extra[12]\s*=\s*&(zero|one|int_max)\b/) {
+			WARN("DUPLICATED_SYSCTL_CONST",
+				"duplicated sysctl range checking value '$1', consider using the shared one in include/linux/sysctl.h\n" . $herecurr);
+		}
+	}
+
+	# If we have no input at all, then there is nothing to report on
+	# so just keep quiet.
+	if ($#rawlines == -1) {
+		exit(0);
+	}
+
+	# In mailback mode only produce a report in the negative, for
+	# things that appear to be patches.
+	if ($mailback && ($clean == 1 || !$is_patch)) {
+		exit(0);
+	}
+
+	# This is not a patch, and we are are in 'no-patch' mode so
+	# just keep quiet.
+	if (!$chk_patch && !$is_patch) {
+		exit(0);
+	}
+
+	if (!$is_patch && $filename !~ /cover-letter\.patch$/) {
+		ERROR("NOT_UNIFIED_DIFF",
+		      "Does not appear to be a unified-diff format patch\n");
+	}
+	if ($is_patch && $has_commit_log && $chk_signoff) {
+		if ($signoff == 0) {
+			ERROR("MISSING_SIGN_OFF",
+			      "Missing Signed-off-by: line(s)\n");
+		} elsif (!$authorsignoff) {
+			WARN("NO_AUTHOR_SIGN_OFF",
+			     "Missing Signed-off-by: line by nominal patch author '$author'\n");
+		}
+	}
+
+	print report_dump();
+	if ($summary && !($clean == 1 && $quiet == 1)) {
+		print "$filename " if ($summary_file);
+		print "total: $cnt_error errors, $cnt_warn warnings, " .
+			(($check)? "$cnt_chk checks, " : "") .
+			"$cnt_lines lines checked\n";
+	}
+
+	if ($quiet == 0) {
+		# If there were any defects found and not already fixing them
+		if (!$clean and !$fix) {
+			print << "EOM"
+
+NOTE: For some of the reported defects, checkpatch may be able to
+      mechanically convert to the typical style using --fix or --fix-inplace.
+EOM
+		}
+		# If there were whitespace errors which cleanpatch can fix
+		# then suggest that.
+		if ($rpt_cleaners) {
+			$rpt_cleaners = 0;
+			print << "EOM"
+
+NOTE: Whitespace errors detected.
+      You may wish to use scripts/cleanpatch or scripts/cleanfile
+EOM
+		}
+	}
+
+	if ($clean == 0 && $fix &&
+	    ("@rawlines" ne "@fixed" ||
+	     $#fixed_inserted >= 0 || $#fixed_deleted >= 0)) {
+		my $newfile = $filename;
+		$newfile .= ".EXPERIMENTAL-checkpatch-fixes" if (!$fix_inplace);
+		my $linecount = 0;
+		my $f;
+
+		@fixed = fix_inserted_deleted_lines(\@fixed, \@fixed_inserted, \@fixed_deleted);
+
+		open($f, '>', $newfile)
+		    or die "$P: Can't open $newfile for write\n";
+		foreach my $fixed_line (@fixed) {
+			$linecount++;
+			if ($file) {
+				if ($linecount > 3) {
+					$fixed_line =~ s/^\+//;
+					print $f $fixed_line . "\n";
+				}
+			} else {
+				print $f $fixed_line . "\n";
+			}
+		}
+		close($f);
+
+		if (!$quiet) {
+			print << "EOM";
+
+Wrote EXPERIMENTAL --fix correction(s) to '$newfile'
+
+Do _NOT_ trust the results written to this file.
+Do _NOT_ submit these changes without inspecting them for correctness.
+
+This EXPERIMENTAL file is simply a convenience to help rewrite patches.
+No warranties, expressed or implied...
+EOM
+		}
+	}
+
+	if ($quiet == 0) {
+		print "\n";
+		if ($clean == 1) {
+			print "$vname has no obvious style problems and is ready for submission.\n";
+		} else {
+			print "$vname has style problems, please review.\n";
+		}
+	}
+	return $clean;
+}
diff --git a/tools/rimage/scripts/const_structs.checkpatch b/tools/rimage/scripts/const_structs.checkpatch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/rimage/scripts/spelling.txt b/tools/rimage/scripts/spelling.txt
new file mode 100644
index 000000000000..9a058cff49d4
--- /dev/null
+++ b/tools/rimage/scripts/spelling.txt
@@ -0,0 +1,1254 @@
+# Originally from Debian's Lintian tool. Various false positives have been
+# removed, and various additions have been made as they've been discovered
+# in the kernel source.
+#
+# License: GPLv2
+#
+# The format of each line is:
+# mistake||correction
+#
+abandonning||abandoning
+abigious||ambiguous
+abitrate||arbitrate
+abov||above
+abreviated||abbreviated
+absense||absence
+absolut||absolute
+absoulte||absolute
+acccess||access
+acceess||access
+acceleratoin||acceleration
+accelleration||acceleration
+accesing||accessing
+accesnt||accent
+accessable||accessible
+accesss||access
+accidentaly||accidentally
+accidentually||accidentally
+accoding||according
+accomodate||accommodate
+accomodates||accommodates
+accordign||according
+accoring||according
+accout||account
+accquire||acquire
+accquired||acquired
+accross||across
+acessable||accessible
+acess||access
+achitecture||architecture
+acient||ancient
+acitions||actions
+acitve||active
+acknowldegement||acknowledgment
+acknowledgement||acknowledgment
+ackowledge||acknowledge
+ackowledged||acknowledged
+acording||according
+activete||activate
+actived||activated
+actualy||actually
+acumulating||accumulating
+acumulator||accumulator
+adapater||adapter
+addional||additional
+additionaly||additionally
+additonal||additional
+addres||address
+adddress||address
+addreses||addresses
+addresss||address
+aditional||additional
+aditionally||additionally
+aditionaly||additionally
+adminstrative||administrative
+adress||address
+adresses||addresses
+adviced||advised
+afecting||affecting
+againt||against
+agaist||against
+aggreataon||aggregation
+aggreation||aggregation
+albumns||albums
+alegorical||allegorical
+algined||aligned
+algorith||algorithm
+algorithmical||algorithmically
+algoritm||algorithm
+algoritms||algorithms
+algorrithm||algorithm
+algorritm||algorithm
+aligment||alignment
+alignement||alignment
+allign||align
+alligned||aligned
+alllocate||allocate
+alloated||allocated
+allocatote||allocate
+allocatrd||allocated
+allocte||allocate
+allpication||application
+alocate||allocate
+alogirhtms||algorithms
+alogrithm||algorithm
+alot||a lot
+alow||allow
+alows||allows
+altough||although
+alue||value
+ambigious||ambiguous
+amoung||among
+amout||amount
+an union||a union
+an user||a user
+an userspace||a userspace
+an one||a one
+analysator||analyzer
+ang||and
+anniversery||anniversary
+annoucement||announcement
+anomolies||anomalies
+anomoly||anomaly
+anway||anyway
+aplication||application
+appearence||appearance
+applicaion||application
+appliction||application
+applictions||applications
+applys||applies
+appplications||applications
+appropiate||appropriate
+appropriatly||appropriately
+approriate||appropriate
+approriately||appropriately
+apropriate||appropriate
+aquainted||acquainted
+aquired||acquired
+aquisition||acquisition
+arbitary||arbitrary
+architechture||architecture
+arguement||argument
+arguements||arguments
+aritmetic||arithmetic
+arne't||aren't
+arraival||arrival
+artifical||artificial
+artillary||artillery
+asign||assign
+asser||assert
+assertation||assertion
+assiged||assigned
+assigment||assignment
+assigments||assignments
+assistent||assistant
+assocation||association
+associcated||associated
+assotiated||associated
+assum||assume
+assumtpion||assumption
+asuming||assuming
+asycronous||asynchronous
+asynchnous||asynchronous
+atomatically||automatically
+atomicly||atomically
+atempt||attempt
+attachement||attachment
+attched||attached
+attemps||attempts
+attemping||attempting
+attruibutes||attributes
+authentification||authentication
+automaticaly||automatically
+automaticly||automatically
+automatize||automate
+automatized||automated
+automatizes||automates
+autonymous||autonomous
+auxillary||auxiliary
+auxilliary||auxiliary
+avaiable||available
+avaible||available
+availabe||available
+availabled||available
+availablity||availability
+availale||available
+availavility||availability
+availble||available
+availiable||available
+availible||available
+avalable||available
+avaliable||available
+aysnc||async
+backgroud||background
+backword||backward
+backwords||backwards
+bahavior||behavior
+bakup||backup
+baloon||balloon
+baloons||balloons
+bandwith||bandwidth
+banlance||balance
+batery||battery
+beacuse||because
+becasue||because
+becomming||becoming
+becuase||because
+beeing||being
+befor||before
+begining||beginning
+beter||better
+betweeen||between
+bianries||binaries
+bitmast||bitmask
+boardcast||broadcast
+borad||board
+boundry||boundary
+brievely||briefly
+broadcat||broadcast
+cacluated||calculated
+caculation||calculation
+calender||calendar
+calescing||coalescing
+calle||called
+callibration||calibration
+calucate||calculate
+calulate||calculate
+cancelation||cancellation
+cancle||cancel
+capabilites||capabilities
+capabilty||capability
+capabitilies||capabilities
+capatibilities||capabilities
+capapbilities||capabilities
+carefuly||carefully
+cariage||carriage
+catagory||category
+cehck||check
+challange||challenge
+challanges||challenges
+chanell||channel
+changable||changeable
+chanined||chained
+channle||channel
+channnel||channel
+charachter||character
+charachters||characters
+charactor||character
+charater||character
+charaters||characters
+charcter||character
+chcek||check
+chck||check
+checksuming||checksumming
+childern||children
+childs||children
+chiled||child
+chked||checked
+chnage||change
+chnages||changes
+chnnel||channel
+choosen||chosen
+chouse||chose
+circumvernt||circumvent
+claread||cleared
+clared||cleared
+closeing||closing
+clustred||clustered
+coexistance||coexistence
+collapsable||collapsible
+colorfull||colorful
+comand||command
+comit||commit
+commerical||commercial
+comming||coming
+comminucation||communication
+commited||committed
+commiting||committing
+committ||commit
+commoditiy||commodity
+comsume||consume
+comsumer||consumer
+comsuming||consuming
+compability||compatibility
+compaibility||compatibility
+compatability||compatibility
+compatable||compatible
+compatibiliy||compatibility
+compatibilty||compatibility
+compatiblity||compatibility
+competion||completion
+compilant||compliant
+compleatly||completely
+completition||completion
+completly||completely
+complient||compliant
+componnents||components
+compoment||component
+compres||compress
+compresion||compression
+comression||compression
+comunication||communication
+conbination||combination
+conditionaly||conditionally
+conected||connected
+connecetd||connected
+configuartion||configuration
+configuratoin||configuration
+configuraton||configuration
+configuretion||configuration
+configutation||configuration
+conider||consider
+conjuction||conjunction
+connectinos||connections
+connnection||connection
+connnections||connections
+consistancy||consistency
+consistant||consistent
+containes||contains
+containts||contains
+contaisn||contains
+contant||contact
+contence||contents
+continious||continuous
+continous||continuous
+continously||continuously
+continueing||continuing
+contraints||constraints
+contol||control
+contoller||controller
+controled||controlled
+controler||controller
+controll||control
+contruction||construction
+contry||country
+conuntry||country
+convertion||conversion
+convertor||converter
+convienient||convenient
+convinient||convenient
+corected||corrected
+correponding||corresponding
+correponds||corresponds
+correspoding||corresponding
+cotrol||control
+cound||could
+couter||counter
+coutner||counter
+cryptocraphic||cryptographic
+cunter||counter
+curently||currently
+cylic||cyclic
+dafault||default
+deafult||default
+deamon||daemon
+decompres||decompress
+decription||description
+dectected||detected
+defailt||default
+defferred||deferred
+definate||definite
+definately||definitely
+defintion||definition
+defintions||definitions
+defualt||default
+defult||default
+deintializing||deinitializing
+deintialize||deinitialize
+deintialized||deinitialized
+deivce||device
+delared||declared
+delare||declare
+delares||declares
+delaring||declaring
+delemiter||delimiter
+demodualtor||demodulator
+demension||dimension
+dependancies||dependencies
+dependancy||dependency
+dependant||dependent
+depreacted||deprecated
+depreacte||deprecate
+desactivate||deactivate
+desciptor||descriptor
+desciptors||descriptors
+descripton||description
+descrition||description
+descritptor||descriptor
+desctiptor||descriptor
+desriptor||descriptor
+desriptors||descriptors
+destionation||destination
+destory||destroy
+destoryed||destroyed
+destorys||destroys
+destroied||destroyed
+detabase||database
+deteced||detected
+develope||develop
+developement||development
+developped||developed
+developpement||development
+developper||developer
+developpment||development
+deveolpment||development
+devided||divided
+deviece||device
+diable||disable
+dictionnary||dictionary
+didnt||didn't
+diferent||different
+differrence||difference
+diffrent||different
+diffrentiate||differentiate
+difinition||definition
+dimesions||dimensions
+diplay||display
+direectly||directly
+disassocation||disassociation
+disapear||disappear
+disapeared||disappeared
+disappared||disappeared
+disble||disable
+disbled||disabled
+disconnet||disconnect
+discontinous||discontinuous
+dispertion||dispersion
+dissapears||disappears
+distiction||distinction
+docuentation||documentation
+documantation||documentation
+documentaion||documentation
+documment||document
+doesnt||doesn't
+dorp||drop
+dosen||doesn
+downlad||download
+downlads||downloads
+druing||during
+dynmaic||dynamic
+easilly||easily
+ecspecially||especially
+edditable||editable
+editting||editing
+efective||effective
+efficently||efficiently
+ehther||ether
+eigth||eight
+elementry||elementary
+eletronic||electronic
+embeded||embedded
+enabledi||enabled
+enchanced||enhanced
+encorporating||incorporating
+encrupted||encrypted
+encrypiton||encryption
+encryptio||encryption
+endianess||endianness
+enhaced||enhanced
+enlightnment||enlightenment
+entrys||entries
+enocded||encoded
+enterily||entirely
+enviroiment||environment
+enviroment||environment
+environement||environment
+environent||environment
+eqivalent||equivalent
+equiped||equipped
+equivelant||equivalent
+equivilant||equivalent
+eror||error
+errorr||error
+estbalishment||establishment
+etsablishment||establishment
+etsbalishment||establishment
+excecutable||executable
+exceded||exceeded
+excellant||excellent
+exeed||exceed
+existance||existence
+existant||existent
+exixt||exist
+exlcude||exclude
+exlcusive||exclusive
+exmaple||example
+expecially||especially
+explicite||explicit
+explicitely||explicitly
+explict||explicit
+explictely||explicitly
+explictly||explicitly
+expresion||expression
+exprimental||experimental
+extened||extended
+extensability||extensibility
+extention||extension
+extracter||extractor
+falied||failed
+faild||failed
+faill||fail
+failied||failed
+faillure||failure
+failue||failure
+failuer||failure
+failng||failing
+faireness||fairness
+falied||failed
+faliure||failure
+fallbck||fallback
+familar||familiar
+fatser||faster
+feauture||feature
+feautures||features
+fetaure||feature
+fetaures||features
+fileystem||filesystem
+fimware||firmware
+firware||firmware
+finanize||finalize
+findn||find
+finilizes||finalizes
+finsih||finish
+flusing||flushing
+folloing||following
+followign||following
+followings||following
+follwing||following
+fonud||found
+forseeable||foreseeable
+forse||force
+fortan||fortran
+forwardig||forwarding
+framming||framing
+framwork||framework
+frequncy||frequency
+frome||from
+fucntion||function
+fuction||function
+fuctions||functions
+funcion||function
+functionallity||functionality
+functionaly||functionally
+functionnality||functionality
+functonality||functionality
+funtion||function
+funtions||functions
+furthur||further
+futhermore||furthermore
+futrue||future
+gaurenteed||guaranteed
+generiously||generously
+genereate||generate
+genric||generic
+globel||global
+grabing||grabbing
+grahical||graphical
+grahpical||graphical
+grapic||graphic
+grranted||granted
+guage||gauge
+guarenteed||guaranteed
+guarentee||guarantee
+halfs||halves
+hander||handler
+handfull||handful
+hanled||handled
+happend||happened
+harware||hardware
+heirarchically||hierarchically
+helpfull||helpful
+hybernate||hibernate
+hierachy||hierarchy
+hierarchie||hierarchy
+howver||however
+hsould||should
+hypervior||hypervisor
+hypter||hyper
+identidier||identifier
+iligal||illegal
+illigal||illegal
+imblance||imbalance
+immeadiately||immediately
+immedaite||immediate
+immediatelly||immediately
+immediatly||immediately
+immidiate||immediate
+impelentation||implementation
+impementated||implemented
+implemantation||implementation
+implemenation||implementation
+implementaiton||implementation
+implementated||implemented
+implemention||implementation
+implementd||implemented
+implemetation||implementation
+implemntation||implementation
+implentation||implementation
+implmentation||implementation
+implmenting||implementing
+incative||inactive
+incomming||incoming
+incompatabilities||incompatibilities
+incompatable||incompatible
+inconsistant||inconsistent
+increas||increase
+incremeted||incremented
+incrment||increment
+indendation||indentation
+indended||intended
+independant||independent
+independantly||independently
+independed||independent
+indiate||indicate
+indicat||indicate
+inexpect||inexpected
+infomation||information
+informatiom||information
+informations||information
+informtion||information
+infromation||information
+ingore||ignore
+inital||initial
+initalized||initialized
+initalised||initialized
+initalise||initialize
+initalize||initialize
+initation||initiation
+initators||initiators
+initialiazation||initialization
+initializiation||initialization
+initialzed||initialized
+initilization||initialization
+initilize||initialize
+inofficial||unofficial
+insititute||institute
+instal||install
+instanciated||instantiated
+inteface||interface
+integreated||integrated
+integrety||integrity
+integrey||integrity
+intendet||intended
+intented||intended
+interanl||internal
+interchangable||interchangeable
+interferring||interfering
+interger||integer
+intermittant||intermittent
+internel||internal
+interoprability||interoperability
+interuupt||interrupt
+interrface||interface
+interrrupt||interrupt
+interrup||interrupt
+interrups||interrupts
+interruptted||interrupted
+interupted||interrupted
+interupt||interrupt
+intial||initial
+intialisation||initialisation
+intialised||initialised
+intialise||initialise
+intialization||initialization
+intialized||initialized
+intialize||initialize
+intregral||integral
+intrrupt||interrupt
+intterrupt||interrupt
+intuative||intuitive
+invaid||invalid
+invald||invalid
+invalde||invalid
+invalide||invalid
+invalidiate||invalidate
+invalud||invalid
+invididual||individual
+invokation||invocation
+invokations||invocations
+irrelevent||irrelevant
+isnt||isn't
+isssue||issue
+iternations||iterations
+itertation||iteration
+itslef||itself
+jave||java
+jeffies||jiffies
+juse||just
+jus||just
+kown||known
+langage||language
+langauage||language
+langauge||language
+langugage||language
+lauch||launch
+layed||laid
+leightweight||lightweight
+lengh||length
+lenght||length
+lenth||length
+lesstiff||lesstif
+libaries||libraries
+libary||library
+librairies||libraries
+libraris||libraries
+licenceing||licencing
+loggging||logging
+loggin||login
+logile||logfile
+loosing||losing
+losted||lost
+machinary||machinery
+maintainance||maintenance
+maintainence||maintenance
+maintan||maintain
+makeing||making
+malplaced||misplaced
+malplace||misplace
+managable||manageable
+managment||management
+mangement||management
+manoeuvering||maneuvering
+mappping||mapping
+mathimatical||mathematical
+mathimatic||mathematic
+mathimatics||mathematics
+maxium||maximum
+mechamism||mechanism
+meetign||meeting
+ment||meant
+mergable||mergeable
+mesage||message
+messags||messages
+messgaes||messages
+messsage||message
+messsages||messages
+micropone||microphone
+microprocesspr||microprocessor
+milliseonds||milliseconds
+minium||minimum
+minimam||minimum
+minumum||minimum
+misalinged||misaligned
+miscelleneous||miscellaneous
+misformed||malformed
+mispelled||misspelled
+mispelt||misspelt
+mising||missing
+mismactch||mismatch
+missmanaged||mismanaged
+missmatch||mismatch
+miximum||maximum
+mmnemonic||mnemonic
+mnay||many
+modulues||modules
+momery||memory
+memomry||memory
+monochorome||monochrome
+monochromo||monochrome
+monocrome||monochrome
+mopdule||module
+mroe||more
+mulitplied||multiplied
+multidimensionnal||multidimensional
+multple||multiple
+mumber||number
+muticast||multicast
+mutilcast||multicast
+mutiple||multiple
+mutli||multi
+nams||names
+navagating||navigating
+nead||need
+neccecary||necessary
+neccesary||necessary
+neccessary||necessary
+necesary||necessary
+neded||needed
+negaive||negative
+negoitation||negotiation
+negotation||negotiation
+nerver||never
+nescessary||necessary
+nessessary||necessary
+noticable||noticeable
+notications||notifications
+notifed||notified
+numebr||number
+numner||number
+obtaion||obtain
+occassionally||occasionally
+occationally||occasionally
+occurance||occurrence
+occurances||occurrences
+occured||occurred
+occurence||occurrence
+occure||occurred
+occured||occurred
+occuring||occurring
+offet||offset
+omited||omitted
+omiting||omitting
+omitt||omit
+ommiting||omitting
+ommitted||omitted
+onself||oneself
+ony||only
+operatione||operation
+opertaions||operations
+optionnal||optional
+optmizations||optimizations
+orientatied||orientated
+orientied||oriented
+orignal||original
+otherise||otherwise
+ouput||output
+oustanding||outstanding
+overaall||overall
+overhread||overhead
+overlaping||overlapping
+overide||override
+overrided||overridden
+overriden||overridden
+overun||overrun
+overwritting||overwriting
+overwriten||overwritten
+pacakge||package
+pachage||package
+packacge||package
+packege||package
+packge||package
+packtes||packets
+pakage||package
+pallette||palette
+paln||plan
+paramameters||parameters
+paramaters||parameters
+paramater||parameter
+parametes||parameters
+parametised||parametrised
+paramter||parameter
+paramters||parameters
+particuarly||particularly
+particularily||particularly
+partiton||partition
+pased||passed
+passin||passing
+pathes||paths
+pecularities||peculiarities
+peformance||performance
+peice||piece
+pendantic||pedantic
+peprocessor||preprocessor
+perfoming||performing
+permissons||permissions
+peroid||period
+persistance||persistence
+persistant||persistent
+plalform||platform
+platfrom||platform
+plattform||platform
+pleaes||please
+ploting||plotting
+plugable||pluggable
+poinnter||pointer
+pointeur||pointer
+poiter||pointer
+posible||possible
+positon||position
+possibilites||possibilities
+powerfull||powerful
+preample||preamble
+preapre||prepare
+preceeded||preceded
+preceeding||preceding
+preceed||precede
+precendence||precedence
+precission||precision
+preemptable||preemptible
+prefered||preferred
+prefferably||preferably
+premption||preemption
+prepaired||prepared
+pressre||pressure
+primative||primitive
+princliple||principle
+priorty||priority
+privilaged||privileged
+privilage||privilege
+priviledge||privilege
+priviledges||privileges
+probaly||probably
+procceed||proceed
+proccesors||processors
+procesed||processed
+proces||process
+procesing||processing
+processessing||processing
+processess||processes
+processpr||processor
+processsed||processed
+processsing||processing
+procteted||protected
+prodecure||procedure
+progams||programs
+progess||progress
+programers||programmers
+programm||program
+programms||programs
+progresss||progress
+promiscous||promiscuous
+promps||prompts
+pronnounced||pronounced
+prononciation||pronunciation
+pronouce||pronounce
+pronunce||pronounce
+propery||property
+propigate||propagate
+propigation||propagation
+propogate||propagate
+prosess||process
+protable||portable
+protcol||protocol
+protecion||protection
+protocoll||protocol
+promixity||proximity
+psudo||pseudo
+psuedo||pseudo
+psychadelic||psychedelic
+pwoer||power
+quering||querying
+randomally||randomly
+raoming||roaming
+reasearcher||researcher
+reasearchers||researchers
+reasearch||research
+recepient||recipient
+receving||receiving
+recieved||received
+recieve||receive
+reciever||receiver
+recieves||receives
+recogniced||recognised
+recognizeable||recognizable
+recommanded||recommended
+recyle||recycle
+redircet||redirect
+redirectrion||redirection
+reename||rename
+refcounf||refcount
+refence||reference
+refered||referred
+referenace||reference
+refering||referring
+refernces||references
+refernnce||reference
+refrence||reference
+registerd||registered
+registeresd||registered
+registerred||registered
+registes||registers
+registraration||registration
+regsiter||register
+regster||register
+regualar||regular
+reguator||regulator
+regulamentations||regulations
+reigstration||registration
+releated||related
+relevent||relevant
+remoote||remote
+remore||remote
+removeable||removable
+repectively||respectively
+replacable||replaceable
+replacments||replacements
+replys||replies
+reponse||response
+representaion||representation
+reqeust||request
+requestied||requested
+requiere||require
+requirment||requirement
+requred||required
+requried||required
+requst||request
+reseting||resetting
+resizeable||resizable
+resouce||resource
+resouces||resources
+resoures||resources
+responce||response
+ressizes||resizes
+ressource||resource
+ressources||resources
+retransmited||retransmitted
+retreived||retrieved
+retreive||retrieve
+retrive||retrieve
+retuned||returned
+reudce||reduce
+reuest||request
+reuqest||request
+reutnred||returned
+revsion||revision
+rmeoved||removed
+rmeove||remove
+rmeoves||removes
+rountine||routine
+routins||routines
+rquest||request
+runing||running
+runned||ran
+runnning||running
+runtine||runtime
+sacrifying||sacrificing
+safly||safely
+safty||safety
+savable||saveable
+scaned||scanned
+scaning||scanning
+scarch||search
+seach||search
+searchs||searches
+secquence||sequence
+secund||second
+segement||segment
+senarios||scenarios
+sentivite||sensitive
+separatly||separately
+sepcify||specify
+sepc||spec
+seperated||separated
+seperately||separately
+seperate||separate
+seperatly||separately
+seperator||separator
+sepperate||separate
+sequece||sequence
+sequencial||sequential
+serveral||several
+setts||sets
+settting||setting
+shotdown||shutdown
+shoud||should
+shouldnt||shouldn't
+shoule||should
+shrinked||shrunk
+siginificantly||significantly
+signabl||signal
+similary||similarly
+similiar||similar
+simlar||similar
+simliar||similar
+simpified||simplified
+singaled||signaled
+singal||signal
+singed||signed
+sleeped||slept
+softwares||software
+speach||speech
+specfic||specific
+speciefied||specified
+specifc||specific
+specifed||specified
+specificatin||specification
+specificaton||specification
+specifing||specifying
+specifiying||specifying
+speficied||specified
+speicify||specify
+speling||spelling
+spinlcok||spinlock
+spinock||spinlock
+splitted||split
+spreaded||spread
+spurrious||spurious
+sructure||structure
+stablilization||stabilization
+staically||statically
+staion||station
+standardss||standards
+standartization||standardization
+standart||standard
+staticly||statically
+stoped||stopped
+stoppped||stopped
+straming||streaming
+struc||struct
+structres||structures
+stuct||struct
+strucuture||structure
+stucture||structure
+sturcture||structure
+subdirectoires||subdirectories
+suble||subtle
+substract||subtract
+submition||submission
+succesfully||successfully
+succesful||successful
+successed||succeeded
+successfull||successful
+successfuly||successfully
+sucessfully||successfully
+sucess||success
+superflous||superfluous
+superseeded||superseded
+suplied||supplied
+suported||supported
+suport||support
+supportet||supported
+suppored||supported
+supportin||supporting
+suppoted||supported
+suppported||supported
+suppport||support
+supress||suppress
+surpressed||suppressed
+surpresses||suppresses
+susbsystem||subsystem
+suspeneded||suspended
+suspicously||suspiciously
+swaping||swapping
+switchs||switches
+swith||switch
+swithable||switchable
+swithc||switch
+swithced||switched
+swithcing||switching
+swithed||switched
+swithing||switching
+swtich||switch
+symetric||symmetric
+synax||syntax
+synchonized||synchronized
+syncronize||synchronize
+syncronized||synchronized
+syncronizing||synchronizing
+syncronus||synchronous
+syste||system
+sytem||system
+sythesis||synthesis
+taht||that
+targetted||targeted
+targetting||targeting
+teh||the
+temorary||temporary
+temproarily||temporarily
+therfore||therefore
+thier||their
+threds||threads
+threshhold||threshold
+thresold||threshold
+throught||through
+troughput||throughput
+thses||these
+tiggered||triggered
+tipically||typically
+timout||timeout
+tmis||this
+torerable||tolerable
+tramsmitted||transmitted
+tramsmit||transmit
+tranasction||transaction
+tranfer||transfer
+transciever||transceiver
+transferd||transferred
+transfered||transferred
+transfering||transferring
+transision||transition
+transmittd||transmitted
+transormed||transformed
+trasfer||transfer
+trasmission||transmission
+treshold||threshold
+trigerring||triggering
+trun||turn
+tunning||tuning
+ture||true
+tyep||type
+udpate||update
+uesd||used
+uncommited||uncommitted
+unconditionaly||unconditionally
+underun||underrun
+unecessary||unnecessary
+unexecpted||unexpected
+unexepected||unexpected
+unexpcted||unexpected
+unexpectd||unexpected
+unexpeted||unexpected
+unexpexted||unexpected
+unfortunatelly||unfortunately
+unifiy||unify
+unintialized||uninitialized
+unkmown||unknown
+unknonw||unknown
+unknow||unknown
+unkown||unknown
+unneded||unneeded
+unneccecary||unnecessary
+unneccesary||unnecessary
+unneccessary||unnecessary
+unnecesary||unnecessary
+unneedingly||unnecessarily
+unnsupported||unsupported
+unmached||unmatched
+unregester||unregister
+unresgister||unregister
+unrgesiter||unregister
+unsinged||unsigned
+unstabel||unstable
+unsolicitied||unsolicited
+unsuccessfull||unsuccessful
+unsuported||unsupported
+untill||until
+unuseful||useless
+upate||update
+usefule||useful
+usefull||useful
+usege||usage
+usera||users
+usualy||usually
+utilites||utilities
+utillities||utilities
+utilties||utilities
+utiltity||utility
+utitity||utility
+utitlty||utility
+vaid||valid
+vaild||valid
+valide||valid
+variantions||variations
+varible||variable
+varient||variant
+vaule||value
+verbse||verbose
+verisons||versions
+verison||version
+verson||version
+vicefersa||vice-versa
+virtal||virtual
+virtaul||virtual
+virtiual||virtual
+visiters||visitors
+vitual||virtual
+wakeus||wakeups
+wating||waiting
+wiat||wait
+wether||whether
+whataver||whatever
+whcih||which
+whenver||whenever
+wheter||whether
+whe||when
+wierd||weird
+wiil||will
+wirte||write
+withing||within
+wnat||want
+workarould||workaround
+writeing||writing
+writting||writing
+zombe||zombie
+zomebie||zombie
diff --git a/tools/rimage/src/adsp_config.c b/tools/rimage/src/adsp_config.c
new file mode 100644
index 000000000000..ac196075a2b0
--- /dev/null
+++ b/tools/rimage/src/adsp_config.c
@@ -0,0 +1,2380 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020 Intel Corporation. All rights reserved.
+ *
+ * Author: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
+ */
+
+#include "rimage/sof/user/manifest.h"
+#include "rimage/sof/user/manifest.h"
+#include "rimage/adsp_config.h"
+#include "rimage/ext_manifest_gen.h"
+#include "rimage/plat_auth.h"
+#include "rimage/manifest.h"
+#include "rimage/rimage.h"
+#include "rimage/cse.h"
+#include "rimage/css.h"
+#include "rimage/toml_utils.h"
+#include "rimage/file_utils.h"
+#include "toml.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <ctype.h>
+
+/* map memory zone string name to enum value */
+static enum snd_sof_fw_blk_type zone_name_to_idx(const char *name)
+{
+	static const struct {
+		const char name[32];
+		enum snd_sof_fw_blk_type type;
+	} mem_zone_name_dict[] = {
+		{"START", SOF_FW_BLK_TYPE_START},
+		{"IRAM", SOF_FW_BLK_TYPE_IRAM},
+		{"DRAM", SOF_FW_BLK_TYPE_DRAM},
+		{"SRAM", SOF_FW_BLK_TYPE_SRAM},
+		{"ROM", SOF_FW_BLK_TYPE_ROM},
+		{"IMR", SOF_FW_BLK_TYPE_IMR},
+		{"RSRVD0", SOF_FW_BLK_TYPE_RSRVD0},
+		{"HP-SRAM", SOF_FW_BLK_TYPE_HPSRAM},
+		{"LP-SRAM", SOF_FW_BLK_TYPE_LPSRAM},
+		{"RSRVD8", SOF_FW_BLK_TYPE_RSRVD8},
+		{"RSRVD9", SOF_FW_BLK_TYPE_RSRVD9},
+		{"RSRVD10", SOF_FW_BLK_TYPE_RSRVD10},
+		{"RSRVD11", SOF_FW_BLK_TYPE_RSRVD11},
+		{"RSRVD12", SOF_FW_BLK_TYPE_RSRVD12},
+		{"RSRVD13", SOF_FW_BLK_TYPE_RSRVD13},
+		{"RSRVD14", SOF_FW_BLK_TYPE_RSRVD14},
+	};
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(mem_zone_name_dict); ++i) {
+		if (!strcmp(name, mem_zone_name_dict[i].name))
+			return mem_zone_name_dict[i].type;
+	}
+	return SOF_FW_BLK_TYPE_INVALID;
+}
+
+static void dump_adsp(const struct adsp *adsp)
+{
+	int i;
+
+	DUMP("\nadsp");
+	DUMP_KEY("name", "'%s'", adsp->name);
+	DUMP_KEY("image_size", "0x%x", adsp->image_size);
+	DUMP_KEY("exec_boot_ldr", "%d", adsp->exec_boot_ldr);
+	for (i = 0; i < ARRAY_SIZE(adsp->mem.zones); ++i) {
+		DUMP_KEY("mem_zone.idx", "%d", i);
+		DUMP_KEY("mem_zone.size", "0x%x", adsp->mem.zones[i].size);
+		DUMP_KEY("mem_zone.base", "0x%x", adsp->mem.zones[i].base);
+		DUMP_KEY("mem_zone.host_offset", "0x%x", adsp->mem.zones[i].host_offset);
+	}
+}
+
+static int parse_adsp(const toml_table_t *toml, struct parse_ctx *pctx, struct adsp *out,
+		      bool verbose)
+{
+	toml_array_t *mem_zone_array, *alias_array;
+	struct memory_zone *zone;
+	struct parse_ctx ctx;
+	toml_table_t *adsp;
+	toml_raw_t raw;
+	int zone_idx;
+	char a_kind;
+	int a_size;
+	bool alias_found;
+	int ret;
+	int i;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	adsp = toml_table_in(toml, "adsp");
+	if (!adsp)
+		return err_key_not_found("adsp");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non-configurable fields */
+
+	/* configurable fields */
+	raw = toml_raw_in(adsp, "name");
+	if (!raw)
+		return err_key_not_found("name");
+	++ctx.key_cnt;
+
+	/* free(out->name) is called in adsp_free() */
+	ret = toml_rtos(raw, (char **)&out->name);
+	if (ret < 0)
+		return err_key_parse("name", NULL);
+
+	out->image_size = parse_uint32_hex_key(adsp, &ctx, "image_size", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->exec_boot_ldr = parse_uint32_key(adsp, &ctx, "exec_boot_ldr", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	memset(&out->mem, 0, sizeof(out->mem));
+	out->mem.alias.mask = parse_uint32_hex_key(adsp, &ctx, "alias_mask", -ENODATA, &ret);
+	alias_found = !ret;
+
+	/* check everything parsed, 1 or 2 tables should be present */
+	ctx.array_cnt += 1 + alias_found;
+	ret = assert_everything_parsed(adsp, &ctx);
+	if (ret < 0)
+		return ret;
+
+	if (alias_found) {
+		alias_array = toml_array_in(adsp, "mem_alias");
+		if (!alias_array)
+			return err_key_not_found("mem_alias");
+		a_kind = toml_array_kind(alias_array);
+		a_size = toml_array_nelem(alias_array);
+		if (a_kind != 't' || a_size != 2)
+			return err_key_parse("mem_alias", "wrong array type %c or length %d",
+					     a_kind, a_size);
+
+		/* retrieve "cached" and "uncached" alias base addresses */
+		for (i = 0; i < a_size; ++i) {
+			toml_table_t *alias = toml_table_at(alias_array, i);
+			char alias_name[16];
+			uint32_t base;
+
+			if (!alias)
+				return err_key_parse("mem_alias", NULL);
+
+			parse_str_key(alias, &ctx, "type", alias_name, sizeof(alias_name), &ret);
+			if (ret < 0)
+				return err_key_parse("mem_alias", NULL);
+
+			base = parse_uint32_hex_key(alias, &ctx, "base", -1, &ret);
+
+			if (!strncmp("cached", alias_name, sizeof("cached")))
+				out->mem.alias.cached = base & out->mem.alias.mask;
+			else if (!strncmp("uncached", alias_name, sizeof("uncached")))
+				out->mem.alias.uncached = base & out->mem.alias.mask;
+		}
+	} else {
+		/* Make uncache_to_cache() an identity transform */
+		out->mem.alias.uncached = 0;
+		out->mem.alias.cached = 0;
+		out->mem.alias.mask = 0;
+	}
+
+	/* look for entry array */
+	mem_zone_array = toml_array_in(adsp, "mem_zone");
+	if (!mem_zone_array)
+		return err_key_not_found("mem_zone");
+	a_kind = toml_array_kind(mem_zone_array);
+	a_size = toml_array_nelem(mem_zone_array);
+	if (a_kind != 't' || a_size > SOF_FW_BLK_TYPE_NUM)
+		return err_key_parse("mem_zone", "wrong array type %c or length %d",
+				     a_kind, a_size);
+
+	/* parse entry array elements */
+	for (i = 0; i < a_size; ++i) {
+		toml_table_t *mem_zone = toml_table_at(mem_zone_array, i);
+		char zone_name[32];
+
+		if (!mem_zone)
+			return err_key_parse("mem_zone", NULL);
+
+		/* initialize parse context for each array element */
+		parse_ctx_init(&ctx);
+
+		/* non-configurable fields */
+
+		/* configurable fields */
+		parse_str_key(mem_zone, &ctx, "type", zone_name, sizeof(zone_name), &ret);
+		if (ret < 0)
+			return err_key_parse("mem_zone", NULL);
+
+		zone_idx = zone_name_to_idx(zone_name);
+		if (zone_idx < 0)
+			return err_key_parse("mem_zone.name", "unknown zone '%s'", zone_name);
+
+		zone = &out->mem.zones[zone_idx];
+		zone->base = parse_uint32_hex_key(mem_zone, &ctx, "base", -1, &ret);
+		if (ret < 0)
+			return err_key_parse("mem_zone", NULL);
+
+		zone->host_offset = parse_uint32_hex_key(mem_zone, &ctx, "host_offset", 0,
+							 &ret);
+		if (ret < 0)
+			return err_key_parse("mem_zone", NULL);
+
+		zone->size = parse_uint32_hex_key(mem_zone, &ctx, "size", -1, &ret);
+		if (ret < 0)
+			return err_key_parse("mem_zone", NULL);
+
+		/* check everything parsed */
+		ret = assert_everything_parsed(mem_zone, &ctx);
+		if (ret < 0)
+			return ret;
+	}
+
+	if (verbose)
+		dump_adsp(out);
+
+	/*
+	 * values set in other places in code:
+	 * - write_firmware
+	 * - write_firmware_meu
+	 * - man_vX_Y
+	 */
+
+	return 0;
+}
+
+static void dump_cse(const struct CsePartitionDirHeader *cse_header,
+		     const struct CsePartitionDirEntry *cse_entry)
+{
+	int i;
+
+	DUMP("\ncse");
+	DUMP_PRINTABLE_BYTES("partition_name", cse_header->partition_name);
+	DUMP_KEY("header_version", "%d", cse_header->header_version);
+	DUMP_KEY("entry_version", "%d", cse_header->entry_version);
+	DUMP_KEY("nb_entries", "%d", cse_header->nb_entries);
+	for (i = 0; i < cse_header->nb_entries; ++i) {
+		DUMP_PRINTABLE_BYTES("entry.name", cse_entry[i].entry_name);
+		DUMP_KEY("entry.offset", "0x%x", cse_entry[i].offset);
+		DUMP_KEY("entry.length", "0x%x", cse_entry[i].length);
+	}
+}
+
+static int parse_cse(const toml_table_t *toml, struct parse_ctx *pctx,
+		     struct CsePartitionDirHeader *hdr, struct CsePartitionDirEntry *out,
+		     int entry_capacity, bool verbose)
+{
+	toml_array_t *cse_entry_array;
+	toml_table_t *cse_entry;
+	struct parse_ctx ctx;
+	toml_table_t *cse;
+	int ret;
+	int i;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	cse = toml_table_in(toml, "cse");
+	if (!cse)
+		return err_key_not_found("cse");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non-configurable fields */
+	hdr->header_marker = CSE_HEADER_MAKER;
+	hdr->header_length = sizeof(struct CsePartitionDirHeader);
+
+	/* configurable fields */
+	hdr->header_version = parse_uint32_key(cse, &ctx, "header_version", 1, &ret);
+	if (ret < 0)
+		return ret;
+
+	hdr->entry_version = parse_uint32_key(cse, &ctx, "entry_version", 1, &ret);
+	if (ret < 0)
+		return ret;
+
+	parse_printable_key(cse, &ctx, "partition_name", hdr->partition_name,
+			    sizeof(hdr->partition_name), &ret);
+	if (ret < 0)
+		return ret;
+
+	/* check everything parsed, expect 1 table */
+	ctx.array_cnt += 1;
+	ret = assert_everything_parsed(cse, &ctx);
+	if (ret < 0)
+		return ret;
+
+	/* entry array */
+	cse_entry_array = toml_array_in(cse, "entry");
+	if (!cse_entry_array)
+		return err_key_not_found("entry");
+	if (toml_array_kind(cse_entry_array) != 't' ||
+	    toml_array_nelem(cse_entry_array) != entry_capacity)
+		return err_key_parse("entry", "wrong array type or length != %d", entry_capacity);
+
+	/* parse entry array elements */
+	for (i = 0; i < toml_array_nelem(cse_entry_array); ++i) {
+		cse_entry = toml_table_at(cse_entry_array, i);
+		if (!cse_entry)
+			return err_key_parse("entry", NULL);
+
+		/* initialize parse context for each array element */
+		parse_ctx_init(&ctx);
+
+		/* non-configurable fields */
+
+		/* configurable fields */
+		parse_printable_key(cse_entry, &ctx, "name", out[i].entry_name,
+				    sizeof(out[i].entry_name), &ret);
+		if (ret < 0)
+			return err_key_parse("entry", NULL);
+
+		out[i].offset = parse_uint32_hex_key(cse_entry, &ctx, "offset", -1, &ret);
+		if (ret < 0)
+			return err_key_parse("entry", NULL);
+
+		out[i].length = parse_uint32_hex_key(cse_entry, &ctx, "length", -1, &ret);
+		if (ret < 0)
+			return err_key_parse("entry", NULL);
+
+		/* check everything parsed */
+		ret = assert_everything_parsed(cse_entry, &ctx);
+		if (ret < 0)
+			return ret;
+	}
+
+	hdr->nb_entries = toml_array_nelem(cse_entry_array);
+
+	if (verbose)
+		dump_cse(hdr, out);
+
+	/*
+	 * values set in other places in code:
+	 * - checksum
+	 */
+
+	return 0;
+}
+
+static void dump_cse_v2_5(const struct CsePartitionDirHeader_v2_5 *cse_header,
+		     const struct CsePartitionDirEntry *cse_entry)
+{
+	int i;
+
+	DUMP("\ncse");
+	DUMP_PRINTABLE_BYTES("partition_name", cse_header->partition_name);
+	DUMP_KEY("header_version", "%d", cse_header->header_version);
+	DUMP_KEY("entry_version", "%d", cse_header->entry_version);
+	DUMP_KEY("nb_entries", "%d", cse_header->nb_entries);
+	for (i = 0; i < cse_header->nb_entries; ++i) {
+		DUMP_PRINTABLE_BYTES("entry.name", cse_entry[i].entry_name);
+		DUMP_KEY("entry.offset", "0x%x", cse_entry[i].offset);
+		DUMP_KEY("entry.length", "0x%x", cse_entry[i].length);
+	}
+}
+
+/* TODO: fix up constants in headers for v2.5 */
+static int parse_cse_v2_5(const toml_table_t *toml, struct parse_ctx *pctx,
+		     struct CsePartitionDirHeader_v2_5 *hdr, struct CsePartitionDirEntry *out,
+		     int entry_capacity, bool verbose)
+{
+	toml_array_t *cse_entry_array;
+	toml_table_t *cse_entry;
+	struct parse_ctx ctx;
+	toml_table_t *cse;
+	int ret;
+	int i;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	cse = toml_table_in(toml, "cse");
+	if (!cse)
+		return err_key_not_found("cse");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non-configurable fields */
+	hdr->header_marker = CSE_HEADER_MAKER;
+	hdr->header_length = sizeof(struct CsePartitionDirHeader_v2_5);
+
+	/* configurable fields */
+	hdr->header_version = parse_uint32_key(cse, &ctx, "header_version", 2, &ret);
+	if (ret < 0)
+		return ret;
+
+	hdr->entry_version = parse_uint32_key(cse, &ctx, "entry_version", 1, &ret);
+	if (ret < 0)
+		return ret;
+
+	parse_printable_key(cse, &ctx, "partition_name", hdr->partition_name,
+			    sizeof(hdr->partition_name), &ret);
+	if (ret < 0)
+		return ret;
+
+	/* check everything parsed, expect 1 table */
+	ctx.array_cnt += 1;
+	ret = assert_everything_parsed(cse, &ctx);
+	if (ret < 0)
+		return ret;
+
+	/* entry array */
+	cse_entry_array = toml_array_in(cse, "entry");
+	if (!cse_entry_array)
+		return err_key_not_found("entry");
+	if (toml_array_kind(cse_entry_array) != 't' ||
+	    toml_array_nelem(cse_entry_array) != entry_capacity)
+		return err_key_parse("entry", "wrong array type or length != %d", entry_capacity);
+
+	/* parse entry array elements */
+	for (i = 0; i < toml_array_nelem(cse_entry_array); ++i) {
+		cse_entry = toml_table_at(cse_entry_array, i);
+		if (!cse_entry)
+			return err_key_parse("entry", NULL);
+
+		/* initialize parse context for each array element */
+		parse_ctx_init(&ctx);
+
+		/* non-configurable fields */
+
+		/* configurable fields */
+		parse_printable_key(cse_entry, &ctx, "name", out[i].entry_name,
+				    sizeof(out[i].entry_name), &ret);
+		if (ret < 0)
+			return err_key_parse("entry", NULL);
+
+		out[i].offset = parse_uint32_hex_key(cse_entry, &ctx, "offset", -1, &ret);
+		if (ret < 0)
+			return err_key_parse("offset", NULL);
+
+		out[i].length = parse_uint32_hex_key(cse_entry, &ctx, "length", -1, &ret);
+		if (ret < 0)
+			return err_key_parse("length", NULL);
+
+		/* check everything parsed */
+		ret = assert_everything_parsed(cse_entry, &ctx);
+		if (ret < 0)
+			return ret;
+	}
+
+	hdr->nb_entries = toml_array_nelem(cse_entry_array);
+
+	if (verbose)
+		dump_cse_v2_5(hdr, out);
+
+	/*
+	 * values set in other places in code:
+	 * - checksum
+	 */
+
+	return 0;
+}
+
+static void dump_css_v1_5(const struct css_header_v1_5 *css)
+{
+	DUMP("\ncss 1.5");
+	DUMP_KEY("module_type", "%d", css->module_type);
+	DUMP_KEY("header_len", "%d", css->header_len);
+	DUMP_KEY("header_version", "0x%x", css->header_version);
+	DUMP_KEY("module_vendor", "0x%x", css->module_vendor);
+	DUMP_KEY("size", "%d", css->size);
+	DUMP_KEY("key_size", "%d", css->key_size);
+	DUMP_KEY("modulus_size", "%d", css->modulus_size);
+	DUMP_KEY("exponent_size", "%d", css->exponent_size);
+}
+
+static int parse_css_v1_5(const toml_table_t *toml, struct parse_ctx *pctx,
+			  struct css_header_v1_5 *out, bool verbose)
+{
+	struct parse_ctx ctx;
+	toml_table_t *css;
+	int ret;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	css = toml_table_in(toml, "css");
+	if (!css)
+		return err_key_not_found("css");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non-configurable fields */
+
+	/* configurable fields */
+	out->module_type = parse_uint32_key(css, &ctx, "module_type", MAN_CSS_LT_MODULE_TYPE, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->header_len = parse_uint32_key(css, &ctx, "header_len", MAN_CSS_HDR_SIZE, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->header_version = parse_uint32_hex_key(css, &ctx, "header_version", MAN_CSS_HDR_VERSION,
+						   &ret);
+	if (ret < 0)
+		return ret;
+	out->module_vendor = parse_uint32_hex_key(css, &ctx, "module_vendor", MAN_CSS_MOD_VENDOR,
+						  &ret);
+	if (ret < 0)
+		return ret;
+
+	out->size = parse_uint32_key(css, &ctx, "size", 0x800, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->key_size = parse_uint32_key(css, &ctx, "key_size", MAN_CSS_KEY_SIZE, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->modulus_size = parse_uint32_key(css, &ctx, "modulus_size", MAN_CSS_MOD_SIZE, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->exponent_size = parse_uint32_key(css, &ctx, "exponent_size", MAN_CSS_EXP_SIZE, &ret);
+	if (ret < 0)
+		return ret;
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(css, &ctx);
+	if (ret < 0)
+		return ret;
+
+	if (verbose)
+		dump_css_v1_5(out);
+
+	/*
+	 * values set in other places in code:
+	 * - date
+	 * - version
+	 * - modulus
+	 * - exponent
+	 * - signature
+	 */
+
+	return 0;
+}
+
+static void dump_css_v1_8(const struct css_header_v1_8 *css)
+{
+	DUMP("\ncss 1.8");
+	DUMP_KEY("header_type", "%d", css->header_type);
+	DUMP_KEY("header_len", "%d", css->header_len);
+	DUMP_KEY("header_version", "0x%x", css->header_version);
+	DUMP_KEY("module_vendor", "0x%x", css->module_vendor);
+	DUMP_KEY("size", "%d", css->size);
+	DUMP_KEY("svn", "%d", css->svn);
+	DUMP_KEY("modulus_size", "%d", css->modulus_size);
+	DUMP_KEY("exponent_size", "%d", css->exponent_size);
+}
+
+static int parse_css_v1_8(const toml_table_t *toml, struct parse_ctx *pctx,
+			  struct css_header_v1_8 *out, bool verbose)
+{
+	static const uint8_t hdr_id[4] = MAN_CSS_HDR_ID;
+	struct parse_ctx ctx;
+	toml_table_t *css;
+	int ret;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	css = toml_table_in(toml, "css");
+	if (!css)
+		return err_key_not_found("css");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non-configurable fields */
+	memcpy(out->header_id, hdr_id, sizeof(out->header_id));
+
+	/* configurable fields */
+	out->header_type = parse_uint32_key(css, &ctx, "header_type", MAN_CSS_MOD_TYPE, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->header_len = parse_uint32_key(css, &ctx, "header_len", MAN_CSS_HDR_SIZE, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->header_version = parse_uint32_hex_key(css, &ctx, "header_version", MAN_CSS_HDR_VERSION,
+						   &ret);
+	if (ret < 0)
+		return ret;
+	out->module_vendor = parse_uint32_hex_key(css, &ctx, "module_vendor", MAN_CSS_MOD_VENDOR,
+						  &ret);
+	if (ret < 0)
+		return ret;
+
+	out->size = parse_uint32_key(css, &ctx, "size", 222, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->svn = parse_uint32_key(css, &ctx, "svn", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->modulus_size = parse_uint32_key(css, &ctx, "modulus_size", MAN_CSS_MOD_SIZE, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->exponent_size = parse_uint32_key(css, &ctx, "exponent_size", MAN_CSS_EXP_SIZE, &ret);
+	if (ret < 0)
+		return ret;
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(css, &ctx);
+	if (ret < 0)
+		return ret;
+
+	if (verbose)
+		dump_css_v1_8(out);
+
+	/*
+	 * values set in other places in code:
+	 * - date
+	 * - version
+	 * - modulus
+	 * - exponent
+	 * - signature
+	 */
+
+	return 0;
+}
+
+static void dump_css_v2_5(const struct css_header_v2_5 *css)
+{
+	DUMP("\ncss 2.5");
+	DUMP_KEY("header_type", "%d", css->header_type);
+	DUMP_KEY("header_len", "%d", css->header_len);
+	DUMP_KEY("header_version", "0x%x", css->header_version);
+	DUMP_KEY("module_vendor", "0x%x", css->module_vendor);
+	DUMP_KEY("size", "%d", css->size);
+	DUMP_KEY("svn", "%d", css->svn);
+	DUMP_KEY("modulus_size", "%d", css->modulus_size);
+	DUMP_KEY("exponent_size", "%d", css->exponent_size);
+}
+
+static int parse_css_v2_5(const toml_table_t *toml, struct parse_ctx *pctx,
+			  struct css_header_v2_5 *out, bool verbose)
+{
+	static const uint8_t hdr_id[4] = MAN_CSS_HDR_ID;
+	struct parse_ctx ctx;
+	toml_table_t *css;
+	int ret;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	css = toml_table_in(toml, "css");
+	if (!css)
+		return err_key_not_found("css");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non-configurable fields */
+	memcpy(out->header_id, hdr_id, sizeof(out->header_id));
+
+	/* configurable fields */
+	out->header_type = parse_uint32_key(css, &ctx, "header_type", MAN_CSS_MOD_TYPE, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->header_len = parse_uint32_key(css, &ctx, "header_len", MAN_CSS_HDR_SIZE_2_5, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->header_version = parse_uint32_hex_key(css, &ctx, "header_version", MAN_CSS_HDR_VERSION_2_5,
+						   &ret);
+	if (ret < 0)
+		return ret;
+	out->module_vendor = parse_uint32_hex_key(css, &ctx, "module_vendor", MAN_CSS_MOD_VENDOR,
+						  &ret);
+	if (ret < 0)
+		return ret;
+
+	out->size = parse_uint32_key(css, &ctx, "size", 281, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->svn = parse_uint32_key(css, &ctx, "svn", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->modulus_size = parse_uint32_key(css, &ctx, "modulus_size", MAN_CSS_MOD_SIZE_2_5, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->exponent_size = parse_uint32_key(css, &ctx, "exponent_size", MAN_CSS_EXP_SIZE, &ret);
+	if (ret < 0)
+		return ret;
+
+	/* hardcoded to align with meu */
+	out->reserved1[0] = 0xf;
+	out->reserved1[1] = 0x048e0000; // TODO: what is this ?
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(css, &ctx);
+	if (ret < 0)
+		return ret;
+
+	if (verbose)
+		dump_css_v2_5(out);
+
+	/*
+	 * values set in other places in code:
+	 * - date
+	 * - version
+	 * - modulus
+	 * - exponent
+	 * - signature
+	 */
+
+	return 0;
+}
+
+static void dump_signed_pkg(const struct signed_pkg_info_ext *signed_pkg)
+{
+	int i;
+
+	DUMP("\nsigned_pkg");
+	DUMP_PRINTABLE_BYTES("name", signed_pkg->name);
+	DUMP_KEY("vcn", "%d", signed_pkg->vcn);
+	DUMP_KEY("svn", "%d", signed_pkg->svn);
+	DUMP_KEY("fw_type", "%d", signed_pkg->fw_type);
+	DUMP_KEY("fw_sub_type", "%d", signed_pkg->fw_sub_type);
+	for (i = 0; i < ARRAY_SIZE(signed_pkg->bitmap); ++i)
+		DUMP_KEY("bitmap", "%d", signed_pkg->bitmap[i]);
+	for (i = 0; i < ARRAY_SIZE(signed_pkg->module); ++i) {
+		DUMP_PRINTABLE_BYTES("meta.name", signed_pkg->module[i].name);
+		DUMP_KEY("meta.type", "0x%x", signed_pkg->module[i].type);
+		DUMP_KEY("meta.hash_algo", "0x%x", signed_pkg->module[i].hash_algo);
+		DUMP_KEY("meta.hash_size", "0x%x", signed_pkg->module[i].hash_size);
+		DUMP_KEY("meta.meta_size", "%d", signed_pkg->module[i].meta_size);
+	}
+}
+
+static int parse_signed_pkg(const toml_table_t *toml, struct parse_ctx *pctx,
+			    struct image *image, bool verbose)
+{
+	struct adsp *adsp = image->adsp;
+	struct signed_pkg_info_ext *out = &adsp->man_v1_8->signed_pkg;
+	struct signed_pkg_info_module *mod;
+	toml_array_t *bitmap_array;
+	toml_array_t *module_array;
+	toml_table_t *signed_pkg;
+	struct parse_ctx ctx;
+	toml_table_t *module;
+	toml_raw_t raw;
+	int64_t temp_i;
+	int ret;
+	int i;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	signed_pkg = toml_table_in(toml, "signed_pkg");
+	if (!signed_pkg)
+		return err_key_not_found("signed_pkg");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non-configurable fields */
+	out->ext_type = SIGN_PKG_EXT_TYPE;
+	out->ext_len = sizeof(struct signed_pkg_info_ext);
+
+	/* configurable fields */
+	parse_printable_key(signed_pkg, &ctx, "name", out->name, sizeof(out->name), &ret);
+	if (ret < 0)
+		return ret;
+
+	out->vcn = parse_uint32_key(signed_pkg, &ctx, "vcn", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->svn = parse_uint32_key(signed_pkg, &ctx, "svn", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->fw_type = parse_uint32_hex_key(signed_pkg, &ctx, "fw_type", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->fw_sub_type = parse_uint32_hex_key(signed_pkg, &ctx, "fw_sub_type", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	/* bitmap array */
+	bitmap_array = toml_array_in(signed_pkg, "bitmap");
+	if (!bitmap_array) {
+		/* default value, depending on the IMR type */
+		out->bitmap[4] = image->imr_type == 4 ? 0x10 : 0x8;
+	} else {
+		++ctx.array_cnt;
+		if (toml_array_kind(bitmap_array) != 'v' || toml_array_type(bitmap_array) != 'i' ||
+		    toml_array_nelem(bitmap_array) > ARRAY_SIZE(out->bitmap))
+			return err_key_parse("bitmap", "wrong array type or length > %d",
+					     ARRAY_SIZE(out->bitmap));
+
+		for (i = 0; i < toml_array_nelem(bitmap_array); ++i) {
+			raw = toml_raw_at(bitmap_array, i);
+			if (!raw)
+				return err_key_parse("bitmap", NULL);
+
+			ret = toml_rtoi(raw, &temp_i);
+			if (ret < 0 || temp_i < 0)
+				return err_key_parse("bitmap", "values can't be negative");
+			out->bitmap[i] = temp_i;
+		}
+	}
+
+	/* check everything parsed, expect 1 more array */
+	ctx.array_cnt += 1;
+	ret = assert_everything_parsed(signed_pkg, &ctx);
+	if (ret < 0)
+		return ret;
+
+	/* modules array */
+	module_array = toml_array_in(signed_pkg, "module");
+	if (!module_array)
+		return err_key_not_found("module");
+	if (toml_array_kind(module_array) != 't' ||
+	    toml_array_nelem(module_array) != ARRAY_SIZE(out->module))
+		return err_key_parse("module", "wrong array type or length != %d",
+				     ARRAY_SIZE(out->module));
+
+	/* parse modules array elements */
+	for (i = 0; i < toml_array_nelem(module_array); ++i) {
+		module = toml_table_at(module_array, i);
+		if (!module)
+			return err_key_parse("module", NULL);
+		mod = &out->module[i];
+
+		/* initialize parse context for each array element */
+		parse_ctx_init(&ctx);
+
+		/* non-configurable fields */
+
+		/* configurable fields */
+		parse_printable_key(module, &ctx, "name", mod->name, sizeof(mod->name), &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->type = parse_uint32_hex_key(module, &ctx, "type", 0x03, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->hash_algo = parse_uint32_hex_key(module, &ctx, "hash_algo", 0x02, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->hash_size = parse_uint32_hex_key(module, &ctx, "hash_size", 0x20, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->meta_size = parse_uint32_key(module, &ctx, "meta_size", 96, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		/* check everything parsed */
+		ret = assert_everything_parsed(module, &ctx);
+		if (ret < 0)
+			return ret;
+	}
+
+	if (verbose)
+		dump_signed_pkg(out);
+
+	/*
+	 * values set in other places in code:
+	 * - module.hash
+	 */
+
+	return 0;
+}
+
+static void dump_signed_pkg_v2_5(const struct signed_pkg_info_ext_v2_5 *signed_pkg)
+{
+	int i;
+
+	DUMP("\nsigned_pkg");
+	DUMP_PRINTABLE_BYTES("name", signed_pkg->name);
+	DUMP_KEY("vcn", "%d", signed_pkg->vcn);
+	DUMP_KEY("svn", "%d", signed_pkg->svn);
+	DUMP_KEY("fw_type", "%d", signed_pkg->fw_type);
+	DUMP_KEY("fw_sub_type", "%d", signed_pkg->fw_sub_type);
+	for (i = 0; i < ARRAY_SIZE(signed_pkg->bitmap); ++i)
+		DUMP_KEY("bitmap", "%d", signed_pkg->bitmap[i]);
+	for (i = 0; i < ARRAY_SIZE(signed_pkg->module); ++i) {
+		DUMP_PRINTABLE_BYTES("meta.name", signed_pkg->module[i].name);
+		DUMP_KEY("meta.type", "0x%x", signed_pkg->module[i].type);
+		DUMP_KEY("meta.hash_algo", "0x%x", signed_pkg->module[i].hash_algo);
+		DUMP_KEY("meta.hash_size", "0x%x", signed_pkg->module[i].hash_size);
+		DUMP_KEY("meta.meta_size", "%d", signed_pkg->module[i].meta_size);
+	}
+}
+
+static int parse_signed_pkg_v2_5(const toml_table_t *toml, struct parse_ctx *pctx,
+				 struct image *image, bool verbose)
+{
+	struct adsp *adsp = image->adsp;
+	struct signed_pkg_info_ext_v2_5 *out = &adsp->man_v2_5->signed_pkg;
+	struct signed_pkg_info_module_v2_5 *mod;
+	toml_array_t *bitmap_array;
+	toml_array_t *module_array;
+	toml_table_t *signed_pkg;
+	struct parse_ctx ctx;
+	toml_table_t *module;
+	toml_raw_t raw;
+	int64_t temp_i;
+	int ret;
+	int i;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	signed_pkg = toml_table_in(toml, "signed_pkg");
+	if (!signed_pkg)
+		return err_key_not_found("signed_pkg");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non-configurable fields */
+	out->ext_type = SIGN_PKG_EXT_TYPE;
+	out->ext_len = sizeof(struct signed_pkg_info_ext_v2_5);
+
+	/* configurable fields */
+	parse_printable_key(signed_pkg, &ctx, "name", out->name, sizeof(out->name), &ret);
+	if (ret < 0)
+		return ret;
+
+	out->vcn = parse_uint32_key(signed_pkg, &ctx, "vcn", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->svn = parse_uint32_key(signed_pkg, &ctx, "svn", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->fw_type = parse_uint32_hex_key(signed_pkg, &ctx, "fw_type", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->fw_sub_type = parse_uint32_hex_key(signed_pkg, &ctx, "fw_sub_type", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	/* bitmap array */
+	bitmap_array = toml_array_in(signed_pkg, "bitmap");
+	if (!bitmap_array) {
+		/* default value, depending on the IMR type */
+		out->bitmap[4] = image->imr_type == 4 ? 0x10 : 0x8;
+	} else {
+		++ctx.array_cnt;
+		if (toml_array_kind(bitmap_array) != 'v' || toml_array_type(bitmap_array) != 'i' ||
+		    toml_array_nelem(bitmap_array) > ARRAY_SIZE(out->bitmap))
+			return err_key_parse("bitmap", "wrong array type or length > %d",
+					     ARRAY_SIZE(out->bitmap));
+
+		for (i = 0; i < toml_array_nelem(bitmap_array); ++i) {
+			raw = toml_raw_at(bitmap_array, i);
+			if (!raw)
+				return err_key_parse("bitmap", NULL);
+
+			ret = toml_rtoi(raw, &temp_i);
+			if (ret < 0 || temp_i < 0)
+				return err_key_parse("bitmap", "values can't be negative");
+			out->bitmap[i] = temp_i;
+		}
+	}
+
+	/* check everything parsed, expect 1 more array */
+	ctx.array_cnt += 1;
+	ret = assert_everything_parsed(signed_pkg, &ctx);
+	if (ret < 0)
+		return ret;
+
+	/* modules array */
+	module_array = toml_array_in(signed_pkg, "module");
+	if (!module_array)
+		return err_key_not_found("module");
+	if (toml_array_kind(module_array) != 't' ||
+	    toml_array_nelem(module_array) != ARRAY_SIZE(out->module))
+		return err_key_parse("module", "wrong array type or length != %d",
+				     ARRAY_SIZE(out->module));
+
+	/* parse modules array elements */
+	for (i = 0; i < toml_array_nelem(module_array); ++i) {
+		module = toml_table_at(module_array, i);
+		if (!module)
+			return err_key_parse("module", NULL);
+		mod = &out->module[i];
+
+		/* initialize parse context for each array element */
+		parse_ctx_init(&ctx);
+
+		/* non-configurable fields */
+
+		/* configurable fields */
+		parse_printable_key(module, &ctx, "name", mod->name, sizeof(mod->name), &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->type = parse_uint32_hex_key(module, &ctx, "type", 0x03, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->hash_algo = parse_uint32_hex_key(module, &ctx, "hash_algo", 0x00, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->hash_size = parse_uint32_hex_key(module, &ctx, "hash_size", 0x30, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->meta_size = parse_uint32_key(module, &ctx, "meta_size", 112, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		/* check everything parsed */
+		ret = assert_everything_parsed(module, &ctx);
+		if (ret < 0)
+			return ret;
+	}
+
+	if (verbose)
+		dump_signed_pkg_v2_5(out);
+
+	/*
+	 * values set in other places in code:
+	 * - module.hash
+	 */
+
+	return 0;
+}
+
+static void dump_signed_pkg_ace_v1_5(const struct signed_pkg_info_ext_ace_v1_5 *signed_pkg)
+{
+	int i;
+
+	DUMP("\nsigned_pkg");
+	DUMP_KEY("name", "'%s'", signed_pkg->name);
+	DUMP_KEY("vcn", "%d", signed_pkg->vcn);
+	DUMP_KEY("svn", "%d", signed_pkg->svn);
+	DUMP_KEY("fw_type", "%d", signed_pkg->fw_type);
+	DUMP_KEY("fw_sub_type", "%d", signed_pkg->fw_sub_type);
+	for (i = 0; i < ARRAY_SIZE(signed_pkg->module); ++i) {
+		DUMP_KEY("meta.name", "'%s'", signed_pkg->module[i].name);
+		DUMP_KEY("meta.type", "0x%x", signed_pkg->module[i].type);
+	}
+}
+
+static int parse_signed_pkg_ace_v1_5(const toml_table_t *toml, struct parse_ctx *pctx,
+				     struct image *image, bool verbose)
+{
+	struct adsp *adsp = image->adsp;
+	struct signed_pkg_info_ext_ace_v1_5 *out = &adsp->man_ace_v1_5->signed_pkg;
+	struct signed_pkg_info_module_ace_v1_5 *mod;
+	toml_array_t *module_array;
+	toml_table_t *signed_pkg;
+	struct parse_ctx ctx;
+	toml_table_t *module;
+	int ret;
+	int i;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	signed_pkg = toml_table_in(toml, "signed_pkg");
+	if (!signed_pkg)
+		return err_key_not_found("signed_pkg");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non-configurable fields */
+	out->ext_type = SIGN_PKG_EXT_TYPE_ACE_V1_5;
+	out->ext_len = sizeof(struct signed_pkg_info_ext_ace_v1_5);
+
+	/* configurable fields */
+	parse_printable_key(signed_pkg, &ctx, "name", out->name, sizeof(out->name), &ret);
+	if (ret < 0)
+		return ret;
+
+	out->vcn = parse_uint32_key(signed_pkg, &ctx, "vcn", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->svn = parse_uint32_key(signed_pkg, &ctx, "svn", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->fw_type = parse_uint32_hex_key(signed_pkg, &ctx, "fw_type", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->fw_sub_type = parse_uint32_hex_key(signed_pkg, &ctx, "fw_sub_type", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->partition_usage = parse_uint32_hex_key(signed_pkg, &ctx, "partition_usage", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	/* check everything parsed, expect 1 more array */
+	ctx.array_cnt += 1;
+	ret = assert_everything_parsed(signed_pkg, &ctx);
+	if (ret < 0)
+		return ret;
+
+	/* modules array */
+	module_array = toml_array_in(signed_pkg, "module");
+	if (!module_array)
+		return err_key_not_found("module");
+	if (toml_array_kind(module_array) != 't' ||
+	    toml_array_nelem(module_array) != ARRAY_SIZE(out->module))
+		return err_key_parse("module", "wrong array type or length != %d",
+				     ARRAY_SIZE(out->module));
+
+	/* parse modules array elements */
+	for (i = 0; i < toml_array_nelem(module_array); ++i) {
+		module = toml_table_at(module_array, i);
+		if (!module)
+			return err_key_parse("module", NULL);
+		mod = &out->module[i];
+
+		/* initialize parse context for each array element */
+		parse_ctx_init(&ctx);
+
+		/* non-configurable fields */
+
+		/* configurable fields */
+		parse_printable_key(module, &ctx, "name", mod->name, sizeof(mod->name), &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->type = parse_uint32_hex_key(module, &ctx, "type", 0x03, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->hash_algo = parse_uint32_hex_key(module, &ctx, "hash_algo", 0x00, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->meta_size = parse_uint32_key(module, &ctx, "meta_size", 112, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		/* check everything parsed */
+		ret = assert_everything_parsed(module, &ctx);
+		if (ret < 0)
+			return ret;
+	}
+
+	if (verbose)
+		dump_signed_pkg_ace_v1_5(out);
+
+	/*
+	 * values set in other places in code:
+	 * - module.hash
+	 */
+
+	return 0;
+}
+
+static void dump_partition_info_ext(const struct partition_info_ext *part_info)
+{
+	int i;
+
+	DUMP("\npartition_info");
+	DUMP_PRINTABLE_BYTES("name", part_info->name);
+	DUMP_KEY("part_version", "0x%x", part_info->part_version);
+	DUMP_KEY("instance_id", "%d", part_info->instance_id);
+	for (i = 0; i < ARRAY_SIZE(part_info->module); ++i) {
+		DUMP_PRINTABLE_BYTES("module.name", part_info->module[i].name);
+		DUMP_KEY("module.meta_size", "0x%x", part_info->module[i].meta_size);
+		DUMP_KEY("module.type", "0x%x", part_info->module[i].type);
+	}
+}
+
+static int parse_partition_info_ext(const toml_table_t *toml, struct parse_ctx *pctx,
+				    struct partition_info_ext *out, bool verbose)
+{
+	static const uint8_t module_reserved[3] = {0x00, 0xff, 0xff};
+	struct partition_info_module *mod;
+	toml_table_t *partition_info;
+	toml_array_t *module_array;
+	toml_table_t *module;
+	struct parse_ctx ctx;
+	int ret;
+	int i;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	partition_info = toml_table_in(toml, "partition_info");
+	if (!partition_info)
+		return err_key_not_found("partition_info");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non-configurable fields */
+	out->ext_type = PART_INFO_EXT_TYPE;
+	out->ext_len = sizeof(struct partition_info_ext);
+	memset(out->reserved, 0xff, sizeof(out->reserved));
+
+	/* configurable fields */
+	parse_printable_key(partition_info, &ctx, "name", out->name, sizeof(out->name), &ret);
+	if (ret < 0)
+		return ret;
+
+	out->vcn = parse_uint32_key(partition_info, &ctx, "vcn", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->part_version =
+		parse_uint32_hex_key(partition_info, &ctx, "part_version", 0x10000000, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->vcn = parse_uint32_hex_key(partition_info, &ctx, "part_version", 0x10000000, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->vcn = parse_uint32_hex_key(partition_info, &ctx, "fmt_version", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->instance_id = parse_uint32_key(partition_info, &ctx, "instance_id", 1, &ret);
+	if (ret < 0)
+		return ret;
+
+	out->part_flags = parse_uint32_key(partition_info, &ctx, "part_flags", 0, &ret);
+	if (ret < 0)
+		return ret;
+
+	/* check everything parsed, expect 1 array */
+	ctx.array_cnt += 1;
+	ret = assert_everything_parsed(partition_info, &ctx);
+	if (ret < 0)
+		return ret;
+
+	/* look for module array */
+	module_array = toml_array_in(partition_info, "module");
+	if (!module_array)
+		return err_key_not_found("module");
+	if (toml_array_kind(module_array) != 't' ||
+	    toml_array_nelem(module_array) > ARRAY_SIZE(out->module))
+		return err_key_parse("module", "wrong array type or length > %d",
+				     ARRAY_SIZE(out->module));
+
+	/* parse module array elements */
+	for (i = 0; i < toml_array_nelem(module_array); ++i) {
+		module = toml_table_at(module_array, i);
+		if (!module)
+			return err_key_parse("module", NULL);
+		mod = &out->module[i];
+
+		/* initialize parse context for each array element */
+		parse_ctx_init(&ctx);
+
+		/* non-configurable fields */
+		memcpy(mod->reserved, module_reserved, sizeof(mod->reserved));
+
+		/* configurable fields */
+		parse_printable_key(module, &ctx, "name", mod->name, sizeof(mod->name), &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->meta_size = parse_uint32_key(module, &ctx, "meta_size", 96, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		mod->type = parse_uint32_hex_key(module, &ctx, "type", 0x03, &ret);
+		if (ret < 0)
+			return err_key_parse("module", NULL);
+
+		/* check everything parsed */
+		ret = assert_everything_parsed(module, &ctx);
+		if (ret < 0)
+			return ret;
+	}
+
+	if (verbose)
+		dump_partition_info_ext(out);
+
+	/*
+	 * values set in other places in code:
+	 * - length
+	 * - hash
+	 * - module.hash
+	 */
+
+	return 0;
+}
+
+static int parse_info_ext_0x16(const toml_table_t *toml, struct parse_ctx *pctx,
+				    struct info_ext_0x16 *out, bool verbose)
+{
+	/* known */
+	out->ext_type = 0x16;
+	out->ext_len = sizeof(*out);
+	out->name[0] = 'A';
+	out->name[1] = 'D';
+	out->name[2] = 'S';
+	out->name[3] = 'P';
+
+	/* copied from meu - unknown */
+	out->data[0] = 0x10000000;
+	out->data[2] = 0x1;
+	out->data[3] = 0x0;
+	out->data[4] = 0x3003;
+
+	return 0;
+}
+
+static void dump_adsp_file_ext_v1_8(const struct sof_man_adsp_meta_file_ext_v1_8 *adsp_file)
+{
+	int i;
+	int j;
+
+	DUMP("\nadsp_file_ext 1.8");
+	DUMP_KEY("imr_type", "0x%x", adsp_file->imr_type);
+	for (i = 0; i < ARRAY_SIZE(adsp_file->comp_desc); ++i) {
+		DUMP_KEY("comp.version", "0x%x", adsp_file->comp_desc[i].version);
+		DUMP_KEY("comp.base_offset", "0x%x", adsp_file->comp_desc[i].base_offset);
+		for (j = 0; j < ARRAY_SIZE(adsp_file->comp_desc->attributes); ++j)
+			DUMP_KEY("comp.atributes[]", "%d", adsp_file->comp_desc[i].attributes[j]);
+	}
+}
+
+static int parse_adsp_file_ext_v1_8(const toml_table_t *toml, struct parse_ctx *pctx,
+				    struct sof_man_adsp_meta_file_ext_v1_8 *out, bool verbose)
+{
+	struct sof_man_component_desc_v1_8 *desc;
+	toml_array_t *attributes_array;
+	toml_table_t *adsp_file_ext;
+	toml_array_t *comp_array;
+	struct parse_ctx ctx;
+	toml_raw_t attribute;
+	toml_table_t *comp;
+	int64_t temp_i;
+	int ret;
+	int i;
+	int j;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	adsp_file_ext = toml_table_in(toml, "adsp_file");
+	if (!adsp_file_ext)
+		return err_key_not_found("adsp_file");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non configurable flieds */
+	out->ext_type = 17; /* always 17 for ADSP extension */
+	out->ext_len = sizeof(struct sof_man_adsp_meta_file_ext_v1_8);
+
+	/* configurable fields */
+	out->imr_type = parse_uint32_hex_key(adsp_file_ext, &ctx, "imr_type",
+					     MAN_DEFAULT_IMR_TYPE, &ret);
+	if (ret < 0)
+		return ret;
+
+	/* check everything parsed, expect 1 array */
+	ctx.array_cnt += 1;
+	ret = assert_everything_parsed(adsp_file_ext, &ctx);
+	if (ret < 0)
+		return ret;
+
+	/* parse comp array */
+	comp_array = toml_array_in(adsp_file_ext, "comp");
+	if (!comp_array)
+		return err_key_not_found("comp");
+	if (toml_array_nelem(comp_array) != 1 || toml_array_kind(comp_array) != 't')
+		return err_key_parse("comp", "wrong array type or length != 1");
+
+	/* parse comp array elements */
+	for (i = 0; i < toml_array_nelem(comp_array); ++i) {
+		comp = toml_table_at(comp_array, i);
+		if (!comp)
+			return err_key_parse("comp", NULL);
+		desc = &out->comp_desc[i];
+
+		/* initialize parse context for each array element */
+		parse_ctx_init(&ctx);
+
+		/* non-configurable fields */
+
+		/* configurable fields */
+		desc->version = parse_uint32_key(comp, &ctx, "version", 0, &ret);
+		if (ret < 0)
+			return err_key_parse("comp", NULL);
+
+		desc->base_offset = parse_uint32_hex_key(comp, &ctx, "base_offset",
+							 MAN_DESC_OFFSET_V1_8, &ret);
+		if (ret < 0)
+			return err_key_parse("comp", NULL);
+
+		/* parse attributes array */
+		attributes_array = toml_array_in(comp, "attributes");
+		if (attributes_array) {
+			++ctx.array_cnt;
+			if (toml_array_nelem(attributes_array) > ARRAY_SIZE(desc->attributes) ||
+			    toml_array_kind(attributes_array) != 'v' ||
+			    toml_array_type(attributes_array) != 'i')
+				return err_key_parse("comp.attributes",
+						     "wrong array type or length > %d",
+						     ARRAY_SIZE(desc->attributes));
+			for (j = 0; j < toml_array_nelem(attributes_array); ++j) {
+				attribute = toml_raw_at(attributes_array, j);
+				if (!attribute)
+					err_key_parse("comp.attributes", NULL);
+				ret = toml_rtoi(attribute, &temp_i);
+				if (ret < 0 || temp_i < 0 || temp_i > UINT32_MAX)
+					err_key_parse("comp.attributes", NULL);
+				desc->attributes[j] = (uint32_t)temp_i;
+			}
+		}
+
+		/* check everything parsed */
+		ret = assert_everything_parsed(comp, &ctx);
+		if (ret < 0)
+			return ret;
+	}
+
+	if (verbose)
+		dump_adsp_file_ext_v1_8(out);
+
+	/*
+	 * values set in other places in code:
+	 * - imr_type
+	 * - comp.limit_offset
+	 */
+
+	return 0;
+}
+
+static void dump_adsp_file_ext_v2_5(const struct sof_man_adsp_meta_file_ext_v2_5 *adsp_file)
+{
+	int i;
+	int j;
+
+	DUMP("\nadsp_file 2.5");
+	DUMP_KEY("imr_type", "0x%x", adsp_file->imr_type);
+	for (i = 0; i < ARRAY_SIZE(adsp_file->comp_desc); ++i) {
+		DUMP_KEY("comp.version", "0x%x", adsp_file->comp_desc[i].version);
+		DUMP_KEY("comp.base_offset", "0x%x", adsp_file->comp_desc[i].base_offset);
+		for (j = 0; j < ARRAY_SIZE(adsp_file->comp_desc->attributes); ++j)
+			DUMP_KEY("comp.atributes[]", "%d", adsp_file->comp_desc[i].attributes[j]);
+	}
+}
+
+static int parse_adsp_file_ext_v2_5(const toml_table_t *toml, struct parse_ctx *pctx,
+				    struct sof_man_adsp_meta_file_ext_v2_5 *out, bool verbose)
+{
+	struct sof_man_component_desc_v2_5 *desc;
+	toml_array_t *attributes_array;
+	toml_table_t *adsp_file_ext;
+	toml_array_t *comp_array;
+	struct parse_ctx ctx;
+	toml_raw_t attribute;
+	toml_table_t *comp;
+	int64_t temp_i;
+	int ret;
+	int i;
+	int j;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	adsp_file_ext = toml_table_in(toml, "adsp_file");
+	if (!adsp_file_ext)
+		return err_key_not_found("adsp_file");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	/* non configurable flieds */
+	out->ext_type = 17; /* always 17 for ADSP extension */
+	out->ext_len = sizeof(struct sof_man_adsp_meta_file_ext_v2_5);
+
+	/* configurable fields */
+	out->imr_type = parse_uint32_hex_key(adsp_file_ext, &ctx, "imr_type",
+					     MAN_DEFAULT_IMR_TYPE, &ret);
+	if (ret < 0)
+		return ret;
+
+	/* check everything parsed, expect 1 array */
+	ctx.array_cnt += 1;
+	ret = assert_everything_parsed(adsp_file_ext, &ctx);
+	if (ret < 0)
+		return ret;
+
+	/* parse comp array */
+	comp_array = toml_array_in(adsp_file_ext, "comp");
+	if (!comp_array)
+		return err_key_not_found("comp");
+	if (toml_array_nelem(comp_array) != 1 || toml_array_kind(comp_array) != 't')
+		return err_key_parse("comp", "wrong array type or length != 1");
+
+	/* parse comp array elements */
+	for (i = 0; i < toml_array_nelem(comp_array); ++i) {
+		comp = toml_table_at(comp_array, i);
+		if (!comp)
+			return err_key_parse("comp", NULL);
+		desc = &out->comp_desc[i];
+
+		/* initialize parse context for each array element */
+		parse_ctx_init(&ctx);
+
+		/* non configurable flieds */
+
+		/* configurable fields */
+		desc->version = parse_uint32_key(comp, &ctx, "version", 0, &ret);
+		if (ret < 0)
+			return err_key_parse("comp", NULL);
+
+		desc->base_offset = parse_uint32_hex_key(comp, &ctx, "base_offset", 0x2000, &ret);
+		if (ret < 0)
+			return err_key_parse("comp", NULL);
+
+		/* parse attributes array */
+		attributes_array = toml_array_in(comp, "attributes");
+		if (attributes_array) {
+			++ctx.array_cnt;
+			if (toml_array_nelem(attributes_array) > ARRAY_SIZE(desc->attributes) ||
+			    toml_array_kind(attributes_array) != 'v' ||
+			    toml_array_type(attributes_array) != 'i')
+				return err_key_parse("comp.attributes",
+						     "wrong array type or length > %d",
+						     ARRAY_SIZE(desc->attributes));
+			for (j = 0; j < toml_array_nelem(attributes_array); ++j) {
+				attribute = toml_raw_at(attributes_array, j);
+				if (!attribute)
+					err_key_parse("comp.attributes", NULL);
+				ret = toml_rtoi(attribute, &temp_i);
+				if (ret < 0 || temp_i < 0 || temp_i > UINT32_MAX)
+					err_key_parse("comp.attributes", NULL);
+				desc->attributes[j] = (uint32_t)temp_i;
+			}
+		}
+
+		/* check everything parsed */
+		ret = assert_everything_parsed(comp, &ctx);
+		if (ret < 0)
+			return ret;
+	}
+
+	if (verbose)
+		dump_adsp_file_ext_v2_5(out);
+
+	/*
+	 * values set in other places in code:
+	 * - imr_type
+	 * - comp.limit_offset
+	 */
+
+	return 0;
+}
+
+static void dump_fw_desc(const struct sof_man_fw_desc *fw_desc)
+{
+	DUMP("\nfw_desc.header");
+	DUMP_KEY("header_id", "'%c%c%c%c'", fw_desc->header.header_id[0],
+		 fw_desc->header.header_id[1], fw_desc->header.header_id[2],
+		 fw_desc->header.header_id[3]);
+	DUMP_PRINTABLE_BYTES("name", fw_desc->header.name);
+	DUMP_KEY("preload_page_count", "%d", fw_desc->header.preload_page_count);
+	DUMP_KEY("fw_image_flags", "0x%x", fw_desc->header.fw_image_flags);
+	DUMP_KEY("feature_mask", "0x%x", fw_desc->header.feature_mask);
+	DUMP_KEY("hw_buf_base_addr", "0x%x", fw_desc->header.fw_compat);
+	DUMP_KEY("hw_buf_length", "0x%x", fw_desc->header.hw_buf_length);
+	DUMP_KEY("load_offset", "0x%x", fw_desc->header.load_offset);
+}
+
+static int parse_fw_desc(const toml_table_t *toml, struct parse_ctx *pctx,
+			 struct sof_man_fw_desc *out, bool verbose)
+{
+	static const uint8_t header_id[4] = SOF_MAN_FW_HDR_ID;
+	struct parse_ctx ctx;
+	toml_table_t *header;
+	toml_table_t *desc;
+	int ret;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	desc = toml_table_in(toml, "fw_desc");
+	if (!desc)
+		return err_key_not_found("fw_desc");
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	header = toml_table_in(desc, "header");
+	if (!header)
+		return err_key_not_found("header");
+	++ctx.table_cnt;
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(desc, &ctx);
+	if (ret < 0)
+		return ret;
+
+	/* initialize parser context for header subtable */
+	parse_ctx_init(&ctx);
+
+	/* non configurable flieds */
+	memcpy(&out->header.header_id, header_id, sizeof(header_id));
+	out->header.header_len = sizeof(struct sof_man_fw_header);
+
+	/* configurable fields */
+	parse_printable_key(header, &ctx, "name", out->header.name, sizeof(out->header.name),
+			    &ret);
+	if (ret < 0)
+		return err_key_parse("header", NULL);
+
+	out->header.preload_page_count =
+		parse_uint32_key(header, &ctx, "preload_page_count", 0, &ret);
+	if (ret < 0)
+		return err_key_parse("header", NULL);
+
+	out->header.fw_image_flags =
+		parse_uint32_hex_key(header, &ctx, "fw_image_flags", SOF_MAN_FW_HDR_FLAGS, &ret);
+	if (ret < 0)
+		return err_key_parse("header", NULL);
+
+	out->header.feature_mask =
+		parse_uint32_hex_key(header, &ctx, "feature_mask", SOF_MAN_FW_HDR_FEATURES, &ret);
+	if (ret < 0)
+		return err_key_parse("header", NULL);
+
+	out->header.fw_compat =
+		parse_uint32_hex_key(header, &ctx, "hw_buf_base_addr", 0, &ret);
+	if (ret < 0)
+		return err_key_parse("header", NULL);
+
+	out->header.hw_buf_length = parse_uint32_hex_key(header, &ctx, "hw_buf_length", 0, &ret);
+	if (ret < 0)
+		return err_key_parse("header", NULL);
+
+	out->header.load_offset = parse_uint32_hex_key(header, &ctx, "load_offset", -1, &ret);
+	if (ret < 0)
+		return err_key_parse("header", NULL);
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(header, &ctx);
+	if (ret < 0)
+		return ret;
+
+	if (verbose)
+		dump_fw_desc(out);
+
+	/*
+	 * values set in other places in code:
+	 * - major_version
+	 * - minor_version
+	 * - build_version
+	 * - num_module_entries
+	 */
+
+	return 0;
+}
+
+static int parse_scheduling(const toml_table_t *mod_entry, struct parse_ctx *ctx,
+			    struct fw_image_ext_mod_config *ext_mod_config, int *ext_length)
+{
+	toml_array_t *arr;
+	toml_raw_t raw;
+	int64_t val;
+	int ret;
+
+	/* check "sched_caps" key */
+	arr = toml_array_in(mod_entry, "sched_caps");
+	if (!arr) {
+		ext_mod_config->header.num_scheduling_capabilities = 0;
+		*ext_length = 0;
+		return 0;
+	}
+
+	if (toml_array_type(arr) != 'i'  || toml_array_nelem(arr) != 2 ||
+	    toml_array_kind(arr) != 'v')
+		return err_key_parse("sched_caps", "wrong array type or length != 2");
+
+	ctx->array_cnt++;
+
+	raw = toml_raw_at(arr, 0);
+	if (raw == 0)
+		return err_key_parse("frame_length", NULL);
+	ret = toml_rtoi(raw, &val);
+	if (ret < 0)
+		return err_key_parse("frame_length", "can't convert element to integer");
+	ext_mod_config->sched_caps.frame_length = val;
+
+	raw = toml_raw_at(arr, 1);
+	if (raw == 0)
+		return err_key_parse("multiples_supported", NULL);
+	ret = toml_rtoi(raw, &val);
+	if (ret < 0)
+		return err_key_parse("multiples_supported", "can't convert element to integer");
+	ext_mod_config->sched_caps.multiples_supported.ul = val;
+
+	ext_mod_config->header.num_scheduling_capabilities = 1;
+	*ext_length = sizeof(const struct mod_scheduling_caps);
+
+	return 0;
+}
+
+static int parse_pin(const toml_table_t *mod_entry, struct parse_ctx *ctx,
+		     struct fw_image_ext_mod_config *ext_mod_config, int *ext_length)
+{
+	toml_array_t *arr;
+	toml_raw_t raw;
+	int64_t val;
+	int ret;
+	int i, j;
+
+	/* check "pin" key */
+	arr = toml_array_in(mod_entry, "pin");
+	if (!arr) {
+		ext_mod_config->header.num_pin_entries = 0;
+		*ext_length = 0;
+		return 0;
+	}
+
+	if (toml_array_type(arr) != 'i'  || toml_array_kind(arr) != 'v')
+		return err_key_parse("pin", "wrong array type");
+
+	ctx->array_cnt++;
+
+	ext_mod_config->header.num_pin_entries = toml_array_nelem(arr) / 6;
+	ext_mod_config->pin_desc = calloc(sizeof(const struct fw_pin_description),
+					  toml_array_nelem(arr) / 6);
+
+	if(!ext_mod_config->pin_desc)
+		return err_malloc("pin");
+
+	j = 0;
+	for (i = 0; ; i += 6, j++) {
+		raw = toml_raw_at(arr, i);
+		if (raw == 0)
+			break;
+
+		ret = toml_rtoi(raw, &val);
+		if (ret < 0)
+			return err_key_parse("pin", "can't convert element to integer");
+		ext_mod_config->pin_desc[j].caps.ul = (uint16_t)val;
+
+		raw = toml_raw_at(arr, i + 1);
+		ret = toml_rtoi(raw, &val);
+		if (ret < 0)
+			return err_key_parse("pin", "can't convert element to integer");
+		ext_mod_config->pin_desc[j].format_type = (enum mod_stream_type)val;
+
+		raw = toml_raw_at(arr, i + 2);
+		ret = toml_rtoi(raw, &val);
+		if (ret < 0)
+			return err_key_parse("pin", "can't convert element to integer");
+		ext_mod_config->pin_desc[j].sample_rate.ul = (uint32_t)val;
+
+		raw = toml_raw_at(arr, i + 3);
+		ret = toml_rtoi(raw, &val);
+		if (ret < 0)
+			return err_key_parse("pin", "can't convert element to integer");
+		ext_mod_config->pin_desc[j].sample_size.ul = (uint16_t)val;
+
+		raw = toml_raw_at(arr, i + 4);
+		ret = toml_rtoi(raw, &val);
+		if (ret < 0)
+			return err_key_parse("pin", "can't convert element to integer");
+		ext_mod_config->pin_desc[j].sample_container.ul = (uint32_t)val;
+
+		raw = toml_raw_at(arr, i + 5);
+		ret = toml_rtoi(raw, &val);
+		if (ret < 0)
+			return err_key_parse("pin", "can't convert element to integer");
+		ext_mod_config->pin_desc[j].ch_cfg.ul = (uint32_t)val;
+	}
+
+	*ext_length = ext_mod_config->header.num_pin_entries *
+			sizeof(const struct fw_pin_description);
+
+	return 0;
+}
+
+static int parse_mod_config(const toml_table_t *mod_entry, struct parse_ctx *ctx,
+			    struct fw_image_manifest_module *modules,
+			    struct sof_man_module *mod_man)
+{
+	toml_array_t *arr;
+	toml_raw_t raw;
+	int *pin_data;
+	int64_t val;
+	int ret;
+	int i;
+
+	/* check "pin" key */
+	arr = toml_array_in(mod_entry, "mod_cfg");
+	if (!arr) {
+		mod_man->cfg_count = 0;
+		return 0;
+	}
+
+	if (toml_array_type(arr) != 'i' || toml_array_kind(arr) != 'v')
+		return err_key_parse("mod_cfg", "wrong array type");
+
+	ctx->array_cnt++;
+
+	pin_data = (int *)(modules->mod_cfg + modules->mod_cfg_count);
+	mod_man->cfg_offset = modules->mod_cfg_count;
+	modules->mod_cfg_count += toml_array_nelem(arr) / 11;
+	mod_man->cfg_count = toml_array_nelem(arr) / 11;
+
+	/* parse "pin" array elements */
+	for (i = 0; ; ++i) {
+		raw = toml_raw_at(arr, i);
+		if (raw == 0)
+			break;
+
+		ret = toml_rtoi(raw, &val);
+		if (ret < 0)
+			return err_key_parse("mod_cfg", "can't convert element to integer");
+		pin_data[i] = val;
+	}
+
+	return 0;
+}
+
+static void dump_module(struct fw_image_manifest_module *man_cavs)
+{
+	int i;
+
+	DUMP("\nmodule");
+	DUMP_KEY("moudle count", "%d", man_cavs->mod_man_count);
+	DUMP_KEY("module config count", "%d", man_cavs->mod_cfg_count);
+
+	for (i = 0; i < man_cavs->mod_man_count; i++) {
+		DUMP_PRINTABLE_BYTES("module name", man_cavs->mod_man[i].name);
+		DUMP_KEY("load type", "%d", man_cavs->mod_man[i].type.load_type);
+		DUMP_KEY("init config", "%d", man_cavs->mod_man[i].type.init_config);
+		DUMP_KEY("domain ll", "%d", man_cavs->mod_man[i].type.domain_ll);
+		DUMP_KEY("domain dp", "%d", man_cavs->mod_man[i].type.domain_dp);
+		DUMP_KEY("config count", "%d", man_cavs->mod_man[i].cfg_count);
+		DUMP_KEY("config offset", "%d", man_cavs->mod_man[i].cfg_offset);
+	}
+}
+
+static int parse_module(const toml_table_t *toml, struct parse_ctx *pctx,
+			struct adsp *out, bool verbose)
+{
+	struct fw_image_manifest_module *modules;
+	toml_array_t *mod_entry_array;
+	toml_table_t *module;
+	toml_table_t *mod_entry;
+	struct parse_ctx ctx;
+	int entry_count;
+	int type, ext_length;
+	int tmp_cfg_count;
+	int ret, i;
+
+	/* look for subtable in toml, increment pctx parsed table cnt and initialize local ctx */
+	module = toml_table_in(toml, "module");
+	if (!module)
+		return 0;
+
+	out->write_firmware_ext_man = ext_man_write_cavs_25;
+
+	modules = calloc(sizeof(struct fw_image_manifest_module), 1);
+	if (!modules)
+		return err_malloc("man_cavs");
+	out->modules = modules;
+
+	++pctx->table_cnt;
+	parse_ctx_init(&ctx);
+
+	entry_count = parse_uint32_key(module, &ctx, "count", 2, &ret);
+	if (ret < 0)
+		return ret;
+
+	ctx.array_cnt += 1;
+
+	mod_entry_array = toml_array_in(module, "entry");
+	if (!mod_entry_array)
+		return err_key_not_found("entry");
+	if (toml_array_kind(mod_entry_array) != 't' ||
+	    toml_array_nelem(mod_entry_array) != entry_count)
+		return err_key_parse("entry", "wrong array type or length != %d", entry_count);
+
+	modules->mod_ext.mod_conf_count = entry_count;
+	modules->mod_man = calloc(sizeof(const struct sof_man_module), entry_count);
+	if (!modules->mod_man)
+		return -ENOMEM;
+
+	modules->mod_man_count = toml_array_nelem(mod_entry_array);
+
+	tmp_cfg_count = entry_count * 32;
+	modules->mod_cfg = calloc(sizeof(const struct sof_man_mod_config), tmp_cfg_count);
+
+	/* parse entry array elements */
+	for (i = 0; i < toml_array_nelem(mod_entry_array); ++i) {
+		struct fw_ext_mod_config_header *header;
+		struct sof_man_module *mod_man;
+		struct parse_ctx ctx_entry;
+		char buf[48];
+
+		mod_entry = toml_table_at(mod_entry_array, i);
+		if (!mod_entry)
+			return err_key_parse("entry", NULL);
+
+		/* initialize parse context for each array element */
+		parse_ctx_init(&ctx_entry);
+
+		mod_man = &modules->mod_man[i];
+
+		memcpy(mod_man->struct_id, "$AME", 4);
+
+		/* configurable fields */
+		parse_printable_key(mod_entry, &ctx_entry, "name", mod_man->name,
+				    sizeof(mod_man->name), &ret);
+		if (ret < 0)
+			return err_key_parse("name", NULL);
+
+		parse_str_key(mod_entry, &ctx_entry, "uuid", buf, sizeof(buf),
+			      &ret);
+		if (ret < 0)
+			return err_key_parse("uuid", NULL);
+
+		parse_uuid(buf, mod_man->uuid);
+
+		mod_man->affinity_mask = parse_uint32_hex_key(mod_entry, &ctx_entry,
+							      "affinity_mask", 1, &ret);
+		if (ret < 0)
+			return err_key_parse("affinity_mask", NULL);
+
+		mod_man->instance_max_count = parse_uint32_hex_key(mod_entry, &ctx_entry,
+								   "instance_count", 1, &ret);
+		if (ret < 0)
+			return err_key_parse("instance_count", NULL);
+
+		type = parse_uint32_hex_key(mod_entry, &ctx_entry, "domain_types", 0, &ret);
+		if (ret < 0)
+			return err_key_parse("domain_types", NULL);
+		if (!type)
+			mod_man->type.domain_ll = 1;
+		else
+			mod_man->type.domain_dp = 1;
+
+		mod_man->type.load_type = parse_uint32_hex_key(mod_entry, &ctx_entry,
+							       "load_type", 1, &ret);
+		if (ret < 0)
+			return err_key_parse("load_type", NULL);
+
+		mod_man->type.init_config = parse_uint32_hex_key(mod_entry, &ctx_entry,
+								"init_config", 0, &ret);
+		if (ret < 0)
+			return err_key_parse("init_config", NULL);
+
+		mod_man->type.auto_start = parse_uint32_hex_key(mod_entry, &ctx_entry,
+								"auto_start", 1, &ret);
+		if (ret < 0)
+			return err_key_parse("auto_start", NULL);
+
+		header = &modules->mod_ext.ext_mod_config_array[i].header;
+		header->version_major = 2;
+		header->version_minor = 5;
+		header->ext_module_config_length = sizeof(struct fw_ext_mod_config_header);
+		memcpy(header->guid, mod_man->uuid, sizeof(mod_man->uuid));
+
+		type = parse_uint32_hex_key(mod_entry, &ctx_entry, "module_type", 1, &ret);
+		if (ret < 0)
+			return err_key_parse("module_type", NULL);
+
+		header->module_type = type;
+
+		ret = parse_scheduling(mod_entry, &ctx_entry,
+				       modules->mod_ext.ext_mod_config_array + i, &ext_length);
+		if (ret < 0)
+			return err_key_parse("schd_caps", NULL);
+		header->ext_module_config_length += ext_length;
+
+		ret = parse_pin(mod_entry, &ctx_entry, modules->mod_ext.ext_mod_config_array + i,
+				&ext_length);
+		if (ret < 0)
+			return err_key_parse("pin", NULL);
+		header->ext_module_config_length += ext_length;
+
+		ret = parse_mod_config(mod_entry, &ctx_entry, modules, mod_man);
+		if (ret < 0)
+			return err_key_parse("mod_cfg", NULL);
+
+		if (modules->mod_cfg_count > tmp_cfg_count)
+			return -ENOMEM;
+
+		/* check everything parsed */
+		ret = assert_everything_parsed(mod_entry, &ctx_entry);
+		if (ret < 0)
+			return ret;
+	}
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(module, &ctx);
+	if (ret < 0)
+		return ret;
+
+	if (verbose)
+		dump_module(modules);
+
+	return 0;
+}
+
+static int parse_adsp_config_v1_0(const toml_table_t *toml, struct image *image)
+{
+	struct adsp *out = image->adsp;
+	bool verbose = image->verbose;
+	struct parse_ctx ctx;
+	int ret;
+
+	/* version array has already been parsed, so increment ctx.array_cnt */
+	parse_ctx_init(&ctx);
+	++ctx.array_cnt;
+
+	/* parse each adsp subtable, sue platform has different manifest definition */
+	ret = parse_adsp(toml, &ctx, out, verbose);
+	if (ret < 0)
+		return err_key_parse("adsp", NULL);
+
+	/* assign correct write functions */
+	out->write_firmware = simple_write_firmware;
+	out->write_firmware_meu = NULL;
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(toml, &ctx);
+	if (ret < 0)
+		return ret;
+
+	return 0;
+}
+
+static int parse_adsp_config_v1_5(const toml_table_t *toml, struct image *image)
+{
+	struct adsp *out = image->adsp;
+	bool verbose = image->verbose;
+	struct parse_ctx ctx;
+	int ret;
+
+	/* version array has already been parsed, so increment ctx.array_cnt */
+	parse_ctx_init(&ctx);
+	++ctx.array_cnt;
+
+	/* parse each adsp subtable, sue platform has different manifest definition */
+	ret = parse_adsp(toml, &ctx, out, verbose);
+	if (ret < 0)
+		return err_key_parse("adsp", NULL);
+
+	/* suecreek has dedicated manifest file */
+	if (!strcmp(out->name, "sue")) {
+		/* out free is done in client code */
+		out->man_v1_5_sue = malloc(sizeof(struct fw_image_manifest_v1_5_sue));
+		if (!out->man_v1_5_sue)
+			return err_malloc("man_v1_5_sue");
+
+		/* clear memory */
+		memset(out->man_v1_5_sue, 0, sizeof(*out->man_v1_5_sue));
+
+		/* assign correct write functions */
+		out->write_firmware = man_write_fw_v1_5_sue;
+		out->write_firmware_meu = man_write_fw_meu_v1_5;
+		out->verify_firmware = ri_manifest_verify_v1_5;
+
+		/* parse others sibtables */
+		ret = parse_fw_desc(toml, &ctx, &out->man_v1_5_sue->desc, verbose);
+		if (ret < 0)
+			return err_key_parse("fw_desc", NULL);
+	} else {
+		/* out free is done in client code */
+		out->man_v1_5 = malloc(sizeof(struct fw_image_manifest_v1_5));
+		if (!out->man_v1_5)
+			return err_malloc("man_v1_5");
+
+		/* clear memory */
+		memset(out->man_v1_5, 0, sizeof(*out->man_v1_5));
+
+		/* assign correct write functions */
+		out->write_firmware = man_write_fw_v1_5;
+		out->write_firmware_meu = man_write_fw_meu_v1_5;
+		out->verify_firmware = ri_manifest_verify_v1_5;
+
+		/* parse others sibtables */
+		ret = parse_css_v1_5(toml, &ctx, &out->man_v1_5->css_header, verbose);
+		if (ret < 0)
+			return err_key_parse("css", NULL);
+
+		ret = parse_fw_desc(toml, &ctx, &out->man_v1_5->desc, verbose);
+		if (ret < 0)
+			return err_key_parse("fw_desc", NULL);
+	}
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(toml, &ctx);
+	if (ret < 0)
+		return ret;
+
+	return 0;
+}
+
+static int parse_adsp_config_v1_8(const toml_table_t *toml, struct image *image)
+{
+	struct adsp *out = image->adsp;
+	bool verbose = image->verbose;
+	struct parse_ctx ctx;
+	int ret;
+
+	/* out free is done in client code */
+	out->man_v1_8 = malloc(sizeof(struct fw_image_manifest_v1_8));
+	if (!out->man_v1_8)
+		return err_malloc("man_v1_8");
+
+	/* clear memory */
+	memset(out->man_v1_8, 0, sizeof(*out->man_v1_8));
+
+	/* assign correct write functions */
+	out->write_firmware = man_write_fw_v1_8;
+	out->write_firmware_meu = man_write_fw_meu_v1_8;
+	out->verify_firmware = ri_manifest_verify_v1_8;
+
+	/* version array has already been parsed, so increment ctx.array_cnt */
+	parse_ctx_init(&ctx);
+	++ctx.array_cnt;
+
+	/* parse each toml subtable */
+	ret = parse_adsp(toml, &ctx, out, verbose);
+	if (ret < 0)
+		return err_key_parse("adsp", NULL);
+
+	ret = parse_cse(toml, &ctx, &out->man_v1_8->cse_partition_dir_header,
+			out->man_v1_8->cse_partition_dir_entry, MAN_CSE_PARTS, verbose);
+	if (ret < 0)
+		return err_key_parse("cse", NULL);
+
+	ret = parse_css_v1_8(toml, &ctx, &out->man_v1_8->css, verbose);
+	if (ret < 0)
+		return err_key_parse("css", NULL);
+
+	ret = parse_signed_pkg(toml, &ctx, image, verbose);
+	if (ret < 0)
+		return err_key_parse("signed_pkg", NULL);
+
+	ret = parse_partition_info_ext(toml, &ctx, &out->man_v1_8->partition_info, verbose);
+	if (ret < 0)
+		return err_key_parse("partition_info", NULL);
+
+	ret = parse_adsp_file_ext_v1_8(toml, &ctx, &out->man_v1_8->adsp_file_ext, verbose);
+	if (ret < 0)
+		return err_key_parse("adsp_file", NULL);
+
+	ret = parse_fw_desc(toml, &ctx, &out->man_v1_8->desc, verbose);
+	if (ret < 0)
+		return err_key_parse("fw_desc", NULL);
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(toml, &ctx);
+	if (ret < 0)
+		return ret;
+
+	return 0;
+}
+
+static int parse_adsp_config_v2_5(const toml_table_t *toml, struct image *image)
+{
+	struct adsp *out = image->adsp;
+	bool verbose = image->verbose;
+	struct parse_ctx ctx;
+	int ret;
+
+	/* out free is done in client code */
+	out->man_v2_5 = malloc(sizeof(struct fw_image_manifest_v2_5));
+	if (!out->man_v2_5)
+		return err_malloc("man_v2_5");
+
+	/* clear memory */
+	memset(out->man_v2_5, 0, sizeof(*out->man_v2_5));
+
+	/* assign correct write functions */
+	out->write_firmware = man_write_fw_v2_5;
+	out->write_firmware_meu = man_write_fw_meu_v2_5;
+	out->verify_firmware = ri_manifest_verify_v2_5;
+
+	/* version array has already been parsed, so increment ctx.array_cnt */
+	parse_ctx_init(&ctx);
+	++ctx.array_cnt;
+
+	/* parse each toml subtable */
+	ret = parse_adsp(toml, &ctx, out, verbose);
+	if (ret < 0)
+		return err_key_parse("adsp", NULL);
+
+	ret = parse_cse_v2_5(toml, &ctx, &out->man_v2_5->cse_partition_dir_header,
+			out->man_v2_5->cse_partition_dir_entry, MAN_CSE_PARTS, verbose);
+	if (ret < 0)
+		return err_key_parse("cse", NULL);
+
+	ret = parse_css_v2_5(toml, &ctx, &out->man_v2_5->css, verbose);
+	if (ret < 0)
+		return err_key_parse("css", NULL);
+
+	ret = parse_signed_pkg_v2_5(toml, &ctx, image, verbose);
+	if (ret < 0)
+		return err_key_parse("signed_pkg", NULL);
+
+	ret = parse_info_ext_0x16(toml, &ctx, &out->man_v2_5->info_0x16, verbose);
+	if (ret < 0)
+		return err_key_parse("partition_info", NULL);
+
+	ret = parse_adsp_file_ext_v2_5(toml, &ctx, &out->man_v2_5->adsp_file_ext, verbose);
+	if (ret < 0)
+		return err_key_parse("adsp_file", NULL);
+
+	ret = parse_fw_desc(toml, &ctx, &out->man_v2_5->desc, verbose);
+	if (ret < 0)
+		return err_key_parse("fw_desc", NULL);
+
+	ret = parse_module(toml, &ctx, out, verbose);
+	if (ret < 0)
+		return err_key_parse("module", NULL);
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(toml, &ctx);
+	if (ret < 0)
+		return ret;
+
+	return 0;
+}
+
+static int parse_adsp_config_ace_v1_5(const toml_table_t *toml, struct image *image)
+{
+	struct adsp *out = image->adsp;
+	bool verbose = image->verbose;
+	struct parse_ctx ctx;
+	int ret;
+
+	out->man_ace_v1_5 = malloc(sizeof(struct fw_image_manifest_ace_v1_5));
+	if (!out->man_ace_v1_5)
+		return err_malloc("man_ace_v1_5");
+
+	/* clear memory */
+	memset(out->man_ace_v1_5, 0, sizeof(*out->man_ace_v1_5));
+
+	/* assign correct write functions */
+	out->write_firmware = man_write_fw_ace_v1_5;
+	out->write_firmware_meu = man_write_fw_meu_v2_5;
+	out->verify_firmware = ri_manifest_verify_v2_5;
+
+	/* version array has already been parsed, so increment ctx.array_cnt */
+	parse_ctx_init(&ctx);
+	++ctx.array_cnt;
+
+	/* parse each toml subtable */
+	ret = parse_adsp(toml, &ctx, out, verbose);
+	if (ret < 0)
+		return err_key_parse("adsp", NULL);
+
+	ret = parse_cse_v2_5(toml, &ctx, &out->man_ace_v1_5->cse_partition_dir_header,
+			out->man_ace_v1_5->cse_partition_dir_entry, 3, verbose);
+	if (ret < 0)
+		return err_key_parse("cse", NULL);
+
+	ret = parse_css_v2_5(toml, &ctx, &out->man_ace_v1_5->css, verbose);
+	if (ret < 0)
+		return err_key_parse("css", NULL);
+
+	ret = parse_signed_pkg_ace_v1_5(toml, &ctx, image, verbose);
+	if (ret < 0)
+		return err_key_parse("signed_pkg", NULL);
+
+	ret = parse_info_ext_0x16(toml, &ctx, &out->man_ace_v1_5->info_0x16, verbose);
+	if (ret < 0)
+		return err_key_parse("partition_info", NULL);
+
+	ret = parse_adsp_file_ext_v2_5(toml, &ctx, &out->man_ace_v1_5->adsp_file_ext, verbose);
+	if (ret < 0)
+		return err_key_parse("adsp_file", NULL);
+
+	ret = parse_fw_desc(toml, &ctx, &out->man_ace_v1_5->desc, verbose);
+	if (ret < 0)
+		return err_key_parse("fw_desc", NULL);
+
+	ret = parse_module(toml, &ctx, out, verbose);
+	if (ret < 0)
+		return err_key_parse("module", NULL);
+
+	/* check everything parsed */
+	ret = assert_everything_parsed(toml, &ctx);
+	if (ret < 0)
+		return ret;
+
+	return 0;
+}
+
+struct config_parser {
+	int major;
+	int minor;
+	int (*parse)(const toml_table_t *toml, struct image *image);
+};
+
+static const struct config_parser *find_config_parser(int64_t version[2])
+{
+	/* list of supported configuration version with handler to parser */
+	static const struct config_parser parsers[] = {
+		{1, 0, parse_adsp_config_v1_0},
+		{1, 5, parse_adsp_config_v1_5},
+		{1, 8, parse_adsp_config_v1_8},
+		{2, 5, parse_adsp_config_v2_5},
+		{3, 0, parse_adsp_config_ace_v1_5},
+	};
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(parsers); ++i) {
+		if (parsers[i].major == version[0] &&
+		    parsers[i].minor == version[1]) {
+			return &parsers[i];
+		}
+	}
+	return NULL;
+}
+
+static int adsp_parse_config_fd(FILE *fd, struct image *image)
+{
+	const struct config_parser *parser;
+	int64_t manifest_version[2];
+	toml_table_t *toml;
+	char errbuf[256];
+	int ret;
+
+	/* whole toml file is parsed to global toml table at once */
+	toml = toml_parse_file(fd, errbuf, ARRAY_SIZE(errbuf));
+	if (!toml)
+		return log_err(-EINVAL, "error: toml file parsing, %s\n", errbuf);
+
+	/* manifest version is in toml root */
+	ret = parse_version(toml, manifest_version);
+	if (ret < 0)
+		goto error;
+
+	/* find parser compatible with manifest version */
+	parser = find_config_parser(manifest_version);
+	if (!parser) {
+		ret = log_err(-EINVAL, "error: Unsupported config version %d.%d\n",
+			      manifest_version[0], manifest_version[1]);
+		goto error;
+	}
+
+	/* run dedicated toml configuration parser */
+	ret = parser->parse(toml, image);
+error:
+	toml_free(toml);
+	return ret;
+}
+
+/* public function, fully handle parsing process */
+int adsp_parse_config(const char *file, struct image *image)
+{
+	FILE *fd;
+	int ret;
+
+	fd = fopen(file, "r");
+	if (!fd)
+		return file_error("unable to open file for reading", file);
+
+	ret = adsp_parse_config_fd(fd, image);
+	fclose(fd);
+	return ret;
+}
+
+/* free given pointer and internally allocated memory */
+void adsp_free(struct adsp *adsp)
+{
+	if (!adsp)
+		return;
+
+	if (adsp->man_v1_5)
+		free(adsp->man_v1_5);
+
+	if (adsp->man_v1_5_sue)
+		free(adsp->man_v1_5_sue);
+
+	if (adsp->man_v1_8)
+		free(adsp->man_v1_8);
+
+	if (adsp->man_v2_5)
+		free(adsp->man_v2_5);
+
+	if (adsp->modules)
+		free(adsp->modules);
+
+	if (adsp->name)
+		free((char *)adsp->name);
+
+	free(adsp);
+}
diff --git a/tools/rimage/src/cse.c b/tools/rimage/src/cse.c
new file mode 100644
index 000000000000..3c5e9c561856
--- /dev/null
+++ b/tools/rimage/src/cse.c
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2017 Intel Corporation. All rights reserved.
+//
+// Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+//         Keyon Jie <yang.jie@linux.intel.com>
+
+#include <stdio.h>
+#include <stdbool.h>
+#include <rimage/rimage.h>
+#include <rimage/cse.h>
+#include <rimage/manifest.h>
+
+void ri_cse_create(struct image *image)
+{
+	struct CsePartitionDirHeader *cse_hdr = image->fw_image;
+	struct sof_man_adsp_meta_file_ext_v1_8 *meta = image->fw_image +
+		MAN_META_EXT_OFFSET_V1_8;
+	struct CsePartitionDirEntry *cse_entry =
+		image->fw_image + sizeof(*cse_hdr);
+	uint8_t csum = 0, *val = image->fw_image;
+	int i, size;
+
+	fprintf(stdout, " cse: completing CSE V1.8 manifest\n");
+
+	cse_entry[2].length = meta->comp_desc[0].limit_offset -
+		MAN_DESC_OFFSET_V1_8;
+
+	/* calculate checksum using BSD algo */
+	size = sizeof(*cse_hdr) + sizeof(*cse_entry) * MAN_CSE_PARTS;
+	for (i = 0; i < size; i++) {
+		if (i == 11)
+			continue;
+		csum += val[i];
+	}
+	cse_hdr->checksum = 0x100 - csum;
+}
+
+static uint32_t crc32(uint8_t *input, int size, uint32_t poly, uint32_t init,
+		      bool rev_in, bool rev_out, uint32_t xor_out)
+{
+	uint32_t crc = init;
+	uint32_t t32;
+	uint8_t val;
+	uint8_t t8;
+	int i;
+	int j;
+
+	for (i = 0; i < size; i++) {
+		val = input[i];
+		if (rev_in) {
+			t8 = 0;
+			for (j = 0; j < 8; j++) {
+				if (val & (1 << j))
+					t8 |= (uint8_t)(1 << (7 - j));
+			}
+			val = t8;
+		}
+		crc ^= (uint32_t)(val << 24);
+		for (j = 0; j < 8; j++) {
+			if (crc & 0x80000000)
+				crc = (uint32_t)((crc << 1) ^ poly);
+			else
+				crc <<= 1;
+		}
+	}
+
+	if (rev_out) {
+		t32 = 0;
+		for (i = 0; i < 32; i++) {
+			if (crc & (1U << i))
+				t32 |= (uint32_t)(1 << (31 - i));
+		}
+		crc = t32;
+	}
+
+	return crc ^ xor_out;
+}
+
+void ri_cse_create_v2_5(struct image *image)
+{
+	struct CsePartitionDirHeader_v2_5 *cse_hdr = image->fw_image;
+	struct sof_man_adsp_meta_file_ext_v2_5 *meta = image->fw_image +
+		MAN_META_EXT_OFFSET_V2_5;
+	struct CsePartitionDirEntry *cse_entry =
+		image->fw_image + sizeof(*cse_hdr);
+	uint8_t *val = image->fw_image;
+	int size;
+
+	fprintf(stdout, " cse: completing CSE V2.5 manifest\n");
+
+	cse_entry[2].length = meta->comp_desc[0].limit_offset -
+		MAN_DESC_OFFSET_V1_8;
+
+	/*
+	 * calculate checksum using crc-32/iso-hdlc
+	 *
+	 * polynomial: 0x04c11db7
+	 * initial value: 0xffffffff
+	 * reverse input: true
+	 * reverse output: true
+	 * xor output: 0xffffffff
+	 */
+	size = (sizeof(*cse_hdr) + (sizeof(*cse_entry) * MAN_CSE_PARTS));
+	cse_hdr->checksum = crc32(val, size, 0x04c11db7, 0xffffffff, true, true, 0xffffffff);
+
+	fprintf(stdout, " cse: cse checksum %x\n", cse_hdr->checksum);
+}
+
+void ri_cse_create_ace_v1_5(struct image *image)
+{
+	struct CsePartitionDirHeader_v2_5 *cse_hdr = image->fw_image;
+	struct sof_man_adsp_meta_file_ext_v2_5 *meta = image->fw_image +
+		MAN_META_EXT_OFFSET_ACE_V1_5;
+	struct CsePartitionDirEntry *cse_entry =
+		image->fw_image + sizeof(*cse_hdr);
+	uint8_t *val = image->fw_image;
+	int size;
+
+	fprintf(stdout, " cse: completing CSE V2.5 manifest\n");
+
+	cse_entry[2].length = meta->comp_desc[0].limit_offset -
+		MAN_DESC_OFFSET_V1_8;
+
+	/*
+	 * calculate checksum using crc-32/iso-hdlc
+	 *
+	 * polynomial: 0x04c11db7
+	 * initial value: 0xffffffff
+	 * reverse input: true
+	 * reverse output: true
+	 * xor output: 0xffffffff
+	 */
+	size = (sizeof(*cse_hdr) + (sizeof(*cse_entry) * MAN_CSE_PARTS));
+	cse_hdr->checksum = crc32(val, size, 0x04c11db7, 0xffffffff, true, true, 0xffffffff);
+
+	fprintf(stdout, " cse: cse checksum %x\n", cse_hdr->checksum);
+}
diff --git a/tools/rimage/src/css.c b/tools/rimage/src/css.c
new file mode 100644
index 000000000000..a69d5c80f76b
--- /dev/null
+++ b/tools/rimage/src/css.c
@@ -0,0 +1,185 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2017 Intel Corporation. All rights reserved.
+//
+// Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+//         Keyon Jie <yang.jie@linux.intel.com>
+
+#include <stdio.h>
+#include <errno.h>
+#include <time.h>
+#include <sys/time.h>
+#include <rimage/rimage.h>
+#include <rimage/css.h>
+#include <rimage/manifest.h>
+
+void ri_css_v2_5_hdr_create(struct image *image)
+{
+	struct css_header_v2_5 *css = image->fw_image + MAN_CSS_HDR_OFFSET_2_5;
+	struct tm *date;
+	struct timeval tv;
+	time_t seconds;
+	int val;
+
+	fprintf(stdout, " cse: %s completing CSS manifest\n", __func__);
+
+	/* get local time and date */
+	gettimeofday(&tv, NULL);
+	seconds = tv.tv_sec;
+	date = localtime(&seconds);
+
+	if (!date) {
+		fprintf(stderr, "error: cant get localtime %d\n", -errno);
+		return;
+	}
+
+	date->tm_year += 1900;
+	fprintf(stdout, " css: set build date to %d:%2.2d:%2.2d\n",
+		date->tm_year, date->tm_mon, date->tm_mday);
+
+	/* year yYyy */
+	val = date->tm_year / 1000;
+	css->date |= val  << 28;
+	date->tm_year -= val * 1000;
+	/* year yyYy */
+	val = date->tm_year / 100;
+	css->date |= val << 24;
+	date->tm_year -= val * 100;
+	/* year yyyY */
+	val = date->tm_year / 10;
+	css->date |= val << 20;
+	date->tm_year -= val * 10;
+	/* year Yyyy */
+	val = date->tm_year;
+	css->date |= val << 16;
+
+	/* month Mm - for some reason month starts at 0 */
+	val = ++date->tm_mon / 10;
+	css->date |= val << 12;
+	date->tm_mon -= (val * 10);
+	/* month mM */
+	val = date->tm_mon;
+	css->date |= val << 8;
+
+	/* Day Dd */
+	val = date->tm_mday / 10;
+	css->date |= val << 4;
+	date->tm_mday -= (val * 10);
+	/* Day dD */
+	val = date->tm_mday;
+	css->date |= val << 0;
+}
+
+void ri_css_v1_8_hdr_create(struct image *image)
+{
+	struct css_header_v1_8 *css = image->fw_image + MAN_CSS_HDR_OFFSET;
+	struct tm *date;
+	struct timeval tv;
+	time_t seconds;
+	int val;
+
+	fprintf(stdout, " cse: %s completing CSS manifest\n", __func__);
+
+	/* get local time and date */
+	gettimeofday(&tv, NULL);
+	seconds = tv.tv_sec;
+	date = localtime(&seconds);
+
+	if (!date) {
+		fprintf(stderr, "error: cant get localtime %d\n", -errno);
+		return;
+	}
+
+	date->tm_year += 1900;
+	fprintf(stdout, " css: set build date to %d:%2.2d:%2.2d\n",
+		date->tm_year, date->tm_mon, date->tm_mday);
+
+	/* year yYyy */
+	val = date->tm_year / 1000;
+	css->date |= val  << 28;
+	date->tm_year -= val * 1000;
+	/* year yyYy */
+	val = date->tm_year / 100;
+	css->date |= val << 24;
+	date->tm_year -= val * 100;
+	/* year yyyY */
+	val = date->tm_year / 10;
+	css->date |= val << 20;
+	date->tm_year -= val * 10;
+	/* year Yyyy */
+	val = date->tm_year;
+	css->date |= val << 16;
+
+	/* month Mm - for some reason month starts at 0 */
+	val = ++date->tm_mon / 10;
+	css->date |= val << 12;
+	date->tm_mon -= (val * 10);
+	/* month mM */
+	val = date->tm_mon;
+	css->date |= val << 8;
+
+	/* Day Dd */
+	val = date->tm_mday / 10;
+	css->date |= val << 4;
+	date->tm_mday -= (val * 10);
+	/* Day dD */
+	val = date->tm_mday;
+	css->date |= val << 0;
+}
+
+void ri_css_v1_5_hdr_create(struct image *image)
+{
+	struct css_header_v1_5 *css = image->fw_image;
+	struct tm *date;
+	struct timeval tv;
+	time_t seconds;
+	int val;
+
+	fprintf(stdout, " cse: %s completing CSS manifest\n", __func__);
+
+	/* get local time and date */
+	gettimeofday(&tv, NULL);
+	seconds = tv.tv_sec;
+	date = localtime(&seconds);
+
+	if (!date) {
+		fprintf(stderr, "error: cant get localtime %d\n", -errno);
+		return;
+	}
+
+	date->tm_year += 1900;
+	fprintf(stdout, " css: set build date to %d:%2.2d:%2.2d\n",
+		date->tm_year, date->tm_mon, date->tm_mday);
+
+	/* year yYyy */
+	val = date->tm_year / 1000;
+	css->date |= val  << 28;
+	date->tm_year -= val * 1000;
+	/* year yyYy */
+	val = date->tm_year / 100;
+	css->date |= val << 24;
+	date->tm_year -= val * 100;
+	/* year yyyY */
+	val = date->tm_year / 10;
+	css->date |= val << 20;
+	date->tm_year -= val * 10;
+	/* year Yyyy */
+	val = date->tm_year;
+	css->date |= val << 16;
+
+	/* month Mm - for some reason month starts at 0 */
+	val = ++date->tm_mon / 10;
+	css->date |= val << 12;
+	date->tm_mon -= (val * 10);
+	/* month mM */
+	val = date->tm_mon;
+	css->date |= val << 8;
+
+	/* Day Dd */
+	val = date->tm_mday / 10;
+	css->date |= val << 4;
+	date->tm_mday -= (val * 10);
+	/* Day dD */
+	val = date->tm_mday;
+	css->date |= val << 0;
+}
diff --git a/tools/rimage/src/elf_file.c b/tools/rimage/src/elf_file.c
new file mode 100644
index 000000000000..efb9cc912b4e
--- /dev/null
+++ b/tools/rimage/src/elf_file.c
@@ -0,0 +1,571 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright(c) 2023 Intel Corporation. All rights reserved.
+ *
+ * Author: Adrian Warecki <adrian.warecki@intel.com>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <rimage/elf_file.h>
+#include <rimage/file_utils.h>
+#include <rimage/misc_utils.h>
+
+ /* Values for e_type. */
+static struct name_val e_type[] = {
+	NAME_VAL_ENTRY(ET_NONE),		/* Unknown type. */
+	NAME_VAL_ENTRY(ET_REL),			/* Relocatable. */
+	NAME_VAL_ENTRY(ET_EXEC),		/* Executable. */
+	NAME_VAL_ENTRY(ET_DYN),			/* Shared object. */
+	NAME_VAL_ENTRY(ET_CORE),		/* Core file. */
+	NAME_VAL_END
+};
+
+static struct name_val sh_types[] = {
+	NAME_VAL_ENTRY(SHT_NULL),		/* inactive */
+	NAME_VAL_ENTRY(SHT_PROGBITS),		/* program defined information */
+	NAME_VAL_ENTRY(SHT_SYMTAB),		/* symbol table section */
+	NAME_VAL_ENTRY(SHT_STRTAB),		/* string table section */
+	NAME_VAL_ENTRY(SHT_RELA),		/* relocation section with addends */
+	NAME_VAL_ENTRY(SHT_HASH),		/* symbol hash table section */
+	NAME_VAL_ENTRY(SHT_DYNAMIC),		/* dynamic section */
+	NAME_VAL_ENTRY(SHT_NOTE),		/* note section */
+	NAME_VAL_ENTRY(SHT_NOBITS),		/* no space section */
+	NAME_VAL_ENTRY(SHT_REL),		/* relocation section - no addends */
+	NAME_VAL_ENTRY(SHT_SHLIB),		/* reserved - purpose unknown */
+	NAME_VAL_ENTRY(SHT_DYNSYM),		/* dynamic symbol table section */
+	NAME_VAL_ENTRY(SHT_INIT_ARRAY),		/* Initialization function pointers. */
+	NAME_VAL_ENTRY(SHT_FINI_ARRAY),		/* Termination function pointers. */
+	NAME_VAL_ENTRY(SHT_PREINIT_ARRAY),	/* Pre-initialization function ptrs. */
+	NAME_VAL_ENTRY(SHT_GROUP),		/* Section group. */
+	NAME_VAL_ENTRY(SHT_SYMTAB_SHNDX),	/* Section indexes (see SHN_XINDEX). */
+	NAME_VAL_ENTRY(SHT_LOOS),		/* First of OS specific semantics */
+	NAME_VAL_ENTRY(SHT_HIOS),		/* Last of OS specific semantics */
+	NAME_VAL_ENTRY(SHT_GNU_VERDEF),
+	NAME_VAL_ENTRY(SHT_GNU_VERNEED),
+	NAME_VAL_ENTRY(SHT_GNU_VERSYM),
+	NAME_VAL_ENTRY(SHT_LOPROC),		/* reserved range for processor */
+	NAME_VAL_ENTRY(SHT_HIPROC),		/* specific section header types */
+	NAME_VAL_ENTRY(SHT_LOUSER),		/* reserved range for application */
+	NAME_VAL_ENTRY(SHT_HIUSER),		/* specific indexes */
+	NAME_VAL_END
+};
+
+/* Flags for sh_flags. */
+static struct name_val sh_flags[] = {
+	NAME_VAL_ENTRY(SHF_WRITE),		/* Section contains writable data. */
+	NAME_VAL_ENTRY(SHF_ALLOC),		/* Section occupies memory. */
+	NAME_VAL_ENTRY(SHF_EXECINSTR),		/* Section contains instructions. */
+	NAME_VAL_ENTRY(SHF_MERGE),		/* Section may be merged. */
+	NAME_VAL_ENTRY(SHF_STRINGS),		/* Section contains strings. */
+	NAME_VAL_ENTRY(SHF_INFO_LINK),		/* sh_info holds section index. */
+	NAME_VAL_ENTRY(SHF_LINK_ORDER),		/* Special ordering requirements. */
+	NAME_VAL_ENTRY(SHF_OS_NONCONFORMING),	/* OS-specific processing required. */
+	NAME_VAL_ENTRY(SHF_GROUP),		/* Member of section group. */
+	NAME_VAL_ENTRY(SHF_TLS),		/* Section contains TLS data. */
+	NAME_VAL_END
+};
+
+/* Values for p_type. */
+static struct name_val p_type[] = {
+	NAME_VAL_ENTRY(PT_NULL),		/* Unused entry. */
+	NAME_VAL_ENTRY(PT_LOAD),		/* Loadable segment. */
+	NAME_VAL_ENTRY(PT_DYNAMIC),		/* Dynamic linking information segment. */
+	NAME_VAL_ENTRY(PT_INTERP),		/* Pathname of interpreter. */
+	NAME_VAL_ENTRY(PT_NOTE),		/* Auxiliary information. */
+	NAME_VAL_ENTRY(PT_SHLIB),		/* Reserved (not used). */
+	NAME_VAL_ENTRY(PT_PHDR),		/* Location of program header itself. */
+	NAME_VAL_ENTRY(PT_TLS),			/* Thread local storage segment */
+	NAME_VAL_END
+};
+
+/* Values for p_flags. */
+static struct name_val p_flags[] = {
+	NAME_VAL_ENTRY(PF_X),			/* Executable. */
+	NAME_VAL_ENTRY(PF_W),			/* Writable. */
+	NAME_VAL_ENTRY(PF_R),			/* Readable. */
+	NAME_VAL_END
+};
+
+/**
+ * Print elf related error message
+ * 
+ * @param elf elf file structure
+ * @param msg error message
+ * @param error error code to return
+ * @return error code
+ */
+static int elf_error(const struct elf_file *elf, const char *msg, int error)
+{
+	fprintf(stderr, "Error: %s: %s\n", elf->filename, msg);
+	return -error;
+}
+
+/**
+ * Read elf header
+ * 
+ * @param elf elf file structure
+ * @return error code, 0 when success
+ */
+static int elf_header_read(struct elf_file *elf)
+{
+	size_t count;
+
+	/* read in elf header */
+	count = fread(&elf->header, sizeof(elf->header), 1, elf->file);
+	if (count != 1) {
+		if (count < 0)
+			return file_error("failed to read elf header", elf->filename);
+		else
+			return elf_error(elf, "Corrupted file.", ENODATA);
+	}
+
+	if (strncmp((char *)elf->header.ident, "\177ELF\001\001", 5))
+		return elf_error(elf, "Not a 32 bits ELF-LE file", EILSEQ);
+
+	if (elf->header.version != EV_CURRENT)
+		return elf_error(elf, "Unsupported file version.", EINVAL);
+
+	if (elf->header.ehsize < sizeof(Elf32_Ehdr))
+		return elf_error(elf, "Invalid file header size.", EINVAL);
+
+	if (elf->header.phoff >= elf->file_size)
+		return elf_error(elf, "Invalid program header file offset.", EINVAL);
+
+	if (elf->header.phentsize < sizeof(Elf32_Phdr))
+		return elf_error(elf, "Invalid program header size.", EINVAL);
+
+	if (elf->header.phoff + elf->header.phnum * sizeof(Elf32_Phdr) > elf->file_size)
+		return elf_error(elf, "Invalid number of program header entries.", EINVAL);
+
+	if (elf->header.shoff >= elf->file_size)
+		return elf_error(elf, "Invalid section header file offset.", EINVAL);
+
+	if (elf->header.shentsize < sizeof(Elf32_Shdr))
+		return elf_error(elf, "Invalid section header size.", EINVAL);
+
+	if (elf->header.shoff + elf->header.shnum * sizeof(Elf32_Shdr) > elf->file_size)
+		return elf_error(elf, "Invalid number of section header entries.", EINVAL);
+
+	if (elf->header.shstrndx >= elf->header.shnum)
+		return elf_error(elf, "Invalid section name strings section index.", EINVAL);
+
+	return 0;
+}
+
+void elf_header_print(const struct elf_file *elf)
+{
+	fprintf(stdout, "\tfile type\t 0x%8.8x ", elf->header.type);
+	print_enum(elf->header.type, e_type);
+	fprintf(stdout, "\tarchitecture\t 0x%8.8x\n", elf->header.machine);
+	fprintf(stdout, "\tformat version\t 0x%8.8x\n", elf->header.version);
+	fprintf(stdout, "\tarch flags\t 0x%8.8x\n", elf->header.flags);
+	fprintf(stdout, "\theader size\t 0x%8.8x\n", elf->header.ehsize);
+	fprintf(stdout, "\tentry point\t 0x%8.8x\n", elf->header.entry);
+	fprintf(stdout, "\tprogram offset\t 0x%8.8x\n", elf->header.phoff);
+	fprintf(stdout, "\tsection offset\t 0x%8.8x\n", elf->header.shoff);
+	fprintf(stdout, "\tprogram size\t 0x%8.8x\n", elf->header.phentsize);
+	fprintf(stdout, "\tprogram count\t 0x%8.8x\n", elf->header.phnum);
+	fprintf(stdout, "\tsection size\t 0x%8.8x\n", elf->header.shentsize);
+	fprintf(stdout, "\tsection count\t 0x%8.8x\n", elf->header.shnum);
+	fprintf(stdout, "\tstring index\t 0x%8.8x\n\n", elf->header.shstrndx);
+}
+
+/**
+ * Read sections headers from elf file
+ * 
+ * @param elf elf file structure
+ * @return error code, 0 when success
+ */
+static int elf_section_headers_read(struct elf_file *elf)
+{
+	int i, ret;
+	size_t offset, count;
+
+	elf->sections = calloc(elf->header.shnum, sizeof(struct elf_section_header));
+	if (!elf->sections)
+		return elf_error(elf, "Cannot allocate section array.", ENOMEM);
+
+	/* In case of error, sections memory are released in elf_open function. */
+
+	offset = elf->header.shoff;
+	for (i = 0; i < elf->header.shnum; i++, offset += elf->header.shentsize) {
+		ret = fseek(elf->file, offset, SEEK_SET);
+		if (ret)
+			return file_error("unable to seek to section header", elf->filename);
+
+		count = fread(&elf->sections[i].data, sizeof(Elf32_Shdr), 1, elf->file);
+		if (count != 1) {
+			if (count < 0)
+				return file_error("failed to read section header", elf->filename);
+			else
+				return elf_error(elf, "Corrupted file.", ENODATA);
+		}
+	}
+
+	elf->sections_count = elf->header.shnum;
+	return 0;
+}
+
+/**
+ * Update name of a section in the section headers
+ * 
+ * @param elf elf file structure
+ * @return error code, 0 when success
+ */
+static int elf_set_sections_names(struct elf_file *elf, const struct elf_strings *strings)
+{
+	int ret, i;
+
+	for (i = 0; i < elf->sections_count; i++) {
+		ret = elf_strings_get(strings, elf->sections[i].data.name, &elf->sections[i].name);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
+void elf_print_sections(const struct elf_file *elf)
+{
+	int i;
+
+	for (i = 0; i < elf->sections_count; i++) {
+		fprintf(stdout, "Section %d:\n", i);
+		elf_section_header_print(&elf->sections[i]);
+	}
+}
+
+/**
+ * Read program headers from elf file
+ * 
+ * @param elf elf file structure
+ * @return error code, 0 when success
+ */
+static int elf_program_headers_read(struct elf_file *elf)
+{
+	int i, ret;
+	size_t offset, count;
+
+	elf->programs = calloc(elf->header.phnum, sizeof(Elf32_Phdr));
+	if (!elf->programs)
+		return elf_error(elf, "Cannot allocate program array.", ENOMEM);
+
+	/* In case of error, programs memory are released in elf_open function. */
+
+	offset = elf->header.phoff;
+	for (i = 0; i < elf->header.phnum; i++, offset += elf->header.phentsize) {
+		ret = fseek(elf->file, offset, SEEK_SET);
+		if (ret)
+			return file_error("unable to seek to program header", elf->filename);
+
+		count = fread(&elf->programs[i], sizeof(Elf32_Phdr), 1, elf->file);
+		if (count != 1) {
+			if (count < 0)
+				return file_error("failed to read program header", elf->filename);
+			else
+				return elf_error(elf, "Corrupted file.", ENODATA);
+		}
+	}
+
+	elf->programs_count = elf->header.phnum;
+	return 0;
+}
+
+void elf_print_programs(const struct elf_file *elf)
+{
+	int i;
+
+	for (i = 0; i < elf->programs_count; i++) {
+		fprintf(stdout, "\nProgram %d:\n", i);
+		elf_program_header_print(&elf->programs[i]);
+	}
+}
+
+/**
+ * Copy elf_header structure. Allocates a new copy of the name string.
+ * 
+ * @param [in]src Source section header structure
+ * @param [out]dst Destination section header structure
+ * @return error code, 0 when success
+ */
+static int elf_section_header_copy(const struct elf_section_header *src,
+				   struct elf_section_header *dst)
+{
+	if (src->name) {
+		dst->name = strdup(src->name);
+		if (!dst->name)
+			return -ENOMEM;
+	} else {
+		dst->name = NULL;
+	}
+
+	memcpy(&dst->data, &src->data, sizeof(dst->data));
+	return 0;
+}
+
+int elf_section_header_get_by_index(const struct elf_file *elf, int index,
+				     const struct elf_section_header **header)
+{
+	if (index >= elf->sections_count)
+		return elf_error(elf, "Invalid section index.", EINVAL);
+
+	*header = &elf->sections[index];
+
+	return 0;
+}
+
+int elf_section_header_get_by_name(const struct elf_file *elf, const char* name,
+				   const struct elf_section_header **header)
+{
+	int i;
+
+	*header = NULL;
+
+	for (i = 0; i < elf->sections_count; i++)
+		if (strcmp(elf->sections[i].name, name) == 0) {
+			*header = &elf->sections[i];
+			return 0;
+		}
+
+	return -ENOENT;
+}
+
+void elf_section_header_print(const struct elf_section_header *header)
+{
+	fprintf(stdout, "\tname\t\t0x%8.8x\n", header->data.name);
+	fprintf(stdout, "\tname\t\t%s\n", header->name);
+	fprintf(stdout, "\ttype\t\t0x%8.8x ", header->data.type);
+	print_enum(header->data.type, sh_types);
+	fprintf(stdout, "\tflags\t\t0x%8.8x ", header->data.flags);
+	print_flags(header->data.flags, sh_flags);
+	fprintf(stdout, "\taddr\t\t0x%8.8x\n", header->data.vaddr);
+	fprintf(stdout, "\toffset\t\t0x%8.8x\n", header->data.off);
+	fprintf(stdout, "\tsize\t\t0x%8.8x\n", header->data.size);
+	fprintf(stdout, "\tlink\t\t0x%8.8x\n", header->data.link);
+	fprintf(stdout, "\tinfo\t\t0x%8.8x\n", header->data.info);
+	fprintf(stdout, "\taddralign\t0x%8.8x\n", header->data.addralign);
+	fprintf(stdout, "\tentsize\t\t0x%8.8x\n\n", header->data.entsize);
+}
+
+/**
+ * Release section header structure
+ * 
+ * @param sec_hdr Section header structure
+ */
+static void elf_section_header_free(struct elf_section_header *sec_hdr)
+{
+	free(sec_hdr->name);
+	sec_hdr->name = NULL;
+}
+
+
+int elf_open(struct elf_file *elf, const char *filename)
+{
+	struct elf_strings names;
+	int ret = -ENOMEM;
+
+	memset(elf, 0, sizeof(*elf));
+	elf->filename = strdup(filename);
+	if (!elf->filename) {
+		ret = -ENOMEM;
+		goto err;
+	}
+
+	elf->file = fopen(filename, "rb");
+	if (!elf->file) {
+		ret = file_error("Unable to open elf file", elf->filename);
+		goto err;
+	}
+
+	ret = get_file_size(elf->file, elf->filename, &elf->file_size);
+	if (ret)
+		goto err;
+
+	ret = elf_header_read(elf);
+	if (ret)
+		goto err;
+
+	ret = elf_program_headers_read(elf);
+	if (ret)
+		goto err;
+
+	ret = elf_section_headers_read(elf);
+	if (ret)
+		goto err;
+
+	ret = elf_strings_read_by_index(elf, elf->header.shstrndx, &names);
+	if (ret)
+		goto err;
+
+	ret = elf_set_sections_names(elf, &names);
+	if (ret) {
+		elf_strings_free(&names);
+		goto err;
+	}
+	elf_strings_free(&names);
+
+	return 0;
+
+err:
+	free(elf->filename);
+	free(elf->programs);
+
+	if (elf->file)
+		fclose(elf->file);
+
+	if (elf->sections) {
+		for (int i = 0; i < elf->sections_count; i++)
+			elf_section_header_free(&elf->sections[i]);
+
+		free(elf->sections);
+	}
+
+	return ret;
+}
+
+/**
+* Close elf file and release resources
+* @param elf elf file structure
+*/
+void elf_free(struct elf_file *elf)
+{
+	int i;
+
+	free(elf->filename);
+	fclose(elf->file);
+
+	for (i = 0; i < elf->sections_count; i++)
+		elf_section_header_free(&elf->sections[i]);
+
+	free(elf->sections);
+	free(elf->programs);
+}
+
+int elf_section_read_content(const struct elf_file *elf, const struct elf_section_header *header,
+			     void *buffer, const size_t size)
+{
+	int ret;
+	size_t count;
+
+	if ((header->data.type == SHT_NOBITS) || (header->data.type == SHT_NULL) ||
+	    !header->data.size)
+		return elf_error(elf, "Can't read section without data.", ENODATA);
+
+	if (!header->data.off || (header->data.off + header->data.size) > elf->file_size)
+		return elf_error(elf, "Invalid section position in file.", ENFILE);
+	
+	if (header->data.size > size)
+		return elf_error(elf, "Output buffer too small.", ENOSPC);
+
+	ret = fseek(elf->file, header->data.off, SEEK_SET);
+	if (ret)
+		return file_error("unable to seek to section data", elf->filename);
+
+	count = fread(buffer, header->data.size, 1, elf->file);
+	if (count != 1) {
+		if (count < 0)
+			return file_error("failed to read section data", elf->filename);
+		else
+			return elf_error(elf, "Corrupted file.", ENODATA);
+	}
+
+	return 0;
+}
+
+int elf_section_read(const struct elf_file *elf, const struct elf_section_header *header,
+		     struct elf_section *section)
+{
+	int ret;
+
+	section->data = malloc(header->data.size);
+	if (!section->data)
+		return elf_error(elf, "No memory for section buffer.", ENOMEM);
+
+	ret = elf_section_header_copy(header, &section->header);
+	if (ret)
+		goto err;
+
+	ret = elf_section_read_content(elf, header, section->data, header->data.size);
+	if (ret)
+		goto err;
+
+	return 0;
+
+err:
+	elf_section_header_free(&section->header);
+	free(section->data);
+	return ret;
+}
+
+int elf_section_read_by_name(const struct elf_file *elf, const char *name,
+			     struct elf_section *section)
+{
+	const struct elf_section_header *header;
+	int ret;
+
+	ret = elf_section_header_get_by_name(elf, name, &header);
+
+	if (ret)
+		return ret;
+
+	return elf_section_read(elf, header, section);
+}
+
+void elf_section_free(struct elf_section *section)
+{
+	free(section->data);
+}
+
+int elf_strings_read_by_index(const struct elf_file *elf, int index, struct elf_strings *strings)
+{
+	const struct elf_section_header *header;
+	int ret;
+
+	ret = elf_section_header_get_by_index(elf, index, &header);
+	if (ret)
+		return ret;
+
+	if (header->data.type != SHT_STRTAB)
+		return elf_error(elf, "Invalid section type.", EINVAL);
+
+	ret = elf_section_read(elf, header, &strings->section);
+	if (ret)
+		return elf_error(elf, "Unable to read section names section.", ret);
+
+	return 0;
+}
+
+int elf_strings_get(const struct elf_strings *strings, int index, char **str)
+{
+	if (index >= strings->section.header.data.size)
+		return -EINVAL;
+
+	*str = strdup((const char *)strings->section.data + index);
+	if (!*str)
+		return -ENOMEM;
+
+	return 0;
+}
+
+void elf_strings_free(struct elf_strings *strings)
+{
+	elf_section_free(&strings->section);
+}
+
+void elf_program_header_print(const Elf32_Phdr *header)
+{
+	fprintf(stdout, "\ttype\t 0x%8.8x ", header->type);
+	print_enum(header->type, p_type);
+	fprintf(stdout, "\tflags\t 0x%8.8x ", header->flags);
+	print_flags(header->flags, p_flags);
+	fprintf(stdout, "\toffset\t 0x%8.8x\n", header->off);
+	fprintf(stdout, "\tvaddr\t 0x%8.8x\n", header->vaddr);
+	fprintf(stdout, "\tpaddr\t 0x%8.8x\n", header->paddr);
+	fprintf(stdout, "\tfilesz\t 0x%8.8x\n", header->filesz);
+	fprintf(stdout, "\tmemsz\t 0x%8.8x\n", header->memsz);
+	fprintf(stdout, "\talign\t 0x%8.8x\n\n", header->align);
+}
diff --git a/tools/rimage/src/ext_manifest.c b/tools/rimage/src/ext_manifest.c
new file mode 100644
index 000000000000..c6d3c02e887e
--- /dev/null
+++ b/tools/rimage/src/ext_manifest.c
@@ -0,0 +1,242 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2020 Intel Corporation. All rights reserved.
+//
+// Author: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <rimage/ext_manifest_gen.h>
+#include <rimage/sof/kernel/ext_manifest.h>
+#include <rimage/rimage.h>
+#include <rimage/cavs/cavs_ext_manifest.h>
+#include <rimage/manifest.h>
+#include <rimage/file_utils.h>
+
+const struct ext_man_header ext_man_template = {
+	.magic = EXT_MAN_MAGIC_NUMBER,
+	.header_version = EXT_MAN_VERSION,
+	.header_size = sizeof(struct ext_man_header),
+	.full_size = 0,	/* runtime variable */
+};
+
+static int ext_man_open_file(struct image *image)
+{
+	int ret;
+
+	ret = create_file_name(image->out_ext_man_file, sizeof(image->out_ext_man_file),
+			       image->out_file, "xman");
+	if (ret)
+		return ret;
+
+	/* open extended manifest outfile for writing */
+	image->out_ext_man_fd = fopen(image->out_ext_man_file, "wb");
+	if (!image->out_ext_man_fd)
+		return file_error("unable to open file for writing", image->out_ext_man_file);
+
+	return 0;
+}
+
+static const struct elf_file *ext_man_find_module(const struct image *image,
+					     const struct elf_section_header **section)
+{
+	const struct manifest_module *module;
+	int i;
+
+	for (i = 0; i < image->num_modules; i++) {
+		module = &image->module[i];
+
+		if (module->is_bootloader)
+			continue;
+
+		if (!elf_section_header_get_by_name(&module->file.elf, EXT_MAN_DATA_SECTION,
+						    section))
+			return &module->file.elf;
+	}
+
+	return NULL;
+}
+
+static int ext_man_validate(uint32_t section_size, const void *section_data)
+{
+	uint8_t *sbuf = (uint8_t *)section_data;
+	struct ext_man_elem_header head;
+	uint32_t offset = 0;
+
+	/* copy each head to local struct to omit memory align issues */
+	while (offset < section_size) {
+		memcpy(&head, &sbuf[offset], sizeof(head));
+		fprintf(stdout, "Extended manifest found module, type: 0x%04X size: 0x%04X (%4d) offset: 0x%04X\n",
+			head.type, head.elem_size, head.elem_size, offset);
+		if (head.elem_size == 0 || head.elem_size % EXT_MAN_ALIGN) {
+			fprintf(stderr,
+				"error: invalid extended manifest element size\n");
+			return -EINVAL;
+		}
+		offset += head.elem_size;
+	}
+
+	/* sum of packets size != section size */
+	if (offset != section_size) {
+		fprintf(stderr,
+			"error: fw_metadata section is inconsistent, section size: 0x%04X != 0x%04X sum of packets size\n",
+			section_size, offset);
+		return -EINVAL;
+	} else {
+		return 0;
+	}
+}
+
+static int ext_man_build(const struct elf_file *file, const struct elf_section_header *section,
+			 struct ext_man_header **dst_buff)
+{
+	struct ext_man_header *ext_man;
+	size_t size;
+	int ret;
+
+	size = ext_man_template.header_size + section->data.size;
+	if (size % 4) {
+		fprintf(stderr, "error: extended manifest size must be aligned to 4\n");
+		return -EINVAL;
+	}
+
+	ext_man = calloc(1, size);
+	if (!ext_man)
+		return -ENOMEM;
+
+	/* fill ext_man struct, size aligned to 4 to avoid unaligned accesses */
+	memcpy(ext_man, &ext_man_template, ext_man_template.header_size);
+	ext_man->full_size = size;
+
+	ret = elf_section_read_content(file, section, ext_man + 1,
+				       size - ext_man_template.header_size);
+	if (ret < 0) {
+		fprintf(stderr, "error: failed to read %s section content, code %d\n",
+			EXT_MAN_DATA_SECTION, ret);
+		free(ext_man);
+		return ret;
+	}
+
+	*dst_buff = ext_man;
+	return 0;
+}
+
+int ext_man_write(struct image *image)
+{
+	const struct elf_file *file;
+	struct ext_man_header *ext_man = NULL;
+	const struct elf_section_header *section;
+	int count;
+	int ret;
+
+	ret = ext_man_open_file(image);
+	if (ret)
+		goto out;
+
+	file = ext_man_find_module(image, &section);
+	if (!file) {
+		ret = -ECANCELED;
+		goto out;
+	}
+
+	ret = ext_man_build(file, section, &ext_man);
+	if (ret)
+		goto out;
+
+	/* validate metadata section */
+	ret = ext_man_validate(ext_man->full_size - ext_man->header_size,
+			       (char *)ext_man + ext_man->header_size);
+	if (ret) {
+		ret = -errno;
+		goto out;
+	}
+
+	/* write extended metadata to file */
+	count = fwrite(ext_man, 1, ext_man->full_size, image->out_ext_man_fd);
+
+	if (count != ext_man->full_size) {
+		ret = file_error("can't write extended manifest", image->out_ext_man_file);
+		goto out;
+	}
+
+	fprintf(stdout, "Extended manifest saved to file %s size 0x%04X (%d) bytes\n\n",
+		image->out_ext_man_file, ext_man->full_size,
+		ext_man->full_size);
+
+out:
+	if (ext_man)
+		free(ext_man);
+	if (image->out_ext_man_fd)
+		fclose(image->out_ext_man_fd);
+	return ret;
+}
+
+int ext_man_write_cavs_25(struct image *image)
+{
+	struct fw_image_ext_module *mod_ext;
+	struct fw_ext_man_cavs_header header;
+	int pin_count;
+	int count, i;
+	int ret;
+	size_t write_ret;
+
+	ret = ext_man_open_file(image);
+	if (ret)
+		goto out;
+
+	mod_ext = &image->adsp->modules->mod_ext;
+	count = mod_ext->mod_conf_count;
+	header.version_major = EXTENDED_MANIFEST_VERSION_MAJOR;
+	header.version_minor = EXTENDED_MANIFEST_VERSION_MINOR;
+	header.num_module_entries = count;
+	header.id = EXTENDED_MANIFEST_MAGIC_HEADER_ID;
+	header.len = sizeof(const struct fw_ext_man_cavs_header);
+
+	for (i = 0; i < count; i++)
+		header.len += mod_ext->ext_mod_config_array[i].header.ext_module_config_length;
+	fwrite(&header, 1, sizeof(header), image->out_ext_man_fd);
+
+	for (i = 0; i < count; i++) {
+		write_ret = fwrite(&mod_ext->ext_mod_config_array[i].header,
+				   sizeof(struct fw_ext_mod_config_header), 1,
+				   image->out_ext_man_fd);
+		if (write_ret != 1) {
+			ret = file_error("can't write fw_ext_mod_config_header",
+					 image->out_ext_man_file);
+			goto out;
+		}
+
+		if (mod_ext->ext_mod_config_array[i].header.num_scheduling_capabilities) {
+			write_ret = fwrite(&mod_ext->ext_mod_config_array[i].sched_caps,
+					   sizeof(struct mod_scheduling_caps), 1,
+					   image->out_ext_man_fd);
+			if (write_ret != 1) {
+				ret = file_error("can't write mod_scheduling_caps",
+						 image->out_ext_man_file);
+				goto out;
+			}
+		}
+
+		pin_count = mod_ext->ext_mod_config_array[i].header.num_pin_entries;
+		if (pin_count) {
+			write_ret = fwrite(mod_ext->ext_mod_config_array[i].pin_desc,
+					   sizeof(struct fw_pin_description), pin_count,
+					   image->out_ext_man_fd);
+
+			if (write_ret != pin_count) {
+				ret = file_error("can't write fw_pin_description",
+						 image->out_ext_man_file);
+				goto out;
+			}
+		}
+	}
+
+out:
+	if (image->out_ext_man_fd)
+		fclose(image->out_ext_man_fd);
+	return ret;
+}
diff --git a/tools/rimage/src/file_simple.c b/tools/rimage/src/file_simple.c
new file mode 100644
index 000000000000..e87689f44133
--- /dev/null
+++ b/tools/rimage/src/file_simple.c
@@ -0,0 +1,298 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2015 Intel Corporation. All rights reserved.
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+
+#include <rimage/rimage.h>
+#include <rimage/manifest.h>
+#include <rimage/file_utils.h>
+
+static int get_mem_zone_type(const struct memory_config *memory,
+			     const struct module_section *section)
+{
+	uint32_t start, end, base, size;
+	int i;
+
+	start = section->load_address;
+	end = start + section->size;
+
+	for (i = SOF_FW_BLK_TYPE_START; i < SOF_FW_BLK_TYPE_NUM; i++) {
+		base = memory->zones[i].base;
+		size = memory->zones[i].size;
+
+		if (start < base)
+			continue;
+		if (start >= base + size)
+			continue;
+		if (end > base + size)
+			continue;
+		return i;
+	}
+	return SOF_FW_BLK_TYPE_INVALID;
+}
+
+static int block_idx;
+
+static int write_block(struct image *image, struct manifest_module *module,
+		       const struct module_section *section)
+{
+	const struct adsp *adsp = image->adsp;
+	struct snd_sof_blk_hdr block;
+	uint32_t padding = 0;
+	size_t count;
+	int ret;
+
+	block.size = section->size;
+	if (block.size % 4) {
+		/* make block.size divisible by 4 to avoid unaligned accesses */
+		padding = 4 - (block.size % 4);
+		block.size += padding;
+	}
+
+	ret = get_mem_zone_type(&adsp->mem, section);
+	if (ret != SOF_FW_BLK_TYPE_INVALID) {
+		block.type = ret;
+		block.offset = section->load_address - adsp->mem.zones[ret].base
+			+ adsp->mem.zones[ret].host_offset;
+	} else {
+		fprintf(stderr, "error: invalid block address/size 0x%x/0x%zx\n",
+			section->load_address, section->size);
+		return -EINVAL;
+	}
+
+	/* write header */
+	count = fwrite(&block, sizeof(block), 1, image->out_fd);
+	if (count != 1)
+		return file_error("Write header failed", image->out_file);
+
+	/* write out section data */
+	ret = module_write_section(&module->file, section, padding, image->out_fd, image->out_file);
+	if (ret) {
+		fprintf(stderr, "error: cant write section data. foffset %d size 0x%zx mem addr 0x%x\n",
+			section->header->data.off, section->size, section->load_address);
+		return ret;
+	}
+
+	fprintf(stdout, "\t%d\t0x%8.8x\t0x%8.8zx\t0x%8.8lx\t%s\t%s\n", block_idx++,
+		section->load_address, section->size, ftell(image->out_fd),
+		block.type == SOF_FW_BLK_TYPE_IRAM ? "TEXT" : "DATA",
+		section->header->name);
+
+	/* return padding size */
+	if (ret >= 0)
+		return padding;
+
+	return ret;
+}
+
+/**
+ * Write all linked sections
+ * 
+ * @param image program global structure
+ * @param module modules manifest description
+ * @param section module section descriptor
+ * @return size of used padding, error code on error
+ */
+static int write_blocks(struct image *image, struct manifest_module *module,
+			const struct module_section *section)
+{
+	int ret, padding = 0;
+
+	while (section) {
+		ret = write_block(image, module, section);
+		if (ret < 0) {
+			fprintf(stderr, "error: failed to write section %s\n",
+				section->header->name);
+			return ret;
+		}
+
+		padding += ret;
+		section = section->next_section;
+	}
+
+	return padding;
+}
+
+static int simple_write_module(struct image *image, struct manifest_module *module)
+{
+	struct snd_sof_mod_hdr hdr;
+	size_t count;
+	int err;
+	int ptr_hdr, ptr_cur;
+	uint32_t padding;
+
+	hdr.num_blocks = module->file.text.count + module->file.data.count;
+	hdr.size = module->file.text.size + module->file.data.size +
+		sizeof(struct snd_sof_blk_hdr) * hdr.num_blocks;
+	hdr.type = SOF_FW_BASE;
+
+	/* Get the pointer of writing hdr */
+	ptr_hdr = ftell(image->out_fd);
+	if (ptr_hdr < 0)
+		return file_error("cant get file position", image->out_file);
+
+	count = fwrite(&hdr, sizeof(hdr), 1, image->out_fd);
+	if (count != 1)
+		return file_error("failed to write section header", image->out_file);
+
+	module_print_zones(&module->file);
+
+	fprintf(stdout, "\tNo\tAddress\t\tSize\t\tFile\t\tType\tName\n");
+
+	/* Write text sections */
+	err = write_blocks(image, module, module->file.text.first_section);
+	if (err < 0)
+		return err;
+	padding = err;
+
+	/* Write data sections */
+	err = write_blocks(image, module, module->file.data.first_section);
+	if (err < 0)
+			return err;
+		padding += err;
+
+	hdr.size += padding;
+	/* Record current pointer, will set it back after overwriting hdr */
+	ptr_cur = ftell(image->out_fd);
+	if (ptr_cur < 0)
+		return file_error("cant get file position", image->out_file);
+
+	/* overwrite hdr */
+	err = fseek(image->out_fd, ptr_hdr, SEEK_SET);
+	if (err)
+		return file_error("cant seek to header", image->out_file);
+
+	count = fwrite(&hdr, sizeof(hdr), 1, image->out_fd);
+	if (count != 1)
+		return file_error("failed to write section header", image->out_file);
+
+	err = fseek(image->out_fd, ptr_cur, SEEK_SET);
+	if (err)
+		return file_error("cant seek", image->out_file);
+
+	fprintf(stdout, "\n");
+	/* return padding size */
+	return padding;
+}
+
+static int write_block_reloc(struct image *image, struct manifest_module *module)
+{
+	struct snd_sof_blk_hdr block;
+	size_t count;
+	int ret;
+
+	block.size = module->file.elf.file_size;
+	block.type = SOF_FW_BLK_TYPE_DRAM;
+	block.offset = 0;
+
+	/* write header */
+	count = fwrite(&block, sizeof(block), 1, image->out_fd);
+	if (count != 1)
+		return file_error("cant write header", image->out_file);
+
+	ret = module_write_whole_elf(&module->file, image->out_fd, image->out_file);
+	if (ret)
+		return ret;
+
+	fprintf(stdout, "\t%d\t0x%8.8x\t0x%8.8zx\t0x%8.8lx\t%s\n", block_idx++,
+		0, module->file.elf.file_size, ftell(image->out_fd),
+		block.type == SOF_FW_BLK_TYPE_IRAM ? "TEXT" : "DATA");
+
+	return ret;
+}
+
+static int simple_write_module_reloc(struct image *image, struct manifest_module *module)
+{
+	struct snd_sof_mod_hdr hdr;
+	size_t count;
+	int err;
+
+	hdr.num_blocks = 1;
+	hdr.size = module->file.text.size + module->file.data.size;
+	hdr.type = SOF_FW_BASE; // module
+
+	count = fwrite(&hdr, sizeof(hdr), 1, image->out_fd);
+	if (count != 1)
+		return file_error("failed to write section header", image->out_file);
+
+	module_print_zones(&module->file);
+
+	fprintf(stdout, "\tNo\tAddress\t\tSize\t\tFile\t\tType\n");
+
+	err = write_block_reloc(image, module);
+	if (err < 0) {
+		fprintf(stderr, "error: failed to write section #%d\n", err);
+		return err;
+	}
+
+	fprintf(stdout, "\n");
+	return 0;
+}
+
+/* used by others */
+int simple_write_firmware(struct image *image)
+{
+	struct snd_sof_fw_header hdr;
+	struct manifest_module *module;
+	size_t count;
+	int i, ret;
+
+	memcpy(hdr.sig, SND_SOF_FW_SIG, SND_SOF_FW_SIG_SIZE);
+
+	hdr.num_modules = image->num_modules;
+	hdr.abi = SND_SOF_FW_ABI;
+	hdr.file_size = 0;
+
+	for (i = 0; i < image->num_modules; i++) {
+		module = &image->module[i];
+		module->output_size = module->file.data.size + module->file.text.size;
+		module->output_size += sizeof(struct snd_sof_blk_hdr) *
+				(module->file.data.count + module->file.text.count);
+		module->output_size += sizeof(struct snd_sof_mod_hdr) *
+				hdr.num_modules;
+		hdr.file_size += module->output_size;
+	}
+
+	count = fwrite(&hdr, sizeof(hdr), 1, image->out_fd);
+	if (count != 1)
+		return file_error("failed to write header", image->out_file);
+
+	for (i = 0; i < image->num_modules; i++) {
+		module = &image->module[i];
+
+		fprintf(stdout, "writing module %d %s\n", i, module->file.elf.filename);
+
+		if (image->reloc)
+			ret = simple_write_module_reloc(image, module);
+		else
+			ret = simple_write_module(image, module);
+		if (ret < 0) {
+			fprintf(stderr, "error: failed to write module %d\n",
+				i);
+			return ret;
+		}
+		/* add padding size */
+		hdr.file_size += ret;
+	}
+	/* overwrite hdr */
+	ret = fseek(image->out_fd, 0, SEEK_SET);
+	if (ret)
+		return file_error("can't seek set", image->out_file);
+
+
+	count = fwrite(&hdr, sizeof(hdr), 1, image->out_fd);
+	if (count != 1)
+		return file_error("failed to write header", image->out_file);
+
+	fprintf(stdout, "firmware: image size %ld (0x%lx) bytes %d modules\n\n",
+		(long)(hdr.file_size + sizeof(hdr)),
+		(long)(hdr.file_size + sizeof(hdr)),
+		hdr.num_modules);
+
+	return 0;
+}
diff --git a/tools/rimage/src/file_utils.c b/tools/rimage/src/file_utils.c
new file mode 100644
index 000000000000..89a89ae40954
--- /dev/null
+++ b/tools/rimage/src/file_utils.c
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2018-2023 Intel Corporation. All rights reserved.
+//
+// Author: Adrian Warecki <adrian.warecki@intel.com>
+
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <assert.h>
+#include <string.h>
+
+#include <rimage/file_utils.h>
+
+int file_error(const char *msg, const char *filename)
+{
+	int code = errno;
+	char sys_msg[256];
+
+	strerror_r(code, sys_msg, sizeof(sys_msg));
+
+	fprintf(stderr, "%s:\terror: %s. %s (errno = %d)\n", filename, msg, sys_msg, code);
+	return -code;
+}
+
+int create_file_name(char *new_name, const size_t name_size, const char *template_name,
+		   const char *new_ext)
+{
+	int len;
+
+	assert(new_name);
+
+	len = snprintf(new_name, name_size, "%s.%s", template_name, new_ext);
+	if (len >= name_size) {
+		fprintf(stderr, "error: output file name too long\n");
+		return -ENAMETOOLONG;
+	}
+
+	unlink(new_name);
+
+	return 0;
+}
+
+int get_file_size(FILE *f, const char* filename, size_t *size)
+{
+	int ret;
+	long pos;
+	assert(size);
+
+	/* get file size */
+	ret = fseek(f, 0, SEEK_END);
+	if (ret)
+		return file_error("unable to seek eof", filename);
+
+	pos = ftell(f);
+	if (pos < 0)
+		return file_error("unable to get file size", filename);
+
+	ret = fseek(f, 0, SEEK_SET);
+	if (ret)
+		return file_error("unable to seek set", filename);
+
+	*size = pos;
+	return 0;
+}
diff --git a/tools/rimage/src/hash.c b/tools/rimage/src/hash.c
new file mode 100644
index 000000000000..0604670e9c6e
--- /dev/null
+++ b/tools/rimage/src/hash.c
@@ -0,0 +1,196 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright(c) 2017 Intel Corporation. All rights reserved.
+ *
+ * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+ *         Keyon Jie <yang.jie@linux.intel.com>
+ *         Adrian Warecki <adrian.warecki@intel.com>
+ */
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+
+#include <openssl/conf.h>
+#include <openssl/evp.h>
+#include <openssl/err.h>
+
+#include <rimage/rimage.h>
+#include <rimage/manifest.h>
+#include <rimage/hash.h>
+
+#define DEBUG_HASH 0
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
+EVP_MD_CTX *EVP_MD_CTX_new(void);
+
+static void *OPENSSL_zalloc(size_t num)
+{
+	void *ret = OPENSSL_malloc(num);
+
+	if (ret)
+		memset(ret, 0, num);
+	return ret;
+}
+
+EVP_MD_CTX *EVP_MD_CTX_new(void)
+{
+	return OPENSSL_zalloc(sizeof(EVP_MD_CTX));
+}
+
+void EVP_MD_CTX_free(EVP_MD_CTX *ctx)
+{
+	EVP_MD_CTX_cleanup(ctx);
+	OPENSSL_free(ctx);
+}
+#endif
+
+static int hash_error(struct hash_context *context, int errcode, const char *msg)
+{
+	EVP_MD_CTX_free(context->context);
+	context->context = NULL;
+	context->state = HS_ERROR;
+	context->error = -errcode;
+	fprintf(stderr, "hash: %s\n", msg);
+	return context->error;
+}
+
+int hash_init(struct hash_context *context, const EVP_MD *algo)
+{
+	assert(context);
+	assert(algo);
+
+	context->error = 0;
+	context->digest_length = 0;
+	context->algo = algo;
+
+	context->context = EVP_MD_CTX_new();
+	if (!context->context)
+		return hash_error(context, ENOMEM, "Unable to allocate hash context.");
+
+	if (!EVP_DigestInit_ex(context->context, context->algo, NULL)) {
+		EVP_MD_CTX_free(context->context);
+		return hash_error(context, ENOTRECOVERABLE, "Unable to initialize hash context.");
+	}
+
+	context->state = HS_UPDATE;
+	return 0;
+}
+
+int hash_sha256_init(struct hash_context *context)
+{
+	return hash_init(context, EVP_sha256());
+}
+
+int hash_sha384_init(struct hash_context *context)
+{
+	return hash_init(context, EVP_sha384());
+}
+
+int hash_update(struct hash_context *context, const void *data, size_t size)
+{
+	assert(context);
+	assert(data);
+
+	if (context->error)
+		return context->error;
+
+	assert(context->state == HS_UPDATE);
+
+	if (!EVP_DigestUpdate(context->context, data, size))
+		return hash_error(context, EINVAL, "Unable to update hash context.");
+
+	return 0;
+}
+
+int hash_finalize(struct hash_context *context)
+{
+	assert(context);
+
+	if (context->error)
+		return context->error;
+
+	assert(context->state == HS_UPDATE);
+
+	if (!EVP_DigestFinal_ex(context->context, context->digest, &context->digest_length))
+		return hash_error(context, EINVAL, "Unable to finalize hash context.");
+
+	context->state = HS_DONE;
+
+#if DEBUG_HASH
+	fprintf(stdout, "Hash result is: ");
+	hash_print(context);
+#endif
+
+	EVP_MD_CTX_free(context->context);
+	context->context = NULL;
+	return 0;
+}
+
+int hash_get_digest(struct hash_context *context, void *output, size_t output_len)
+{
+	assert(context);
+	assert(output);
+
+	if (context->error)
+		return context->error;
+
+	assert(context->state == HS_DONE);
+
+	if (context->digest_length > output_len)
+		return -ENOBUFS;
+
+	memcpy(output, context->digest, context->digest_length);
+	return context->digest_length;
+}
+
+void hash_print(struct hash_context *context)
+{
+	unsigned int i;
+
+	assert(context);
+	assert(context->state == HS_DONE);
+	assert(context->digest_length);
+
+	for (i = 0; i < context->digest_length; i++)
+		fprintf(stdout, "%02x", context->digest[i]);
+	fprintf(stdout, "\n");
+}
+
+int hash_single(const void *data, size_t size, const EVP_MD *algo, void *output, size_t output_len)
+{
+	int algo_out_size;
+
+	assert(algo);
+	assert(data);
+	assert(output);
+
+	//algo_out_size = EVP_MD_get_size(algo);
+	algo_out_size = EVP_MD_size(algo);
+	if (algo_out_size <= 0)
+		return -EINVAL;
+
+	if (output_len > algo_out_size)
+		return -ENOBUFS;
+
+	if (!EVP_Digest(data, size, output, NULL, algo, NULL)) {
+		fprintf(stderr, "Unable to compute hash.");
+		return -ENOTRECOVERABLE;
+	}
+
+	return 0;
+}
+
+int hash_sha256(const void *data, size_t size, void *output, size_t output_len)
+{
+	return hash_single(data, size, EVP_sha256(), output, output_len);
+}
+
+int hash_sha384(const void *data, size_t size, void *output, size_t output_len)
+{
+	return hash_single(data, size, EVP_sha384(), output, output_len);
+}
diff --git a/tools/rimage/src/include/rimage/adsp_config.h b/tools/rimage/src/include/rimage/adsp_config.h
new file mode 100644
index 000000000000..e87c78c65f91
--- /dev/null
+++ b/tools/rimage/src/include/rimage/adsp_config.h
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2020 Intel Corporation. All rights reserved.
+
+#include <rimage/rimage.h>
+#include <stdbool.h>
+
+int adsp_parse_config(const char *file, struct image *image);
+void adsp_free(struct adsp *adsp);
diff --git a/tools/rimage/src/include/rimage/cavs/cavs_ext_manifest.h b/tools/rimage/src/include/rimage/cavs/cavs_ext_manifest.h
new file mode 100644
index 000000000000..4002f37fddb1
--- /dev/null
+++ b/tools/rimage/src/include/rimage/cavs/cavs_ext_manifest.h
@@ -0,0 +1,251 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2021 Intel Corporation. All rights reserved.
+ *
+ * Author: Rander Wang <rander.wang@linux.intel.com>
+ */
+
+#ifndef __RIMAGE_CAVS_EXT_MANIFEST_H__
+#define __RIMAGE_CAVS_EXT_MANIFEST_H__
+
+/* Structure of ext manifest :
+ * ExtendedManifestHeader
+ *  ExtendedModuleConfig[0]
+ *      SchedulingCapability[]
+ *      PinDescr[]
+ *  ExtendedModuleConfig[1]
+ *      SchedulingCapability[]
+ *      PinDescr[]
+ *  ...
+ *  ExtendedModuleConfig[N]
+ *      SchedulingCapability[]
+ *      PinDescr[]
+ */
+
+/* ExtendedManifestHeader id $AE1 */
+#define EXTENDED_MANIFEST_MAGIC_HEADER_ID	0x31454124
+#define EXTENDED_MANIFEST_VERSION_MAJOR		0x0001
+#define EXTENDED_MANIFEST_VERSION_MINOR		0x0000
+
+#define FW_MAX_EXT_MODULE_NUM	32
+
+struct uuid_t {
+	uint32_t d0;
+	uint16_t d1;
+	uint16_t d2;
+	uint8_t d3;
+	uint8_t d4;
+	uint8_t d5;
+	uint8_t d6;
+	uint8_t d7;
+	uint8_t d8;
+	uint8_t d9;
+	uint8_t d10;
+} __attribute__((packed));
+
+union mod_multiples {
+	uint16_t ul;
+	struct {
+		uint16_t x1 : 1;
+		uint16_t x2 : 1;
+		uint16_t x3 : 1;
+		uint16_t x4 : 1;
+		uint16_t x5 : 1;
+		uint16_t x6 : 1;
+		uint16_t x7 : 1;
+		uint16_t x8 : 1;
+		uint16_t x9 : 1;
+		uint16_t x10 : 1;
+		uint16_t x11 : 1;
+		uint16_t x12 : 1;
+		uint16_t x13 : 1;
+		uint16_t x14 : 1;
+		uint16_t x15 : 1;
+		uint16_t all : 1;
+	} r;
+} __attribute__((packed));
+
+struct mod_scheduling_caps {
+	/* scheduling period in Samples (sample groups) (note: 1 Sample = 1 sample per channel) */
+	uint16_t    frame_length;
+	union mod_multiples   multiples_supported;
+} __attribute__((packed));
+
+enum mod_pin_direction {
+	pin_input = 0,
+	pin_output = 1
+};
+
+union mod_pin_caps {
+	uint32_t ul;
+	struct {
+		uint16_t    direction : 1;	/* 0 : input; 1: output */
+		uint16_t    reserved0 : 15;
+		uint16_t    reserved1 : 16;
+	} r;
+} __attribute__((packed));
+
+union mod_sample_rates {
+	uint32_t ul;
+	struct {
+		uint32_t freq_8000 : 1;
+		uint32_t freq_11025 : 1;
+		uint32_t freq_12000 : 1;
+		uint32_t freq_16000 : 1;
+		uint32_t freq_18900 : 1;
+		uint32_t freq_22050 : 1;
+		uint32_t freq_24000 : 1;
+		uint32_t freq_32000 : 1;
+		uint32_t freq_37800 : 1;
+		uint32_t freq_44100 : 1;
+		uint32_t freq_48000 : 1;
+		uint32_t freq_64000 : 1;
+		uint32_t freq_88200 : 1;
+		uint32_t freq_96000 : 1;
+		uint32_t freq_176400 : 1;
+		uint32_t freq_192000 : 1;
+		uint32_t reserved : 16;
+	} r;
+} __attribute__((packed));
+
+union mod_sample_sizes {
+	uint32_t ul;
+	struct {
+		uint16_t bits_8 : 1;
+		uint16_t bits_16 : 1;
+		uint16_t bits_24 : 1;
+		uint16_t bits_32 : 1;
+		uint16_t bits_64 : 1;
+		uint16_t reserved0 : 11;
+		uint16_t reserved1 : 16;
+	} r;
+} __attribute__((packed));
+
+union mod_sample_containers {
+	uint32_t ul;
+	struct {
+		uint16_t bits_8 : 1;
+		uint16_t bits_16 : 1;
+		uint16_t bits_24 : 1;
+		uint16_t bits_32 : 1;
+		uint16_t bits_64 : 1;
+		uint16_t reserved0 : 11;
+		uint16_t reserved1 : 16;
+	} r;
+} __attribute__((packed));
+
+union mod_channel_config {
+	uint32_t ul;
+	struct {
+		/* FRONT_CENTER */
+		uint32_t channel_mono : 1;
+		/* FRONT_LEFT | BACK_LEFT */
+		uint32_t channel_dual_mono : 1;
+		/* FRONT_LEFT | FRONT_RIGHT */
+		uint32_t channel_stereo : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | LOW_FREQUENCY */
+		uint32_t channel_2_1 : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER */
+		uint32_t channel_3_0 : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | BACK_LEFT  | BACK_RIGHT */
+		uint32_t channel_quad : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER | BACK_CENTER */
+		uint32_t channel_surround : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER | LOW_FREQUENCY */
+		uint32_t channel_3_1 : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER | BACK_LEFT | BACK_RIGHT */
+		uint32_t channel_5_0 : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER | SIDE_LEFT | SIDE_RIGHT */
+		uint32_t channel_5_0_surround : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER | LOW_FREQUENCY | BACK_LEFT |
+		 * BACK_RIGHT
+		 */
+		uint32_t channel_5_1 : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER | LOW_FREQUENCY | SIDE_LEFT |
+		 * SIDE_RIGHT
+		 */
+		uint32_t channel_5_1_surround : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER | BACK_LEFT | BACK_RIGHT |
+		 * FRONT_LEFT_OF_CENTER | FRONT_RIGHT_OF_CENTER
+		 */
+		uint32_t channel_7_0 : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER | BACK_LEFT | BACK_RIGHT |
+		 * SIDE_LEFT | SIDE_RIGHT
+		 */
+		uint32_t channel_7_0_surround : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER | LOW_FREQUENCY | BACK_LEFT |
+		 * BACK_RIGHT | FRONT_LEFT_OF_CENTER | FRONT_RIGHT_OF_CENTER
+		 */
+		uint32_t channel_7_1 : 1;
+		/* FRONT_LEFT | FRONT_RIGHT | FRONT_CENTER | LOW_FREQUENCY | BACK_LEFT |
+		 * BACK_RIGHT | SIDE_LEFT | SIDE_RIGHT
+		 */
+		uint32_t channel_7_1_surround : 1;
+		uint32_t reserved : 16;
+	} r;
+} __attribute__((packed));
+
+enum mod_stream_type {
+	epcm = 0,	/* PCM stream */
+	emp3,	/* MP3 encoded stream */
+	eaac,	/* AAC encoded stream */
+	emax_stream_type,
+	estream_type_invalid = 0xFF
+};
+
+enum mod_type {
+	ebasefw = 0,
+	emixin,
+	emixout,
+	ecopier,
+	epeakvol,
+	eupdwmix,
+	emux,
+	esrc,
+	ewov,
+	efx,
+	eaec,
+	ekpb,
+	emicselect,
+	efxf,	/*i.e.SmartAmp */
+	eaudclass,
+	efakecopier,
+	eiodriver,
+	ewhm,
+	egdbstub,
+	esensing,
+	emax,
+	einvalid = emax
+} ;
+
+struct fw_pin_description {
+	union mod_pin_caps		caps;
+	enum mod_stream_type		format_type;
+	union mod_sample_rates		sample_rate;
+	union mod_sample_sizes		sample_size;
+	union mod_sample_containers	sample_container;
+	union mod_channel_config	ch_cfg;
+} __attribute__((packed));
+
+struct fw_ext_man_cavs_header {
+	uint32_t id;
+	uint32_t len;	/* sizeof(Extend Manifest) in bytes */
+	uint16_t version_major;	/* Version of Extended Manifest structure */
+	uint16_t version_minor;	/* Version of Extended Manifest structure */
+	uint32_t num_module_entries;
+} __attribute__((packed));
+
+struct fw_ext_mod_config_header {
+	uint32_t ext_module_config_length;	/* sizeof(fw_ext_mod_config_header) in bytes */
+	uint32_t guid[4];	/* Module GUID */
+	uint16_t version_major;	/* Module version */
+	uint16_t version_minor;	/* Module version */
+	uint16_t version_hotfix;	/* Module version */
+	uint16_t version_build;	/* Module version */
+	enum mod_type module_type;
+	uint32_t init_settings_min_size;	/* Minimum size of initialization settings (in bytes) */
+	uint16_t num_scheduling_capabilities;	/* number scheduling capabilities supported by the module */
+	uint16_t num_pin_entries;	/* Number of Pin (inputs + ouptuts) */
+} __attribute__((packed));
+
+#endif
diff --git a/tools/rimage/src/include/rimage/cse.h b/tools/rimage/src/include/rimage/cse.h
new file mode 100644
index 000000000000..9a14b93b99f6
--- /dev/null
+++ b/tools/rimage/src/include/rimage/cse.h
@@ -0,0 +1,47 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2017 Intel Corporation. All rights reserved.
+ */
+
+#ifndef __CSE_H__
+#define __CSE_H__
+
+#include <stdint.h>
+
+struct image;
+
+#define CSE_HEADER_MAKER   0x44504324	/* "DPC$" */
+
+struct CsePartitionDirHeader {
+	uint32_t header_marker;
+	uint32_t nb_entries;
+	uint8_t  header_version;
+	uint8_t  entry_version;
+	uint8_t  header_length;
+	uint8_t  checksum;
+	uint8_t  partition_name[4];
+}  __attribute__((packed));
+
+struct CsePartitionDirHeader_v2_5 {
+	uint32_t header_marker;
+	uint32_t nb_entries;
+	uint8_t  header_version;
+	uint8_t  entry_version;
+	uint8_t  header_length;
+	uint8_t  not_used; /* set to zero - old checksum */
+	uint8_t  partition_name[4];
+	uint32_t checksum; /* crc32 checksum */
+}  __attribute__((packed));
+
+struct CsePartitionDirEntry {
+	uint8_t  entry_name[12];
+	uint32_t offset;
+	uint32_t length;
+	uint32_t reserved;
+}  __attribute__((packed));
+
+void ri_cse_create(struct image *image);
+void ri_cse_create_v2_5(struct image *image);
+void ri_cse_create_ace_v1_5(struct image *image);
+
+#endif
diff --git a/tools/rimage/src/include/rimage/css.h b/tools/rimage/src/include/rimage/css.h
new file mode 100644
index 000000000000..6283cdaf9042
--- /dev/null
+++ b/tools/rimage/src/include/rimage/css.h
@@ -0,0 +1,108 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2017 Intel Corporation. All rights reserved.
+ */
+
+#ifndef __CSS_H__
+#define __CSS_H__
+
+#include <stdint.h>
+
+struct image;
+
+#define MAN_CSS_LT_MODULE_TYPE		0x00000006
+#define MAN_CSS_MOD_TYPE		4
+#define MAN_CSS_HDR_SIZE		161	/* in words */
+#define MAN_CSS_HDR_SIZE_2_5		225	/* in words */
+#define MAN_CSS_HDR_VERSION		0x10000
+#define MAN_CSS_HDR_VERSION_2_5		0x21000
+#define MAN_CSS_MOD_VENDOR		0x8086
+#define MAN_CSS_HDR_ID			{'$', 'M', 'N', '2'}
+
+#define MAN_CSS_KEY_SIZE		(MAN_RSA_KEY_MODULUS_LEN >> 2)
+#define MAN_CSS_MOD_SIZE		(MAN_RSA_KEY_MODULUS_LEN >> 2)
+#define MAN_CSS_MOD_SIZE_2_5		(MAN_RSA_KEY_MODULUS_LEN_2_5 >> 2)
+#define MAN_CSS_EXP_SIZE		(MAN_RSA_KEY_EXPONENT_LEN >> 2)
+#define MAN_CSS_MAN_SIZE_V1_8		\
+	(sizeof(struct fw_image_manifest_v1_8) >> 2)
+#define MAN_CSS_MAN_SIZE_V1_5		\
+	(sizeof(struct fw_image_manifest_v1_5) >> 2)
+
+/*
+ * RSA Key and Crypto
+ */
+#define MAN_RSA_KEY_MODULUS_LEN		256
+#define MAN_RSA_KEY_MODULUS_LEN_2_5	384
+#define MAN_RSA_KEY_EXPONENT_LEN	4
+#define MAN_RSA_SIGNATURE_LEN		256
+#define MAN_RSA_SIGNATURE_LEN_2_5	384
+
+struct fw_version {
+	uint16_t major_version;
+	uint16_t minor_version;
+	uint16_t hotfix_version;
+	uint16_t build_version;
+} __attribute__((packed));
+
+struct css_header_v2_5 {
+	uint32_t header_type;
+	uint32_t header_len;
+	uint32_t header_version;
+	uint32_t reserved0; /* must be 0x1 */
+	uint32_t module_vendor;
+	uint32_t date;
+	uint32_t size;
+	uint8_t header_id[4];
+	uint32_t padding;  /* must be 0x0 */
+	struct fw_version version;
+	uint32_t svn;
+	uint32_t reserved1[18];  /* must be 0x0 */
+	uint32_t modulus_size;
+	uint32_t exponent_size;
+	uint8_t modulus[MAN_RSA_KEY_MODULUS_LEN_2_5];
+	uint8_t exponent[MAN_RSA_KEY_EXPONENT_LEN];
+	uint8_t signature[MAN_RSA_SIGNATURE_LEN_2_5];
+} __attribute__((packed));
+
+struct css_header_v1_8 {
+	uint32_t header_type;
+	uint32_t header_len;
+	uint32_t header_version;
+	uint32_t reserved0; /* must be 0x0 */
+	uint32_t module_vendor;
+	uint32_t date;
+	uint32_t size;
+	uint8_t header_id[4];
+	uint32_t padding;  /* must be 0x0 */
+	struct fw_version version;
+	uint32_t svn;
+	uint32_t reserved1[18];  /* must be 0x0 */
+	uint32_t modulus_size;
+	uint32_t exponent_size;
+	uint8_t modulus[MAN_RSA_KEY_MODULUS_LEN];
+	uint8_t exponent[MAN_RSA_KEY_EXPONENT_LEN];
+	uint8_t signature[MAN_RSA_SIGNATURE_LEN];
+} __attribute__((packed));
+
+struct css_header_v1_5 {
+	uint32_t    module_type;
+	uint32_t    header_len;
+	uint32_t    header_version;
+	uint32_t    reserved0;          /* must be 0x0 */
+	uint32_t    module_vendor;
+	uint32_t    date;
+	uint32_t    size;
+	uint32_t    key_size;
+	uint32_t    modulus_size;
+	uint32_t    exponent_size;
+	uint32_t    reserved[22];
+	uint8_t     modulus[MAN_RSA_KEY_MODULUS_LEN];
+	uint8_t     exponent[MAN_RSA_KEY_EXPONENT_LEN];
+	uint8_t     signature[MAN_RSA_SIGNATURE_LEN];
+} __attribute__((packed));
+
+void ri_css_v1_8_hdr_create(struct image *image);
+void ri_css_v1_5_hdr_create(struct image *image);
+void ri_css_v2_5_hdr_create(struct image *image);
+
+#endif
diff --git a/tools/rimage/src/include/rimage/elf.h b/tools/rimage/src/include/rimage/elf.h
new file mode 100644
index 000000000000..13a4965e059e
--- /dev/null
+++ b/tools/rimage/src/include/rimage/elf.h
@@ -0,0 +1,936 @@
+/* SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 1996-1998 John D. Polstra.  All rights reserved.
+ * Copyright (c) 2001 David E. O'Brien
+ * Portions Copyright 2009 The Go Authors.  All rights reserved.
+ */
+
+#ifndef __ELF_H__
+#define __ELF_H__
+
+/*
+ * ELF definitions that are independent of architecture or word size.
+ */
+
+/*
+ * Note header.  The ".note" section contains an array of notes.  Each
+ * begins with this header, aligned to a word boundary.  Immediately
+ * following the note header is n_namesz bytes of name, padded to the
+ * next word boundary.  Then comes n_descsz bytes of descriptor, again
+ * padded to a word boundary.  The values of n_namesz and n_descsz do
+ * not include the padding.
+ */
+
+#include <stdint.h>
+
+typedef uint64_t uint64;
+typedef uint32_t uint32;
+typedef uint16_t uint16;
+typedef uint8_t uint8;
+
+typedef int64_t int64;
+typedef int32_t int32;
+typedef int16_t int16;
+typedef int8_t int8;
+
+
+typedef struct {
+	uint32	n_namesz;	/* Length of name. */
+	uint32	n_descsz;	/* Length of descriptor. */
+	uint32	n_type;		/* Type of this note. */
+} Elf_Note;
+
+/* Indexes into the e_ident array.  Keep synced with
+   http://www.sco.com/developer/gabi/ch4.eheader.html */
+#define EI_MAG0		0	/* Magic number, byte 0. */
+#define EI_MAG1		1	/* Magic number, byte 1. */
+#define EI_MAG2		2	/* Magic number, byte 2. */
+#define EI_MAG3		3	/* Magic number, byte 3. */
+#define EI_CLASS	4	/* Class of machine. */
+#define EI_DATA		5	/* Data format. */
+#define EI_VERSION	6	/* ELF format version. */
+#define EI_OSABI	7	/* Operating system / ABI identification */
+#define EI_ABIVERSION	8	/* ABI version */
+#define OLD_EI_BRAND	8	/* Start of architecture identification. */
+#define EI_PAD		9	/* Start of padding (per SVR4 ABI). */
+#define EI_NIDENT	16	/* Size of e_ident array. */
+
+/* Values for the magic number bytes. */
+#define ELFMAG0		0x7f
+#define ELFMAG1		'E'
+#define ELFMAG2		'L'
+#define ELFMAG3		'F'
+#define ELFMAG		"\177ELF"	/* magic string */
+#define SELFMAG		4		/* magic string size */
+
+/* Values for e_ident[EI_VERSION] and e_version. */
+#define EV_NONE		0
+#define EV_CURRENT	1
+
+/* Values for e_ident[EI_CLASS]. */
+#define ELFCLASSNONE	0	/* Unknown class. */
+#define ELFCLASS32	1	/* 32-bit architecture. */
+#define ELFCLASS64	2	/* 64-bit architecture. */
+
+/* Values for e_ident[EI_DATA]. */
+#define ELFDATANONE	0	/* Unknown data format. */
+#define ELFDATA2LSB	1	/* 2's complement little-endian. */
+#define ELFDATA2MSB	2	/* 2's complement big-endian. */
+
+/* Values for e_ident[EI_OSABI]. */
+#define ELFOSABI_NONE		0	/* UNIX System V ABI */
+#define ELFOSABI_HPUX		1	/* HP-UX operating system */
+#define ELFOSABI_NETBSD		2	/* NetBSD */
+#define ELFOSABI_LINUX		3	/* GNU/Linux */
+#define ELFOSABI_HURD		4	/* GNU/Hurd */
+#define ELFOSABI_86OPEN		5	/* 86Open common IA32 ABI */
+#define ELFOSABI_SOLARIS	6	/* Solaris */
+#define ELFOSABI_AIX		7	/* AIX */
+#define ELFOSABI_IRIX		8	/* IRIX */
+#define ELFOSABI_FREEBSD	9	/* FreeBSD */
+#define ELFOSABI_TRU64		10	/* TRU64 UNIX */
+#define ELFOSABI_MODESTO	11	/* Novell Modesto */
+#define ELFOSABI_OPENBSD	12	/* OpenBSD */
+#define ELFOSABI_OPENVMS	13	/* Open VMS */
+#define ELFOSABI_NSK		14	/* HP Non-Stop Kernel */
+#define ELFOSABI_ARM		97	/* ARM */
+#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
+
+#define ELFOSABI_SYSV		ELFOSABI_NONE	/* symbol used in old spec */
+#define ELFOSABI_MONTEREY	ELFOSABI_AIX	/* Monterey */
+
+/* e_ident */
+#define IS_ELF(ehdr)	((ehdr).e_ident[EI_MAG0] == ELFMAG0 && \
+			 (ehdr).e_ident[EI_MAG1] == ELFMAG1 && \
+			 (ehdr).e_ident[EI_MAG2] == ELFMAG2 && \
+			 (ehdr).e_ident[EI_MAG3] == ELFMAG3)
+
+/* Values for e_type. */
+#define ET_NONE		0	/* Unknown type. */
+#define ET_REL		1	/* Relocatable. */
+#define ET_EXEC		2	/* Executable. */
+#define ET_DYN		3	/* Shared object. */
+#define ET_CORE		4	/* Core file. */
+#define ET_LOOS		0xfe00	/* First operating system specific. */
+#define ET_HIOS		0xfeff	/* Last operating system-specific. */
+#define ET_LOPROC	0xff00	/* First processor-specific. */
+#define ET_HIPROC	0xffff	/* Last processor-specific. */
+
+/* Values for e_machine. */
+#define EM_NONE		0	/* Unknown machine. */
+#define EM_M32		1	/* AT&T WE32100. */
+#define EM_SPARC	2	/* Sun SPARC. */
+#define EM_386		3	/* Intel i386. */
+#define EM_68K		4	/* Motorola 68000. */
+#define EM_88K		5	/* Motorola 88000. */
+#define EM_860		7	/* Intel i860. */
+#define EM_MIPS		8	/* MIPS R3000 Big-Endian only. */
+#define EM_S370		9	/* IBM System/370. */
+#define EM_MIPS_RS3_LE	10	/* MIPS R3000 Little-Endian. */
+#define EM_PARISC	15	/* HP PA-RISC. */
+#define EM_VPP500	17	/* Fujitsu VPP500. */
+#define EM_SPARC32PLUS	18	/* SPARC v8plus. */
+#define EM_960		19	/* Intel 80960. */
+#define EM_PPC		20	/* PowerPC 32-bit. */
+#define EM_PPC64	21	/* PowerPC 64-bit. */
+#define EM_S390		22	/* IBM System/390. */
+#define EM_V800		36	/* NEC V800. */
+#define EM_FR20		37	/* Fujitsu FR20. */
+#define EM_RH32		38	/* TRW RH-32. */
+#define EM_RCE		39	/* Motorola RCE. */
+#define EM_ARM		40	/* ARM. */
+#define EM_SH		42	/* Hitachi SH. */
+#define EM_SPARCV9	43	/* SPARC v9 64-bit. */
+#define EM_TRICORE	44	/* Siemens TriCore embedded processor. */
+#define EM_ARC		45	/* Argonaut RISC Core. */
+#define EM_H8_300	46	/* Hitachi H8/300. */
+#define EM_H8_300H	47	/* Hitachi H8/300H. */
+#define EM_H8S		48	/* Hitachi H8S. */
+#define EM_H8_500	49	/* Hitachi H8/500. */
+#define EM_IA_64	50	/* Intel IA-64 Processor. */
+#define EM_MIPS_X	51	/* Stanford MIPS-X. */
+#define EM_COLDFIRE	52	/* Motorola ColdFire. */
+#define EM_68HC12	53	/* Motorola M68HC12. */
+#define EM_MMA		54	/* Fujitsu MMA. */
+#define EM_PCP		55	/* Siemens PCP. */
+#define EM_NCPU		56	/* Sony nCPU. */
+#define EM_NDR1		57	/* Denso NDR1 microprocessor. */
+#define EM_STARCORE	58	/* Motorola Star*Core processor. */
+#define EM_ME16		59	/* Toyota ME16 processor. */
+#define EM_ST100	60	/* STMicroelectronics ST100 processor. */
+#define EM_TINYJ	61	/* Advanced Logic Corp. TinyJ processor. */
+#define EM_X86_64	62	/* Advanced Micro Devices x86-64 */
+
+/* Non-standard or deprecated. */
+#define EM_486		6	/* Intel i486. */
+#define EM_MIPS_RS4_BE	10	/* MIPS R4000 Big-Endian */
+#define EM_ALPHA_STD	41	/* Digital Alpha (standard value). */
+#define EM_ALPHA	0x9026	/* Alpha (written in the absence of an ABI) */
+
+/* Special section indexes. */
+#define SHN_UNDEF	     0		/* Undefined, missing, irrelevant. */
+#define SHN_LORESERVE	0xff00		/* First of reserved range. */
+#define SHN_LOPROC	0xff00		/* First processor-specific. */
+#define SHN_HIPROC	0xff1f		/* Last processor-specific. */
+#define SHN_LOOS	0xff20		/* First operating system-specific. */
+#define SHN_HIOS	0xff3f		/* Last operating system-specific. */
+#define SHN_ABS		0xfff1		/* Absolute values. */
+#define SHN_COMMON	0xfff2		/* Common data. */
+#define SHN_XINDEX	0xffff		/* Escape -- index stored elsewhere. */
+#define SHN_HIRESERVE	0xffff		/* Last of reserved range. */
+
+/* sh_type */
+#define SHT_NULL		0	/* inactive */
+#define SHT_PROGBITS		1	/* program defined information */
+#define SHT_SYMTAB		2	/* symbol table section */
+#define SHT_STRTAB		3	/* string table section */
+#define SHT_RELA		4	/* relocation section with addends */
+#define SHT_HASH		5	/* symbol hash table section */
+#define SHT_DYNAMIC		6	/* dynamic section */
+#define SHT_NOTE		7	/* note section */
+#define SHT_NOBITS		8	/* no space section */
+#define SHT_REL			9	/* relocation section - no addends */
+#define SHT_SHLIB		10	/* reserved - purpose unknown */
+#define SHT_DYNSYM		11	/* dynamic symbol table section */
+#define SHT_INIT_ARRAY		14	/* Initialization function pointers. */
+#define SHT_FINI_ARRAY		15	/* Termination function pointers. */
+#define SHT_PREINIT_ARRAY	16	/* Pre-initialization function ptrs. */
+#define SHT_GROUP		17	/* Section group. */
+#define SHT_SYMTAB_SHNDX	18	/* Section indexes (see SHN_XINDEX). */
+#define SHT_LOOS	0x60000000	/* First of OS specific semantics */
+#define SHT_HIOS	0x6fffffff	/* Last of OS specific semantics */
+#define SHT_GNU_VERDEF	0x6ffffffd
+#define SHT_GNU_VERNEED	0x6ffffffe
+#define SHT_GNU_VERSYM	0x6fffffff
+#define SHT_LOPROC	0x70000000	/* reserved range for processor */
+#define SHT_HIPROC	0x7fffffff	/* specific section header types */
+#define SHT_LOUSER	0x80000000	/* reserved range for application */
+#define SHT_HIUSER	0xffffffff	/* specific indexes */
+
+/* Flags for sh_flags. */
+#define SHF_WRITE		0x1	/* Section contains writable data. */
+#define SHF_ALLOC		0x2	/* Section occupies memory. */
+#define SHF_EXECINSTR		0x4	/* Section contains instructions. */
+#define SHF_MERGE		0x10	/* Section may be merged. */
+#define SHF_STRINGS		0x20	/* Section contains strings. */
+#define SHF_INFO_LINK		0x40	/* sh_info holds section index. */
+#define SHF_LINK_ORDER		0x80	/* Special ordering requirements. */
+#define SHF_OS_NONCONFORMING	0x100	/* OS-specific processing required. */
+#define SHF_GROUP		0x200	/* Member of section group. */
+#define SHF_TLS			0x400	/* Section contains TLS data. */
+#define SHF_MASKOS	0x0ff00000	/* OS-specific semantics. */
+#define SHF_MASKPROC	0xf0000000	/* Processor-specific semantics. */
+
+/* Values for p_type. */
+#define PT_NULL		0	/* Unused entry. */
+#define PT_LOAD		1	/* Loadable segment. */
+#define PT_DYNAMIC	2	/* Dynamic linking information segment. */
+#define PT_INTERP	3	/* Pathname of interpreter. */
+#define PT_NOTE		4	/* Auxiliary information. */
+#define PT_SHLIB	5	/* Reserved (not used). */
+#define PT_PHDR		6	/* Location of program header itself. */
+#define PT_TLS		7	/* Thread local storage segment */
+#define PT_LOOS		0x60000000	/* First OS-specific. */
+#define PT_HIOS		0x6fffffff	/* Last OS-specific. */
+#define PT_LOPROC	0x70000000	/* First processor-specific type. */
+#define PT_HIPROC	0x7fffffff	/* Last processor-specific type. */
+#define PT_GNU_STACK	0x6474e551
+#define PT_PAX_FLAGS	0x65041580
+
+/* Values for p_flags. */
+#define PF_X		0x1		/* Executable. */
+#define PF_W		0x2		/* Writable. */
+#define PF_R		0x4		/* Readable. */
+#define PF_MASKOS	0x0ff00000	/* Operating system-specific. */
+#define PF_MASKPROC	0xf0000000	/* Processor-specific. */
+
+/* Values for d_tag. */
+#define DT_NULL		0	/* Terminating entry. */
+/* String table offset of a needed shared library. */
+#define DT_NEEDED	1
+#define DT_PLTRELSZ	2	/* Total size in bytes of PLT relocations. */
+#define DT_PLTGOT	3	/* Processor-dependent address. */
+#define DT_HASH		4	/* Address of symbol hash table. */
+#define DT_STRTAB	5	/* Address of string table. */
+#define DT_SYMTAB	6	/* Address of symbol table. */
+#define DT_RELA		7	/* Address of ElfNN_Rela relocations. */
+#define DT_RELASZ	8	/* Total size of ElfNN_Rela relocations. */
+#define DT_RELAENT	9	/* Size of each ElfNN_Rela relocation entry. */
+#define DT_STRSZ	10	/* Size of string table. */
+#define DT_SYMENT	11	/* Size of each symbol table entry. */
+#define DT_INIT		12	/* Address of initialization function. */
+#define DT_FINI		13	/* Address of finalization function. */
+/* String table offset of shared object name. */
+#define DT_SONAME	14
+#define DT_RPATH	15	/* String table offset of library path. [sup] */
+#define DT_SYMBOLIC	16	/* Indicates "symbolic" linking. [sup] */
+#define DT_REL		17	/* Address of ElfNN_Rel relocations. */
+#define DT_RELSZ	18	/* Total size of ElfNN_Rel relocations. */
+#define DT_RELENT	19	/* Size of each ElfNN_Rel relocation. */
+#define DT_PLTREL	20	/* Type of relocation used for PLT. */
+#define DT_DEBUG	21	/* Reserved (not used). */
+/* Indicates there may be relocations in non-writable segments. [sup] */
+#define DT_TEXTREL	22
+#define DT_JMPREL	23	/* Address of PLT relocations. */
+#define	DT_BIND_NOW	24	/* [sup] */
+/* Address of the array of pointers to initialization functions */
+#define	DT_INIT_ARRAY	25
+/* Address of the array of pointers to termination functions */
+#define	DT_FINI_ARRAY	26
+/* Size in bytes of the array of initialization functions. */
+#define	DT_INIT_ARRAYSZ	27
+/* Size in bytes of the array of terminationfunctions. */
+#define	DT_FINI_ARRAYSZ	28
+/* String table offset of a null-terminated library search path string. */
+#define	DT_RUNPATH	29
+#define	DT_FLAGS	30	/* Object specific flag values. */
+/*	Values greater than or equal to DT_ENCODING and less than
+	DT_LOOS follow the rules for the interpretation of the d_un
+	union as follows: even == 'd_ptr', even == 'd_val' or none */
+#define	DT_ENCODING	32
+/* Address of the array of pointers to pre-initialization functions. */
+#define	DT_PREINIT_ARRAY 32
+/* Size in bytes of the array of pre-initialization functions. */
+#define	DT_PREINIT_ARRAYSZ 33
+#define	DT_LOOS		0x6000000d	/* First OS-specific */
+#define	DT_HIOS		0x6ffff000	/* Last OS-specific */
+#define	DT_LOPROC	0x70000000	/* First processor-specific type. */
+#define	DT_HIPROC	0x7fffffff	/* Last processor-specific type. */
+
+#define	DT_VERNEED	0x6ffffffe
+#define	DT_VERNEEDNUM	0x6fffffff
+#define	DT_VERSYM	0x6ffffff0
+
+/* Values for DT_FLAGS */
+/*	Indicates that the object being loaded may make reference to
+	the $ORIGIN substitution string */
+#define	DF_ORIGIN	0x0001
+#define	DF_SYMBOLIC	0x0002	/* Indicates "symbolic" linking. */
+/* Indicates there may be relocations in non-writable segments. */
+#define	DF_TEXTREL	0x0004
+/*	Indicates that the dynamic linker should process all
+	relocations for the object containing this entry before
+	transferring control to the program.  */
+#define	DF_BIND_NOW	0x0008
+/*	Indicates that the shared object or executable contains code
+	using a static thread-local storage scheme.  */
+#define	DF_STATIC_TLS	0x0010
+
+/* Values for n_type.  Used in core files. */
+#define NT_PRSTATUS	1	/* Process status. */
+#define NT_FPREGSET	2	/* Floating point registers. */
+#define NT_PRPSINFO	3	/* Process state info. */
+
+/* Symbol Binding - ELFNN_ST_BIND - st_info */
+#define STB_LOCAL	0	/* Local symbol */
+#define STB_GLOBAL	1	/* Global symbol */
+#define STB_WEAK	2	/* like global - lower precedence */
+#define STB_LOOS	10	/* Reserved range for operating system */
+#define STB_HIOS	12	/*   specific semantics. */
+#define STB_LOPROC	13	/* reserved range for processor */
+#define STB_HIPROC	15	/*   specific semantics. */
+
+/* Symbol type - ELFNN_ST_TYPE - st_info */
+#define STT_NOTYPE	0	/* Unspecified type. */
+#define STT_OBJECT	1	/* Data object. */
+#define STT_FUNC	2	/* Function. */
+#define STT_SECTION	3	/* Section. */
+#define STT_FILE	4	/* Source file. */
+#define STT_COMMON	5	/* Uninitialized common block. */
+#define STT_TLS		6	/* TLS object. */
+#define STT_LOOS	10	/* Reserved range for operating system */
+#define STT_HIOS	12	/*   specific semantics. */
+#define STT_LOPROC	13	/* reserved range for processor */
+#define STT_HIPROC	15	/*   specific semantics. */
+
+/* Symbol visibility - ELFNN_ST_VISIBILITY - st_other */
+#define STV_DEFAULT	0x0	/* Default visibility (see binding). */
+#define STV_INTERNAL	0x1	/* Special meaning in relocatable objects. */
+#define STV_HIDDEN	0x2	/* Not visible. */
+#define STV_PROTECTED	0x3	/* Visible but not preemptible. */
+
+/* Special symbol table indexes. */
+#define STN_UNDEF	0	/* Undefined symbol index. */
+
+/*
+ * ELF definitions common to all 32-bit architectures.
+ */
+
+typedef uint32	Elf32_Addr;
+typedef uint16	Elf32_Half;
+typedef uint32	Elf32_Off;
+typedef int32	Elf32_Sword;
+typedef uint32	Elf32_Word;
+
+typedef Elf32_Word	Elf32_Hashelt;
+
+/* Non-standard class-dependent datatype used for abstraction. */
+typedef Elf32_Word	Elf32_Size;
+typedef Elf32_Sword	Elf32_Ssize;
+
+/*
+ * ELF header.
+ */
+
+typedef struct {
+	unsigned char	ident[EI_NIDENT];	/* File identification. */
+	Elf32_Half	type;		/* File type. */
+	Elf32_Half	machine;	/* Machine architecture. */
+	Elf32_Word	version;	/* ELF format version. */
+	Elf32_Addr	entry;	/* Entry point. */
+	Elf32_Off	phoff;	/* Program header file offset. */
+	Elf32_Off	shoff;	/* Section header file offset. */
+	Elf32_Word	flags;	/* Architecture-specific flags. */
+	Elf32_Half	ehsize;	/* Size of ELF header in bytes. */
+	Elf32_Half	phentsize;	/* Size of program header entry. */
+	Elf32_Half	phnum;	/* Number of program header entries. */
+	Elf32_Half	shentsize;	/* Size of section header entry. */
+	Elf32_Half	shnum;	/* Number of section header entries. */
+	Elf32_Half	shstrndx;	/* Section name strings section. */
+} Elf32_Ehdr;
+
+/*
+ * Section header.
+ */
+
+typedef struct {
+	Elf32_Word	name;	/* Section name (index into the
+					   section header string table). */
+	Elf32_Word	type;	/* Section type. */
+	Elf32_Word	flags;	/* Section flags. */
+	Elf32_Addr	vaddr;	/* Address in memory image. */
+	Elf32_Off	off;	/* Offset in file. */
+	Elf32_Word	size;	/* Size in bytes. */
+	Elf32_Word	link;	/* Index of a related section. */
+	Elf32_Word	info;	/* Depends on section type. */
+	Elf32_Word	addralign;	/* Alignment in bytes. */
+	Elf32_Word	entsize;	/* Size of each entry in section. */
+} Elf32_Shdr;
+
+/*
+ * Program header.
+ */
+
+typedef struct {
+	Elf32_Word	type;		/* Entry type. */
+	Elf32_Off	off;	/* File offset of contents. */
+	Elf32_Addr	vaddr;	/* Virtual address in memory image. */
+	Elf32_Addr	paddr;	/* Physical address (not used). */
+	Elf32_Word	filesz;	/* Size of contents in file. */
+	Elf32_Word	memsz;	/* Size of contents in memory. */
+	Elf32_Word	flags;	/* Access permission flags. */
+	Elf32_Word	align;	/* Alignment in memory and file. */
+} Elf32_Phdr;
+
+/*
+ * Dynamic structure.  The ".dynamic" section contains an array of them.
+ */
+
+typedef struct {
+	Elf32_Sword	d_tag;		/* Entry type. */
+	union {
+		Elf32_Word	d_val;	/* Integer value. */
+		Elf32_Addr	d_ptr;	/* Address value. */
+	} d_un;
+} Elf32_Dyn;
+
+/*
+ * Relocation entries.
+ */
+
+/* Relocations that don't need an addend field. */
+typedef struct {
+	Elf32_Addr	off;	/* Location to be relocated. */
+	Elf32_Word	info;		/* Relocation type and symbol index. */
+} Elf32_Rel;
+
+/* Relocations that need an addend field. */
+typedef struct {
+	Elf32_Addr	off;	/* Location to be relocated. */
+	Elf32_Word	info;		/* Relocation type and symbol index. */
+	Elf32_Sword	addend;	/* Addend. */
+} Elf32_Rela;
+
+/* Macros for accessing the fields of r_info. */
+#define ELF32_R_SYM(info)	((info) >> 8)
+#define ELF32_R_TYPE(info)	((unsigned char)(info))
+
+/* Macro for constructing r_info from field values. */
+#define ELF32_R_INFO(sym, type)	(((sym) << 8) + (unsigned char)(type))
+
+/*
+ * Relocation types.
+ */
+
+#define	R_X86_64_NONE	0	/* No relocation. */
+#define	R_X86_64_64	1	/* Add 64 bit symbol value. */
+#define	R_X86_64_PC32	2	/* PC-relative 32 bit signed sym value. */
+#define	R_X86_64_GOT32	3	/* PC-relative 32 bit GOT offset. */
+#define	R_X86_64_PLT32	4	/* PC-relative 32 bit PLT offset. */
+#define	R_X86_64_COPY	5	/* Copy data from shared object. */
+#define	R_X86_64_GLOB_DAT 6	/* Set GOT entry to data address. */
+#define	R_X86_64_JMP_SLOT 7	/* Set GOT entry to code address. */
+#define	R_X86_64_RELATIVE 8	/* Add load address of shared object. */
+#define	R_X86_64_GOTPCREL 9	/* Add 32 bit signed pcrel offset to GOT. */
+#define	R_X86_64_32	10	/* Add 32 bit zero extended symbol value */
+#define	R_X86_64_32S	11	/* Add 32 bit sign extended symbol value */
+#define	R_X86_64_16	12	/* Add 16 bit zero extended symbol value */
+#define	R_X86_64_PC16	13	/* Add 16 bit signed extended pc relative symbol value */
+#define	R_X86_64_8	14	/* Add 8 bit zero extended symbol value */
+#define	R_X86_64_PC8	15	/* Add 8 bit signed extended pc relative symbol value */
+#define	R_X86_64_DTPMOD64 16	/* ID of module containing symbol */
+#define	R_X86_64_DTPOFF64 17	/* Offset in TLS block */
+#define	R_X86_64_TPOFF64 18	/* Offset in static TLS block */
+#define	R_X86_64_TLSGD	19	/* PC relative offset to GD GOT entry */
+#define	R_X86_64_TLSLD	20	/* PC relative offset to LD GOT entry */
+#define	R_X86_64_DTPOFF32 21	/* Offset in TLS block */
+#define	R_X86_64_GOTTPOFF 22	/* PC relative offset to IE GOT entry */
+#define	R_X86_64_TPOFF32 23	/* Offset in static TLS block */
+
+#define	R_X86_64_COUNT	24	/* Count of defined relocation types. */
+
+
+#define	R_ALPHA_NONE		0	/* No reloc */
+#define	R_ALPHA_REFLONG		1	/* Direct 32 bit */
+#define	R_ALPHA_REFQUAD		2	/* Direct 64 bit */
+#define	R_ALPHA_GPREL32		3	/* GP relative 32 bit */
+#define	R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
+#define	R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
+#define	R_ALPHA_GPDISP		6	/* Add displacement to GP */
+#define	R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
+#define	R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
+#define	R_ALPHA_SREL16		9	/* PC relative 16 bit */
+#define	R_ALPHA_SREL32		10	/* PC relative 32 bit */
+#define	R_ALPHA_SREL64		11	/* PC relative 64 bit */
+#define	R_ALPHA_OP_PUSH		12	/* OP stack push */
+#define	R_ALPHA_OP_STORE	13	/* OP stack pop and store */
+#define	R_ALPHA_OP_PSUB		14	/* OP stack subtract */
+#define	R_ALPHA_OP_PRSHIFT	15	/* OP stack right shift */
+#define	R_ALPHA_GPVALUE		16
+#define	R_ALPHA_GPRELHIGH	17
+#define	R_ALPHA_GPRELLOW	18
+#define	R_ALPHA_IMMED_GP_16	19
+#define	R_ALPHA_IMMED_GP_HI32	20
+#define	R_ALPHA_IMMED_SCN_HI32	21
+#define	R_ALPHA_IMMED_BR_HI32	22
+#define	R_ALPHA_IMMED_LO32	23
+#define	R_ALPHA_COPY		24	/* Copy symbol at runtime */
+#define	R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
+#define	R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
+#define	R_ALPHA_RELATIVE	27	/* Adjust by program base */
+
+#define	R_ALPHA_COUNT		28
+
+
+#define	R_ARM_NONE		0	/* No relocation. */
+#define	R_ARM_PC24		1
+#define	R_ARM_ABS32		2
+#define	R_ARM_REL32		3
+#define	R_ARM_PC13		4
+#define	R_ARM_ABS16		5
+#define	R_ARM_ABS12		6
+#define	R_ARM_THM_ABS5		7
+#define	R_ARM_ABS8		8
+#define	R_ARM_SBREL32		9
+#define	R_ARM_THM_PC22		10
+#define	R_ARM_THM_PC8		11
+#define	R_ARM_AMP_VCALL9	12
+#define	R_ARM_SWI24		13
+#define	R_ARM_THM_SWI8		14
+#define	R_ARM_XPC25		15
+#define	R_ARM_THM_XPC22		16
+#define	R_ARM_COPY		20	/* Copy data from shared object. */
+#define	R_ARM_GLOB_DAT		21	/* Set GOT entry to data address. */
+#define	R_ARM_JUMP_SLOT		22	/* Set GOT entry to code address. */
+#define	R_ARM_RELATIVE		23	/* Add load address of shared object. */
+#define	R_ARM_GOTOFF		24	/* Add GOT-relative symbol address. */
+#define	R_ARM_GOTPC		25	/* Add PC-relative GOT table address. */
+#define	R_ARM_GOT32		26	/* Add PC-relative GOT offset. */
+#define	R_ARM_PLT32		27	/* Add PC-relative PLT offset. */
+#define	R_ARM_CALL		28
+#define	R_ARM_JUMP24	29
+#define	R_ARM_V4BX		40
+#define	R_ARM_GOT_PREL		96
+#define	R_ARM_GNU_VTENTRY	100
+#define	R_ARM_GNU_VTINHERIT	101
+#define	R_ARM_TLS_IE32		107
+#define	R_ARM_TLS_LE32		108
+#define	R_ARM_RSBREL32		250
+#define	R_ARM_THM_RPC22		251
+#define	R_ARM_RREL32		252
+#define	R_ARM_RABS32		253
+#define	R_ARM_RPC24		254
+#define	R_ARM_RBASE		255
+
+#define	R_ARM_COUNT		38	/* Count of defined relocation types. */
+
+
+#define	R_386_NONE	0	/* No relocation. */
+#define	R_386_32	1	/* Add symbol value. */
+#define	R_386_PC32	2	/* Add PC-relative symbol value. */
+#define	R_386_GOT32	3	/* Add PC-relative GOT offset. */
+#define	R_386_PLT32	4	/* Add PC-relative PLT offset. */
+#define	R_386_COPY	5	/* Copy data from shared object. */
+#define	R_386_GLOB_DAT	6	/* Set GOT entry to data address. */
+#define	R_386_JMP_SLOT	7	/* Set GOT entry to code address. */
+#define	R_386_RELATIVE	8	/* Add load address of shared object. */
+#define	R_386_GOTOFF	9	/* Add GOT-relative symbol address. */
+#define	R_386_GOTPC	10	/* Add PC-relative GOT table address. */
+#define	R_386_TLS_TPOFF	14	/* Negative offset in static TLS block */
+#define	R_386_TLS_IE	15	/* Absolute address of GOT for -ve static TLS */
+#define	R_386_TLS_GOTIE	16	/* GOT entry for negative static TLS block */
+#define	R_386_TLS_LE	17	/* Negative offset relative to static TLS */
+#define	R_386_TLS_GD	18	/* 32 bit offset to GOT (index,off) pair */
+#define	R_386_TLS_LDM	19	/* 32 bit offset to GOT (index,zero) pair */
+#define	R_386_TLS_GD_32	24	/* 32 bit offset to GOT (index,off) pair */
+#define	R_386_TLS_GD_PUSH 25	/* pushl instruction for Sun ABI GD sequence */
+#define	R_386_TLS_GD_CALL 26	/* call instruction for Sun ABI GD sequence */
+#define	R_386_TLS_GD_POP 27	/* popl instruction for Sun ABI GD sequence */
+#define	R_386_TLS_LDM_32 28	/* 32 bit offset to GOT (index,zero) pair */
+#define	R_386_TLS_LDM_PUSH 29	/* pushl instruction for Sun ABI LD sequence */
+#define	R_386_TLS_LDM_CALL 30	/* call instruction for Sun ABI LD sequence */
+#define	R_386_TLS_LDM_POP 31	/* popl instruction for Sun ABI LD sequence */
+#define	R_386_TLS_LDO_32 32	/* 32 bit offset from start of TLS block */
+#define	R_386_TLS_IE_32	33	/* 32 bit offset to GOT static TLS offset entry */
+#define	R_386_TLS_LE_32	34	/* 32 bit offset within static TLS block */
+#define	R_386_TLS_DTPMOD32 35	/* GOT entry containing TLS index */
+#define	R_386_TLS_DTPOFF32 36	/* GOT entry containing TLS offset */
+#define	R_386_TLS_TPOFF32 37	/* GOT entry of -ve static TLS offset */
+
+#define	R_386_COUNT	38	/* Count of defined relocation types. */
+
+#define	R_PPC_NONE		0	/* No relocation. */
+#define	R_PPC_ADDR32		1
+#define	R_PPC_ADDR24		2
+#define	R_PPC_ADDR16		3
+#define	R_PPC_ADDR16_LO		4
+#define	R_PPC_ADDR16_HI		5
+#define	R_PPC_ADDR16_HA		6
+#define	R_PPC_ADDR14		7
+#define	R_PPC_ADDR14_BRTAKEN	8
+#define	R_PPC_ADDR14_BRNTAKEN	9
+#define	R_PPC_REL24		10
+#define	R_PPC_REL14		11
+#define	R_PPC_REL14_BRTAKEN	12
+#define	R_PPC_REL14_BRNTAKEN	13
+#define	R_PPC_GOT16		14
+#define	R_PPC_GOT16_LO		15
+#define	R_PPC_GOT16_HI		16
+#define	R_PPC_GOT16_HA		17
+#define	R_PPC_PLTREL24		18
+#define	R_PPC_COPY		19
+#define	R_PPC_GLOB_DAT		20
+#define	R_PPC_JMP_SLOT		21
+#define	R_PPC_RELATIVE		22
+#define	R_PPC_LOCAL24PC		23
+#define	R_PPC_UADDR32		24
+#define	R_PPC_UADDR16		25
+#define	R_PPC_REL32		26
+#define	R_PPC_PLT32		27
+#define	R_PPC_PLTREL32		28
+#define	R_PPC_PLT16_LO		29
+#define	R_PPC_PLT16_HI		30
+#define	R_PPC_PLT16_HA		31
+#define	R_PPC_SDAREL16		32
+#define	R_PPC_SECTOFF		33
+#define	R_PPC_SECTOFF_LO	34
+#define	R_PPC_SECTOFF_HI	35
+#define	R_PPC_SECTOFF_HA	36
+
+#define	R_PPC_COUNT		37	/* Count of defined relocation types. */
+
+#define R_PPC_TLS		67
+#define R_PPC_DTPMOD32		68
+#define R_PPC_TPREL16		69
+#define R_PPC_TPREL16_LO	70
+#define R_PPC_TPREL16_HI	71
+#define R_PPC_TPREL16_HA	72
+#define R_PPC_TPREL32		73
+#define R_PPC_DTPREL16		74
+#define R_PPC_DTPREL16_LO	75
+#define R_PPC_DTPREL16_HI	76
+#define R_PPC_DTPREL16_HA	77
+#define R_PPC_DTPREL32		78
+#define R_PPC_GOT_TLSGD16	79
+#define R_PPC_GOT_TLSGD16_LO	80
+#define R_PPC_GOT_TLSGD16_HI	81
+#define R_PPC_GOT_TLSGD16_HA	82
+#define R_PPC_GOT_TLSLD16	83
+#define R_PPC_GOT_TLSLD16_LO	84
+#define R_PPC_GOT_TLSLD16_HI	85
+#define R_PPC_GOT_TLSLD16_HA	86
+#define R_PPC_GOT_TPREL16	87
+#define R_PPC_GOT_TPREL16_LO	88
+#define R_PPC_GOT_TPREL16_HI	89
+#define R_PPC_GOT_TPREL16_HA	90
+
+#define	R_PPC_EMB_NADDR32	101
+#define	R_PPC_EMB_NADDR16	102
+#define	R_PPC_EMB_NADDR16_LO	103
+#define	R_PPC_EMB_NADDR16_HI	104
+#define	R_PPC_EMB_NADDR16_HA	105
+#define	R_PPC_EMB_SDAI16	106
+#define	R_PPC_EMB_SDA2I16	107
+#define	R_PPC_EMB_SDA2REL	108
+#define	R_PPC_EMB_SDA21		109
+#define	R_PPC_EMB_MRKREF	110
+#define	R_PPC_EMB_RELSEC16	111
+#define	R_PPC_EMB_RELST_LO	112
+#define	R_PPC_EMB_RELST_HI	113
+#define	R_PPC_EMB_RELST_HA	114
+#define	R_PPC_EMB_BIT_FLD	115
+#define	R_PPC_EMB_RELSDA	116
+
+					/* Count of defined relocation types. */
+#define	R_PPC_EMB_COUNT		(R_PPC_EMB_RELSDA - R_PPC_EMB_NADDR32 + 1)
+
+
+#define R_SPARC_NONE		0
+#define R_SPARC_8		1
+#define R_SPARC_16		2
+#define R_SPARC_32		3
+#define R_SPARC_DISP8		4
+#define R_SPARC_DISP16		5
+#define R_SPARC_DISP32		6
+#define R_SPARC_WDISP30		7
+#define R_SPARC_WDISP22		8
+#define R_SPARC_HI22		9
+#define R_SPARC_22		10
+#define R_SPARC_13		11
+#define R_SPARC_LO10		12
+#define R_SPARC_GOT10		13
+#define R_SPARC_GOT13		14
+#define R_SPARC_GOT22		15
+#define R_SPARC_PC10		16
+#define R_SPARC_PC22		17
+#define R_SPARC_WPLT30		18
+#define R_SPARC_COPY		19
+#define R_SPARC_GLOB_DAT	20
+#define R_SPARC_JMP_SLOT	21
+#define R_SPARC_RELATIVE	22
+#define R_SPARC_UA32		23
+#define R_SPARC_PLT32		24
+#define R_SPARC_HIPLT22		25
+#define R_SPARC_LOPLT10		26
+#define R_SPARC_PCPLT32		27
+#define R_SPARC_PCPLT22		28
+#define R_SPARC_PCPLT10		29
+#define R_SPARC_10		30
+#define R_SPARC_11		31
+#define R_SPARC_64		32
+#define R_SPARC_OLO10		33
+#define R_SPARC_HH22		34
+#define R_SPARC_HM10		35
+#define R_SPARC_LM22		36
+#define R_SPARC_PC_HH22		37
+#define R_SPARC_PC_HM10		38
+#define R_SPARC_PC_LM22		39
+#define R_SPARC_WDISP16		40
+#define R_SPARC_WDISP19		41
+#define R_SPARC_GLOB_JMP	42
+#define R_SPARC_7		43
+#define R_SPARC_5		44
+#define R_SPARC_6		45
+#define	R_SPARC_DISP64		46
+#define	R_SPARC_PLT64		47
+#define	R_SPARC_HIX22		48
+#define	R_SPARC_LOX10		49
+#define	R_SPARC_H44		50
+#define	R_SPARC_M44		51
+#define	R_SPARC_L44		52
+#define	R_SPARC_REGISTER	53
+#define	R_SPARC_UA64		54
+#define	R_SPARC_UA16		55
+
+
+/*
+ * Magic number for the elf trampoline, chosen wisely to be an immediate
+ * value.
+ */
+#define ARM_MAGIC_TRAMP_NUMBER	0x5c000003
+
+
+/*
+ * Symbol table entries.
+ */
+
+typedef struct {
+	Elf32_Word	name;	/* String table index of name. */
+	Elf32_Addr	value;	/* Symbol value. */
+	Elf32_Word	size;	/* Size of associated object. */
+	unsigned char	info;	/* Type and binding information. */
+	unsigned char	other;	/* Reserved (not used). */
+	Elf32_Half	shndx;	/* Section index of symbol. */
+} Elf32_Sym;
+
+/* Macros for accessing the fields of st_info. */
+#define ELF32_ST_BIND(info)		((info) >> 4)
+#define ELF32_ST_TYPE(info)		((info) & 0xf)
+
+/* Macro for constructing st_info from field values. */
+#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
+
+/* Macro for accessing the fields of st_other. */
+#define ELF32_ST_VISIBILITY(oth)	((oth) & 0x3)
+
+/*
+ * ELF definitions common to all 64-bit architectures.
+ */
+
+typedef uint64	Elf64_Addr;
+typedef uint16	Elf64_Half;
+typedef uint64	Elf64_Off;
+typedef int32		Elf64_Sword;
+typedef int64		Elf64_Sxword;
+typedef uint32	Elf64_Word;
+typedef uint64	Elf64_Xword;
+
+/*
+ * Types of dynamic symbol hash table bucket and chain elements.
+ *
+ * This is inconsistent among 64 bit architectures, so a machine dependent
+ * typedef is required.
+ */
+
+#ifdef __alpha__
+typedef Elf64_Off	Elf64_Hashelt;
+#else
+typedef Elf64_Word	Elf64_Hashelt;
+#endif
+
+/* Non-standard class-dependent datatype used for abstraction. */
+typedef Elf64_Xword	Elf64_Size;
+typedef Elf64_Sxword	Elf64_Ssize;
+
+/*
+ * ELF header.
+ */
+
+typedef struct {
+	unsigned char	ident[EI_NIDENT];	/* File identification. */
+	Elf64_Half	type;		/* File type. */
+	Elf64_Half	machine;	/* Machine architecture. */
+	Elf64_Word	version;	/* ELF format version. */
+	Elf64_Addr	entry;	/* Entry point. */
+	Elf64_Off	phoff;	/* Program header file offset. */
+	Elf64_Off	shoff;	/* Section header file offset. */
+	Elf64_Word	flags;	/* Architecture-specific flags. */
+	Elf64_Half	ehsize;	/* Size of ELF header in bytes. */
+	Elf64_Half	phentsize;	/* Size of program header entry. */
+	Elf64_Half	phnum;	/* Number of program header entries. */
+	Elf64_Half	shentsize;	/* Size of section header entry. */
+	Elf64_Half	shnum;	/* Number of section header entries. */
+	Elf64_Half	shstrndx;	/* Section name strings section. */
+} Elf64_Ehdr;
+
+/*
+ * Section header.
+ */
+
+typedef struct Elf64_Shdr Elf64_Shdr;
+struct Elf64_Shdr {
+	Elf64_Word	name;	/* Section name (index into the
+					   section header string table). */
+	Elf64_Word	type;	/* Section type. */
+	Elf64_Xword	flags;	/* Section flags. */
+	Elf64_Addr	addr;	/* Address in memory image. */
+	Elf64_Off	off;	/* Offset in file. */
+	Elf64_Xword	size;	/* Size in bytes. */
+	Elf64_Word	link;	/* Index of a related section. */
+	Elf64_Word	info;	/* Depends on section type. */
+	Elf64_Xword	addralign;	/* Alignment in bytes. */
+	Elf64_Xword	entsize;	/* Size of each entry in section. */
+};
+
+/*
+ * Program header.
+ */
+
+typedef struct {
+	Elf64_Word	type;		/* Entry type. */
+	Elf64_Word	flags;	/* Access permission flags. */
+	Elf64_Off	off;	/* File offset of contents. */
+	Elf64_Addr	vaddr;	/* Virtual address in memory image. */
+	Elf64_Addr	paddr;	/* Physical address (not used). */
+	Elf64_Xword	filesz;	/* Size of contents in file. */
+	Elf64_Xword	memsz;	/* Size of contents in memory. */
+	Elf64_Xword	align;	/* Alignment in memory and file. */
+} Elf64_Phdr;
+
+/*
+ * Dynamic structure.  The ".dynamic" section contains an array of them.
+ */
+
+typedef struct {
+	Elf64_Sxword	d_tag;		/* Entry type. */
+	union {
+		Elf64_Xword	d_val;	/* Integer value. */
+		Elf64_Addr	d_ptr;	/* Address value. */
+	} d_un;
+} Elf64_Dyn;
+
+/*
+ * Relocation entries.
+ */
+
+/* Relocations that don't need an addend field. */
+typedef struct {
+	Elf64_Addr	off;	/* Location to be relocated. */
+	Elf64_Xword	info;		/* Relocation type and symbol index. */
+} Elf64_Rel;
+
+/* Relocations that need an addend field. */
+typedef struct {
+	Elf64_Addr	off;	/* Location to be relocated. */
+	Elf64_Xword	info;		/* Relocation type and symbol index. */
+	Elf64_Sxword	addend;	/* Addend. */
+} Elf64_Rela;
+
+/* Macros for accessing the fields of r_info. */
+#define ELF64_R_SYM(info)	((info) >> 32)
+#define ELF64_R_TYPE(info)	((info) & 0xffffffffL)
+
+/* Macro for constructing r_info from field values. */
+#define ELF64_R_INFO(sym, type)	((((uint64)(sym)) << 32) + (((uint64)(type)) & 0xffffffffULL))
+
+/*
+ * Symbol table entries.
+ */
+
+typedef struct {
+	Elf64_Word	name;	/* String table index of name. */
+	unsigned char	info;	/* Type and binding information. */
+	unsigned char	other;	/* Reserved (not used). */
+	Elf64_Half	shndx;	/* Section index of symbol. */
+	Elf64_Addr	value;	/* Symbol value. */
+	Elf64_Xword	size;	/* Size of associated object. */
+} Elf64_Sym;
+
+/* Macros for accessing the fields of st_info. */
+#define ELF64_ST_BIND(info)		((info) >> 4)
+#define ELF64_ST_TYPE(info)		((info) & 0xf)
+
+/* Macro for constructing st_info from field values. */
+#define ELF64_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
+
+/* Macro for accessing the fields of st_other. */
+#define ELF64_ST_VISIBILITY(oth)	((oth) & 0x3)
+
+/*
+ * Go linker interface
+ */
+
+#define	ELF64HDRSIZE	64
+#define	ELF64PHDRSIZE	56
+#define	ELF64SHDRSIZE	64
+#define	ELF64RELSIZE	16
+#define	ELF64RELASIZE	24
+#define	ELF64SYMSIZE	sizeof(Elf64_Sym)
+
+#define	ELF32HDRSIZE	sizeof(Elf32_Ehdr)
+#define	ELF32PHDRSIZE	sizeof(Elf32_Phdr)
+#define	ELF32SHDRSIZE	sizeof(Elf32_Shdr)
+#define	ELF32SYMSIZE	sizeof(Elf32_Sym)
+#define	ELF32RELSIZE	8
+
+#endif /* __ELF_H__ */
diff --git a/tools/rimage/src/include/rimage/elf_file.h b/tools/rimage/src/include/rimage/elf_file.h
new file mode 100644
index 000000000000..13bfe98cf1f7
--- /dev/null
+++ b/tools/rimage/src/include/rimage/elf_file.h
@@ -0,0 +1,178 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2023 Intel Corporation. All rights reserved.
+ * 
+ * Author: Adrian Warecki <adrian.warecki@intel.com>
+ */
+
+#ifndef __ELF_FILE_H__
+#define __ELF_FILE_H__
+
+#include <stddef.h>
+
+#include "elf.h"
+
+struct elf_section_header {
+	Elf32_Shdr data;
+	char *name;
+};
+
+struct elf_section {
+	struct elf_section_header header;
+	void *data;
+};
+
+struct elf_strings {
+	struct elf_section section;
+};
+
+struct elf_file {
+	FILE *file;
+	char *filename;
+	size_t file_size;
+	Elf32_Ehdr header;
+	struct elf_section_header *sections;
+	Elf32_Phdr *programs;
+	uint16_t sections_count;
+	uint16_t programs_count;
+};
+
+/**
+ * Open elf file
+ * 
+ * @param [out]elf elf file structure
+ * @param [in]filename File name to open
+ * @return error code, 0 when success
+ */
+int elf_open(struct elf_file *elf, const char *filename);
+
+/**
+ * Close elf file and release resources
+ * 
+ * @param elf elf file structure
+ */
+void elf_free(struct elf_file *elf);
+
+/**
+ * Print elf file header
+ * 
+ * @param elf elf file structure
+ */
+void elf_header_print(const struct elf_file *elf);
+
+/**
+ * Print program headers
+ * 
+ * @param elf elf file structure
+ */
+void elf_print_programs(const struct elf_file *elf);
+
+/**
+ * Print single program header
+ * 
+ * @param header program header structure
+ */
+void elf_program_header_print(const Elf32_Phdr *header);
+
+/**
+ * Print elf sections headers
+ * 
+ * @param elf elf file structure
+ */
+void elf_print_sections(const struct elf_file *elf);
+
+/**
+ * Return section header by index
+ * 
+ * @param [in]elf elf file structure
+ * @param [in]index section index
+ * @param [out]header section header data
+ * @return error code, 0 when success
+ */
+int elf_section_header_get_by_index(const struct elf_file *elf, int index,
+				    const struct elf_section_header **header);
+
+/**
+ * Return section header by index
+ * 
+ * @param [in]elf elf file structure
+ * @param [in]index section index
+ * @param [out]header section header data
+ * @return error code, 0 when success
+ */
+int elf_section_header_get_by_name(const struct elf_file *elf, const char* name,
+				   const struct elf_section_header **header);
+/**
+ * Print elf section header
+ * 
+ * @param header section header structure
+ */
+void elf_section_header_print(const struct elf_section_header *header);
+
+/**
+ * Read elf section using given header
+ * 
+ * @param [in]elf elf file structure
+ * @param [in]header section header
+ * @param [out]section section data
+ * @return error code, 0 when success
+ */
+int elf_section_read(const struct elf_file *elf, const struct elf_section_header *header,
+		     struct elf_section *section);
+
+/**
+* Read elf section using given header to specified buffer
+* 
+* @param [in]elf elf file structure
+* @param [in]header section header
+* @param [out]buffer buffer for a section data
+* @param [in]size buffer size
+* @return error code, 0 when success
+*/
+int elf_section_read_content(const struct elf_file *elf, const struct elf_section_header *header,
+			     void *buffer, const size_t size);
+
+/**
+ * Read elf section with given name
+ * 
+ * @param [in]elf elf file structure
+ * @param [in]name section name
+ * @param [out]section section data
+ * @return error code, 0 when success
+ */
+int elf_section_read_by_name(const struct elf_file *elf, const char *name, struct elf_section *section);
+
+/**
+ * Release section
+ * 
+ * @param [in]section section structure
+ */
+void elf_section_free(struct elf_section *section);
+
+/**
+ * Read elf strings section with given index
+ * 
+ * @param [in]elf elf file structure
+ * @param [in]index strings section index
+ * @param [out]strings strings section data
+ * @return error code, 0 when success
+ */
+int elf_strings_read_by_index(const struct elf_file *elf, int index, struct elf_strings *strings);
+
+/**
+ * Get string value. Allocate new copy using strdup.
+ * 
+ * @param [in]strings strings section structure
+ * @param [in]index string index
+ * @param [out]str Pointer to the variable in which the pointer to the allocated string will be placed
+ * @return error code, 0 when success
+ */
+int elf_strings_get(const struct elf_strings *strings, int index, char **str);
+
+/**
+ * Release string section
+ * @param [in]strings strings section structure
+ */
+void elf_strings_free(struct elf_strings *strings);
+
+#endif /* __ELF_FILE_H__ */
diff --git a/tools/rimage/src/include/rimage/ext_manifest_gen.h b/tools/rimage/src/include/rimage/ext_manifest_gen.h
new file mode 100644
index 000000000000..7f106834a0ca
--- /dev/null
+++ b/tools/rimage/src/include/rimage/ext_manifest_gen.h
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020 Intel Corporation. All rights reserved.
+ *
+ * Author: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
+ */
+
+/*
+ * Extended manifest is a place to store metadata about firmware, known during
+ * compilation time - for example firmware version or used compiler.
+ * Given information are read on host side before firmware startup.
+ * This part of output binary is not signed.
+ *
+ * To add new content to ext_man, in firmware code define struct which starts
+ * with ext_man_elem_head followed by usage dependent content and place whole
+ * struct in "fw_metadata" section. Moreover kernel code should be modified to
+ * properly read new packet.
+ *
+ * Extended manifest designed to be extensible. In header there is a field which
+ * describe header length, so after appending some data to header then it can be
+ * easily skipped by device with older version of this header.
+ * From other side, unknown ext_man elements should be just skipped by host,
+ * to be backward compatible. Field ext_man_elem_header.elem_size should be
+ * used in such a situation.
+ */
+
+#ifndef __EXT_MAN_H__
+#define __EXT_MAN_H__
+
+#include <rimage/rimage.h>
+
+#define EXT_MAN_DATA_SECTION ".fw_metadata"
+
+int ext_man_write(struct image *image);
+int ext_man_write_cavs_25(struct image *image);
+
+#endif /* __EXT_MAN_H__ */
diff --git a/tools/rimage/src/include/rimage/file_utils.h b/tools/rimage/src/include/rimage/file_utils.h
new file mode 100644
index 000000000000..34ecc89f5bad
--- /dev/null
+++ b/tools/rimage/src/include/rimage/file_utils.h
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2023 Intel Corporation. All rights reserved.
+ */
+
+#ifndef __FILE_UTILS_H__
+#define __FILE_UTILS_H__
+
+#include <stddef.h>
+
+/**
+ * Print file operation error message
+ * @param [in]msg error message
+ * @param [in]filename File name used to display the error message
+ * @param error code
+ */
+int file_error(const char *msg, const char *filename);
+
+/**
+ * Create new file name using output file name as template.
+ * @param [out] new_name char[] destination of new file name
+ * @param [in] name_size new file name buffer capacity
+ * @param [in] template_name File name used as a template for the new name
+ * @param [in] new_ext extension of the new file name
+ * @param error code, 0 when success
+ */
+int create_file_name(char *new_name, const size_t name_size, const char *template_name,
+		     const char *new_ext);
+
+/**
+ * Get file size
+ * @param [in] f file handle
+ * @param [in] filename File name used to display the error message
+ * @param [out] size output for file size
+ * @param error code, 0 when success
+ */
+int get_file_size(FILE *f, const char *filename, size_t *size);
+
+#endif /* __FILE_UTILS_H__ */
diff --git a/tools/rimage/src/include/rimage/hash.h b/tools/rimage/src/include/rimage/hash.h
new file mode 100644
index 000000000000..47a00101af4f
--- /dev/null
+++ b/tools/rimage/src/include/rimage/hash.h
@@ -0,0 +1,111 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2023 Intel Corporation. All rights reserved.
+ */
+
+#ifndef __HASH_H__
+#define __HASH_H__
+
+#include <openssl/conf.h>
+#include <openssl/evp.h>
+#include <openssl/err.h>
+
+#include <stdint.h>
+
+/* Hash context state used to detect invalid use of hash functions */
+enum hash_state { HS_INIT, HS_UPDATE, HS_DONE, HS_ERROR };
+
+struct hash_context {
+	enum hash_state state;
+	EVP_MD_CTX *context;
+	const EVP_MD *algo;
+	uint8_t digest[EVP_MAX_MD_SIZE];
+	unsigned int digest_length;
+	int error;
+};
+
+/**
+ * Initialize hash context with given algorithm
+ * @param [out]context structure storing the hash context
+ * @param [in]algo hash algorithm
+ * @return error code, 0 when success
+ */
+int hash_init(struct hash_context *context, const EVP_MD *algo);
+
+/**
+ * Initialize sha256 hash context
+ * @param [out]context structure storing the hash context
+ * @return error code, 0 when success
+ */
+int hash_sha256_init(struct hash_context *context);
+
+/**
+ * Initialize sha384 hash context
+ * @param [out]context structure storing the hash context
+ * @return error code, 0 when success
+ */
+int hash_sha384_init(struct hash_context *context);
+
+/**
+ * Add data to hash
+ * @param [in]context structure storing the hash context
+ * @param [in]data data to be added
+ * @param [in]size length of data in bytes
+ * @return error code, 0 when success
+ */
+int hash_update(struct hash_context *context, const void *data, size_t size);
+
+/**
+ * Completes the hash calculation. No more data can be added!
+ * @param [in]context structure storing the hash context
+ * @return error code, 0 when success
+ */
+int hash_finalize(struct hash_context *context);
+
+/**
+ * Read out computed digest. Must finalize first.
+ * @param [in]context structure storing the hash context
+ * @param [out]output pointer to array where place hash value
+ * @param [in]output_len size of the output buffer
+ * @return copied digest length, < 0 if error
+ */
+int hash_get_digest(struct hash_context *context, void *output, size_t output_len);
+
+/**
+ * Print digest value
+ * @param [in]context structure storing the hash context
+ */
+void hash_print(struct hash_context *context);
+
+/**
+ * Calculates hash of a single memory buffer
+ * @param [in]data pointer to the data to be processed
+ * @param [in]size length of the data to be processed
+ * @param [in]algo hash algorithm
+ * @param [out]output pointer to array where place hash value
+ * @param [in]output_len size of the output buffer
+ * @return error code, 0 when success
+ */
+int hash_single(const void* data, size_t size, const EVP_MD *algo, void *output, size_t output_len);
+
+/**
+ * Calculates sha256 hash of a memory buffer
+ * @param [in]data pointer to the data to be processed
+ * @param [in]size length of the data to be processed
+ * @param [out]output pointer to array where place hash value
+ * @param [in]output_len size of the output buffer
+ * @return error code, 0 when success
+ */
+int hash_sha256(const void* data, size_t size, void *output, size_t output_len);
+
+/**
+ * Calculates sha384 hash of a memory buffer
+ * @param [in]data pointer to the data to be processed
+ * @param [in]size length of the data to be processed
+ * @param [out]output pointer to array where place hash value
+ * @param [in]output_len size of the output buffer
+ * @return error code, 0 when success
+ */
+int hash_sha384(const void* data, size_t size, void *output, size_t output_len);
+
+#endif /* __HASH_H__ */
diff --git a/tools/rimage/src/include/rimage/manifest.h b/tools/rimage/src/include/rimage/manifest.h
new file mode 100644
index 000000000000..840cd7d797bf
--- /dev/null
+++ b/tools/rimage/src/include/rimage/manifest.h
@@ -0,0 +1,239 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2017 Intel Corporation. All rights reserved.
+ */
+
+#ifndef __MANIFEST_H__
+#define __MANIFEST_H__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <rimage/sof/user/manifest.h>
+#include <rimage/css.h>
+#include <rimage/cse.h>
+#include <rimage/plat_auth.h>
+#include <rimage/module.h>
+
+/*
+ * Manifest module data
+ */
+struct manifest_module {
+	struct module file;
+
+	/* Following fields are used in manifest creation process */
+	bool is_bootloader;
+
+	/* Size of the module in the output image.
+	 * Includes text and data sections size + image headers*/
+	size_t output_size;
+
+	/* executable header module */
+	int exec_header;
+
+	/* module offset in image file */
+	size_t foffset;
+
+	size_t text_fixup_size;
+};
+
+#define MAN_PAGE_SIZE		4096
+
+/* start offset for modules built using xcc */
+#define DEFAULT_XCC_MOD_OFFSET		0x8
+
+/* start offset for base FW module */
+#define FILE_TEXT_OFFSET_V1_8		0x8000
+#define FILE_TEXT_OFFSET_V1_5		0x2000
+#define FILE_TEXT_OFFSET_V1_5_SUE	0xA000
+
+/*
+ * CSE values for CNL
+ */
+#define MAN_CSE_PARTS			3
+
+
+#define MAN_CSE_HDR_OFFSET		0
+#define MAN_CSE_PADDING_SIZE		0x30
+#define MAN_EXT_PADDING			0x20
+#define MAN_DESC_OFFSET_V1_8			0x2000
+#define MAN_DESC_OFFSET_V1_5			0x284
+#define MAN_DESC_OFFSET_V1_5_SUE		0x2000
+#define MAN_DEFAULT_IMR_TYPE		3
+
+#define MAN_CSS_HDR_OFFSET \
+	(MAN_CSE_HDR_OFFSET + \
+	sizeof(struct CsePartitionDirHeader) + \
+	MAN_CSE_PARTS * sizeof(struct CsePartitionDirEntry))
+
+#define MAN_CSS_HDR_OFFSET_2_5 \
+	(MAN_CSE_HDR_OFFSET + \
+	sizeof(struct CsePartitionDirHeader_v2_5) + \
+	MAN_CSE_PARTS * sizeof(struct CsePartitionDirEntry))
+
+#define MAN_FW_DESC_OFFSET_ACE_V1_5 \
+	(MAN_META_EXT_OFFSET_ACE_V1_5 + \
+	sizeof(struct sof_man_adsp_meta_file_ext_v2_5) + \
+	MAN_EXT_PADDING)
+
+#define MAN_FW_DESC_OFFSET_V2_5 \
+	(MAN_META_EXT_OFFSET_V2_5 + \
+	sizeof(struct sof_man_adsp_meta_file_ext_v2_5) + \
+	MAN_EXT_PADDING)
+
+#define MAN_DESC_PADDING_SIZE_ACE_V1_5	\
+	(MAN_DESC_OFFSET_V1_8 - MAN_FW_DESC_OFFSET_ACE_V1_5)
+
+#define MAN_DESC_PADDING_SIZE_V2_5	\
+	(MAN_DESC_OFFSET_V1_8 - MAN_FW_DESC_OFFSET_V2_5)
+
+#define MAN_SIG_PKG_OFFSET_V1_8 \
+	(MAN_CSS_HDR_OFFSET + \
+	sizeof(struct css_header_v1_8))
+
+#define MAN_SIG_PKG_OFFSET_V2_5 \
+	(MAN_CSS_HDR_OFFSET_2_5 + \
+	sizeof(struct css_header_v2_5))
+
+#define MAN_PART_INFO_OFFSET_V1_8 \
+	(MAN_SIG_PKG_OFFSET_V1_8 + \
+	sizeof(struct signed_pkg_info_ext))
+
+#define MAN_PART_INFO_OFFSET_ACE_V1_5 \
+	(MAN_SIG_PKG_OFFSET_V2_5 + \
+	sizeof(struct signed_pkg_info_ext_ace_v1_5))
+
+#define MAN_PART_INFO_OFFSET_V2_5 \
+	(MAN_SIG_PKG_OFFSET_V2_5 + \
+	sizeof(struct signed_pkg_info_ext_v2_5))
+
+#define MAN_META_EXT_OFFSET_V1_8 \
+	(MAN_SIG_PKG_OFFSET_V1_8 + \
+	sizeof(struct signed_pkg_info_ext) + \
+	sizeof(struct partition_info_ext) + \
+	MAN_CSE_PADDING_SIZE)
+
+#define MAN_META_EXT_OFFSET_ACE_V1_5 \
+	(MAN_SIG_PKG_OFFSET_V2_5 + \
+	sizeof(struct signed_pkg_info_ext_ace_v1_5) + \
+	sizeof(struct info_ext_0x16) + \
+	0)
+
+#define MAN_META_EXT_OFFSET_V2_5 \
+	(MAN_SIG_PKG_OFFSET_V2_5 + \
+	sizeof(struct signed_pkg_info_ext_v2_5) + \
+	sizeof(struct info_ext_0x16) + \
+	0)
+
+#define MAN_FW_DESC_OFFSET_V1_8 \
+	(MAN_META_EXT_OFFSET_V1_8 + \
+	sizeof(struct sof_man_adsp_meta_file_ext_v1_8) + \
+	MAN_EXT_PADDING)
+
+#define MAN_DESC_PADDING_SIZE_V1_8	\
+	(MAN_DESC_OFFSET_V1_8 - MAN_FW_DESC_OFFSET_V1_8)
+
+#define MAN_SIG_PKG_OFFSET_V1_5 \
+	(MAN_CSS_HDR_OFFSET + \
+	sizeof(struct css_header_v1_5))
+
+#define MAN_META_EXT_OFFSET_V1_5 \
+	(MAN_SIG_PKG_OFFSET_V1_5 + \
+	sizeof(struct signed_pkg_info_ext) + \
+	sizeof(struct partition_info_ext) + \
+	MAN_CSE_PADDING_SIZE)
+
+#define MAN_FW_DESC_OFFSET_V1_5 \
+	(MAN_META_EXT_OFFSET_V1_5 + \
+	sizeof(struct sof_man_adsp_meta_file_ext_v1_8) + \
+	MAN_EXT_PADDING)
+
+/*
+ * Firmware manifest header ACE V1_5 used on MTL onwards
+ */
+struct fw_image_manifest_ace_v1_5 {
+	/* MEU tool needs these sections to be 0s */
+	struct CsePartitionDirHeader_v2_5 cse_partition_dir_header;
+	struct CsePartitionDirEntry cse_partition_dir_entry[MAN_CSE_PARTS];
+	struct css_header_v2_5 css;
+	struct signed_pkg_info_ext_ace_v1_5 signed_pkg;
+	struct info_ext_0x16 info_0x16;
+
+	struct sof_man_adsp_meta_file_ext_v2_5 adsp_file_ext;
+
+	/* reserved / pading at end of ext data - all 0s*/
+	uint8_t reserved[MAN_EXT_PADDING];
+
+	/* start of the unsigned binary for MEU input must start at MAN_DESC_OFFSET */
+	uint8_t padding[MAN_DESC_PADDING_SIZE_ACE_V1_5];
+
+	struct sof_man_fw_desc desc;	/* at offset MAN_DESC_OFFSET */
+} __attribute__((packed));
+
+/*
+ * Firmware manifest header V2.5 used on TGL onwards
+ */
+struct fw_image_manifest_v2_5 {
+	/* MEU tool needs these sections to be 0s */
+	struct CsePartitionDirHeader_v2_5 cse_partition_dir_header;
+	struct CsePartitionDirEntry cse_partition_dir_entry[MAN_CSE_PARTS];
+	struct css_header_v2_5 css;
+	struct signed_pkg_info_ext_v2_5 signed_pkg;
+	struct info_ext_0x16 info_0x16;
+
+	struct sof_man_adsp_meta_file_ext_v2_5 adsp_file_ext;
+
+	/* reserved / pading at end of ext data - all 0s*/
+	uint8_t reserved[MAN_EXT_PADDING];
+
+	/* start of the unsigned binary for MEU input must start at MAN_DESC_OFFSET */
+	uint8_t padding[MAN_DESC_PADDING_SIZE_V2_5];
+
+	struct sof_man_fw_desc desc;	/* at offset MAN_DESC_OFFSET */
+} __attribute__((packed));
+
+/*
+ * Firmware manifest header V1.8 used on APL onwards
+ */
+struct fw_image_manifest_v1_8 {
+	/* MEU tool needs these sections to be 0s */
+	struct CsePartitionDirHeader cse_partition_dir_header;
+	struct CsePartitionDirEntry cse_partition_dir_entry[MAN_CSE_PARTS];
+	struct css_header_v1_8 css;
+	struct signed_pkg_info_ext signed_pkg;
+	struct partition_info_ext partition_info;
+	uint8_t cse_padding[MAN_CSE_PADDING_SIZE];
+	struct sof_man_adsp_meta_file_ext_v1_8 adsp_file_ext;
+
+	/* reserved / pading at end of ext data - all 0s*/
+	uint8_t reserved[MAN_EXT_PADDING];
+
+	/* start of the unsigned binary for MEU input must start at MAN_DESC_OFFSET */
+	uint8_t padding[MAN_DESC_PADDING_SIZE_V1_8];
+
+	struct sof_man_fw_desc desc;	/* at offset MAN_DESC_OFFSET */
+} __attribute__((packed));
+
+/*
+ * Firmware manifest header V1.5 used on SKL and KBL
+ */
+struct fw_image_manifest_v1_5 {
+	struct css_header_v1_5 css_header;
+	struct sof_man_fw_desc desc;
+} __attribute__((packed));
+
+struct fw_image_manifest_v1_5_sue {
+    struct sof_man_fw_desc desc;
+} __attribute__((packed));
+
+struct image;
+int simple_write_firmware(struct image *image);
+int man_write_fw_v1_5(struct image *image);
+int man_write_fw_v1_5_sue(struct image *image);
+int man_write_fw_v1_8(struct image *image);
+int man_write_fw_v2_5(struct image *image);
+int man_write_fw_ace_v1_5(struct image *image);
+int man_write_fw_meu_v1_5(struct image *image);
+int man_write_fw_meu_v1_8(struct image *image);
+int man_write_fw_meu_v2_5(struct image *image);
+
+#endif
diff --git a/tools/rimage/src/include/rimage/misc_utils.h b/tools/rimage/src/include/rimage/misc_utils.h
new file mode 100644
index 000000000000..e3432d57a391
--- /dev/null
+++ b/tools/rimage/src/include/rimage/misc_utils.h
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2023 Intel Corporation. All rights reserved.
+ */
+
+#ifndef __MISC_UTILS_H__
+#define __MISC_UTILS_H__
+
+#include <stdint.h>
+
+#define DIV_ROUND_UP(val, div) (((val) + (div) - 1) / (div))
+
+/**
+ * Reverses the order of bytes in the array
+ * @param ptr pointer to a array
+ * @param size of the array
+ */
+void bytes_swap(uint8_t *ptr, uint32_t size);
+
+struct name_val {
+	const char *name;
+	unsigned long value;
+};
+
+#define NAME_VAL_ENTRY(x) { .name = #x, .value = x }
+#define NAME_VAL_END { .name = 0, .value = 0 }
+
+void print_enum(unsigned long value, const struct name_val *values);
+void print_flags(unsigned long value, const struct name_val *flags);
+
+#endif /* __MISC_UTILS_H__ */
diff --git a/tools/rimage/src/include/rimage/module.h b/tools/rimage/src/include/rimage/module.h
new file mode 100644
index 000000000000..3c265b20823b
--- /dev/null
+++ b/tools/rimage/src/include/rimage/module.h
@@ -0,0 +1,190 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2023 Intel Corporation. All rights reserved.
+ * 
+ * Author: Adrian Warecki <adrian.warecki@intel.com>
+ */
+
+#ifndef __MODULE_H__
+#define __MODULE_H__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+#include <rimage/elf_file.h>
+
+enum module_section_type {
+	MST_UNKNOWN, MST_DATA, MST_TEXT, MST_BSS, MST_NOTE
+};
+
+struct module_section {
+	const struct elf_section_header *header;
+	enum module_section_type type;
+
+	/* The contents of the section lie in the rom memory space */
+	bool rom;
+
+	/* ADSP devices have their RAM regions mapped twice. The first mapping is set in the CPU
+	 * to bypass the L1 cache, and so access through pointers in that region is coherent between
+	 * CPUs (but slow). The second region accesses the same memory through the L1 cache and
+	 * requires careful flushing when used with shared data.
+	 *
+	 * This distinction is exposed in the linker script, where some symbols (e.g. stack regions)
+	 * are linked into cached memory, but others (general kernel memory) are not.
+	 * 
+	 * Addresses of sections belonging to a rom memory are not converted. */
+	 
+	/* section virtual address, converted to cached address space */
+	uint32_t address;
+
+	/* section physical load address, converted to cached address space */
+	uint32_t load_address;
+
+	size_t size;
+
+	/* next section of this type */
+	struct module_section *next_section;
+};
+
+struct module_sections_info {
+	/* start address */
+	uint32_t start;
+
+	/* end address */
+	uint32_t end;
+
+	/* size without any gaps */
+	size_t size;
+
+	/* size include gap to nearest page */
+	size_t file_size;
+
+	/* sections count */
+	unsigned int count;
+
+	/* First section */
+	struct module_section *first_section;
+};
+
+/*
+ * ELF module data
+ */
+struct module {
+	struct elf_file elf;
+
+	/* Array of valid sections */
+	struct module_section *sections;
+
+	/* Number of valid sections */
+	unsigned int num_sections;
+
+	struct module_sections_info text;
+	struct module_sections_info data;
+	struct module_sections_info bss;
+};
+
+struct image;
+struct memory_alias;
+struct memory_config;
+
+/**
+ * Convert uncached memory address to cached
+ * 
+ * @param alias alias memory configration
+ * @param address address to be converted
+ * @return cached address
+ */
+unsigned long uncache_to_cache(const struct memory_alias *alias, unsigned long address);
+
+
+/**
+ * Load module file
+ * 
+ * @param module module structure
+ * @param filename module file name
+ * @param verbose verbose logging selection
+ * @return error code
+ */
+int module_open(struct module *module, const char *filename, const bool verbose);
+
+/**
+ * Unloads module
+ * 
+ * @param module module structure
+ */
+void module_close(struct module *module);
+
+/**
+ * Parse module sections
+ * 
+ * @param module module structure
+ * @param mem_cfg memory configration structure
+ * @param verbose verbose logging selection
+ * @return error code
+ */
+void module_parse_sections(struct module *module, const struct memory_config *mem_cfg,
+			   bool verbose);
+
+/**
+ * Read module section to memory buffer
+ * 
+ * @param [in]module module structure
+ * @param [in]section module section structure
+ * @param [out]buffer destination buffer
+ * @param [in]size destination buffer size
+ * @return error code
+ */
+int module_read_section(const struct module *module, const struct module_section *section,
+			void *buffer, const size_t size);
+
+/**
+ * Read module section and write it to a file
+ * 
+ * @param module module structure
+ * @param section module section structure
+ * @param padding count of padding bytes to write after section content
+ * @param out_file destination file handle
+ * @param filename output file name used to print error message
+ * @return error code
+ */
+int module_write_section(const struct module *module, const struct module_section *section,
+			 const int padding, FILE *out_file, const char *filename);
+
+/**
+ * Read whole module elf file to a memory buffer
+ * 
+ * @param [in]module module structure
+ * @param [out]buffer destination buffer
+ * @param [in]size destination buffer size
+ * @return error code
+ */
+int module_read_whole_elf(const struct module *module, void *buffer, size_t size);
+
+/**
+ * Read whore module elf file and write it to a file
+ * 
+ * @param module module structure
+ * @param out_file destination file handle
+ * @param filename output file name used to print error message
+ * @return error code
+ */
+int module_write_whole_elf(const struct module *module, FILE *out_file, const char *filename);
+
+/**
+ * Displays information about the occupancy of each memory zone
+ * 
+ * @param module module structure
+ */
+void module_print_zones(const struct module *module);
+
+/**
+ * Checks all modules to make sure their sections do not overlap with each other
+ * 
+ * @param module module structure
+ * @param image program global structure
+ * @return error code
+ */
+int modules_validate(const struct image *image);
+
+#endif /* __MODULE_H__ */
diff --git a/tools/rimage/src/include/rimage/plat_auth.h b/tools/rimage/src/include/rimage/plat_auth.h
new file mode 100644
index 000000000000..64cdcd98db5f
--- /dev/null
+++ b/tools/rimage/src/include/rimage/plat_auth.h
@@ -0,0 +1,155 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2017 Intel Corporation. All rights reserved.
+ */
+
+#ifndef __PLAT_AUTH_H__
+#define __PLAT_AUTH_H__
+
+#include <stdint.h>
+
+struct image;
+
+#define PLAT_AUTH_SHA256_LEN		32
+#define PLAT_AUTH_SHA384_LEN		48
+#define PLAT_AUTH_NAME_LEN		12
+#define PLAT_AUTH_PADDING		48	/* pad at end of struct */
+
+#define SIGN_PKG_EXT_TYPE		15
+#define SIGN_PKG_NUM_MODULE		1
+
+#define SIGN_PKG_EXT_TYPE_ACE_V1_5	0x23
+
+struct signed_pkg_info_module {
+	uint8_t name[PLAT_AUTH_NAME_LEN]; /* must be padded with 0 */
+	uint8_t type;
+	uint8_t hash_algo;
+	uint16_t hash_size;
+	uint32_t meta_size;
+	uint8_t hash[PLAT_AUTH_SHA256_LEN];
+} __attribute__((packed));
+
+struct signed_pkg_info_module_v2_5 {
+	uint8_t name[PLAT_AUTH_NAME_LEN]; /* must be padded with 0 */
+	uint8_t type;
+	uint8_t hash_algo;
+	uint16_t hash_size;
+	uint32_t meta_size;
+	uint8_t hash[PLAT_AUTH_SHA384_LEN];
+} __attribute__((packed));
+
+struct signed_pkg_info_ext {
+	uint32_t ext_type;
+	uint32_t ext_len;
+
+	uint8_t name[4];
+	uint32_t vcn;
+	uint8_t bitmap[16];
+	uint32_t svn;
+	uint8_t fw_type;
+	uint8_t fw_sub_type;
+	uint8_t reserved[14];	/* must be 0 */
+
+	/* variable length of modules */
+	struct signed_pkg_info_module module[SIGN_PKG_NUM_MODULE];
+} __attribute__((packed));
+
+struct signed_pkg_info_ext_v2_5 {
+	uint32_t ext_type;
+	uint32_t ext_len;
+
+	uint8_t name[4];
+	uint32_t vcn; /* 0 */
+	uint8_t bitmap[16];
+	uint32_t svn;
+	uint8_t fw_type;
+	uint8_t fw_sub_type;
+	uint8_t reserved[14];	/* must be 0 */
+
+	/* variable length of modules */
+	struct signed_pkg_info_module_v2_5 module[SIGN_PKG_NUM_MODULE];
+} __attribute__((packed));
+
+struct signed_pkg_info_module_ace_v1_5 {
+	uint8_t name[PLAT_AUTH_NAME_LEN]; /* must be padded with 0 */
+	uint8_t type;
+	uint8_t hash_algo;
+	uint8_t reserved[2];
+	uint32_t meta_size;
+	uint8_t hash[PLAT_AUTH_SHA384_LEN];
+} __attribute__((packed));
+
+struct signed_pkg_info_ext_ace_v1_5 {
+	uint32_t ext_type;
+	uint32_t ext_len;
+
+	uint8_t name[4];
+	uint32_t vcn; /* 0 */
+	uint32_t svn;
+	uint8_t partition_usage;
+	uint8_t reserved0;
+	uint8_t fw_type;
+	uint8_t fw_sub_type;
+	uint8_t number_of_modules;
+	uint8_t boot_strap_svn;
+	uint8_t reserved[14];	/* must be 0 */
+
+	/* variable length of modules */
+	struct signed_pkg_info_module_ace_v1_5 module[SIGN_PKG_NUM_MODULE];
+} __attribute__((packed));
+
+#define PART_INFO_EXT_TYPE		3
+#define PART_INFO_NUM_MODULE		1
+
+struct partition_info_module {
+	uint8_t name[PLAT_AUTH_NAME_LEN]; /* must be padded with 0 */
+	uint8_t type;
+	uint8_t reserved[3];
+	uint32_t meta_size;
+	uint8_t hash[PLAT_AUTH_SHA256_LEN];
+}  __attribute__((packed));
+
+struct partition_info_ext {
+	uint32_t ext_type;
+	uint32_t ext_len;
+
+	uint8_t name[4];	/* "ADSP" */
+	uint32_t length;
+	uint8_t hash[PLAT_AUTH_SHA256_LEN];
+
+	uint32_t vcn;
+	uint32_t part_version;
+	uint32_t fmt_version;
+	uint32_t instance_id;
+	uint32_t part_flags;
+	uint8_t reserved[20];	/* must be 0 */
+
+	/* variable length of modules */
+	struct partition_info_module module[PART_INFO_NUM_MODULE];
+} __attribute__((packed));
+
+/* offset 0x458 id */
+struct info_ext_0x16 {
+	uint32_t ext_type;	/* 0x16 */
+	uint32_t ext_len;	/* 0x68 */
+	uint8_t name[4];	/* ADSP */
+	uint32_t size;		/* file size */
+	uint32_t data[5];	/* 0 = 0x10000000, 0, 1, 1, 0x3003 */
+	uint8_t hash[PLAT_AUTH_SHA384_LEN];
+	uint32_t data1[5];
+} __attribute__((packed));
+
+
+#define PLAT_AUTH_SIZE \
+	(sizeof(struct partition_info_ext) + \
+	sizeof(struct signed_pkg_info_ext))
+
+void ri_adsp_meta_data_create_v1_8(struct image *image, int meta_start_offset,
+				   int meta_end_offset);
+void ri_adsp_meta_data_create_v2_5(struct image *image, int meta_start_offset,
+				   int meta_end_offset);
+void ri_plat_ext_data_create(struct image *image);
+void ri_plat_ext_data_create_v2_5(struct image *image);
+void ri_plat_ext_data_create_ace_v1_5(struct image *image);
+
+#endif
diff --git a/tools/rimage/src/include/rimage/rimage.h b/tools/rimage/src/include/rimage/rimage.h
new file mode 100644
index 000000000000..61bc77bfca42
--- /dev/null
+++ b/tools/rimage/src/include/rimage/rimage.h
@@ -0,0 +1,175 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2015-2018 Intel Corporation. All rights reserved.
+ */
+
+#ifndef __RIMAGE_H__
+#define __RIMAGE_H__
+
+#include <stdint.h>
+#include <stdio.h>
+
+#include <rimage/manifest.h>
+#include <rimage/cavs/cavs_ext_manifest.h>
+#include <rimage/sof/kernel/fw.h>
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+#define MAX_MODULES		32
+
+struct adsp;
+
+/*
+ * Firmware image context.
+ */
+struct image {
+
+	const char *out_file;
+	const char *in_file;
+	FILE *out_fd;
+	void *pos;
+
+	struct adsp *adsp;
+	int abi;
+	int verbose;
+	int reloc;	/* ELF data is relocatable */
+	int num_modules;
+	struct manifest_module module[MAX_MODULES];
+	uint32_t image_end;/* module end, equal to output image size */
+	int meu_offset;
+	const char *verify_file;
+
+	/* private key file name*/
+	const char *key_name;
+
+	/* file IO */
+	void *fw_image;
+	void *rom_image;
+	FILE *out_rom_fd;
+	FILE *out_man_fd;
+	FILE *out_ext_man_fd;
+	FILE *out_unsigned_fd;
+	char out_rom_file[256];
+	char out_man_file[256];
+	char out_ext_man_file[256];
+	char out_unsigned_file[256];
+
+	/* fw version and build id */
+	char* fw_ver_string;
+	char* fw_ver_build_string;
+	uint16_t fw_ver_major;
+	uint16_t fw_ver_minor;
+	uint16_t fw_ver_micro;
+	uint16_t fw_ver_build;
+
+	uint32_t imr_type;
+
+	/* Output image is a loadable module */
+	bool loadable_module;
+};
+
+struct memory_zone {
+	uint32_t base;
+	uint32_t size;
+	uint32_t host_offset;
+};
+
+struct memory_alias {
+	uint32_t mask;
+	uint32_t cached;
+	uint32_t uncached;
+};
+
+struct memory_config {
+	struct memory_zone zones[SOF_FW_BLK_TYPE_NUM];
+	struct memory_alias alias;
+};
+
+struct fw_image_ext_mod_config {
+	struct fw_ext_mod_config_header header;
+	struct mod_scheduling_caps sched_caps;
+	struct fw_pin_description *pin_desc;
+};
+
+struct fw_image_ext_module {
+	uint32_t mod_conf_count;
+	struct fw_image_ext_mod_config ext_mod_config_array[FW_MAX_EXT_MODULE_NUM];
+};
+
+/*
+ * module manifest information defined in config file
+ */
+struct fw_image_manifest_module {
+	struct fw_image_ext_module mod_ext;
+	uint32_t mod_cfg_count;
+	struct sof_man_mod_config *mod_cfg;
+	uint32_t mod_man_count;
+	struct sof_man_module *mod_man;
+};
+
+/*
+ * Audio DSP descriptor and operations.
+ */
+struct adsp {
+	const char *name;
+	struct memory_config mem;
+
+	uint32_t image_size;
+
+	int (*write_firmware_ext_man)(struct image *image);
+	int (*write_firmware)(struct image *image);
+	int (*write_firmware_meu)(struct image *image);
+	int (*verify_firmware)(struct image *image);
+	struct fw_image_manifest_ace_v1_5 *man_ace_v1_5;
+	struct fw_image_manifest_v2_5 *man_v2_5;
+	struct fw_image_manifest_v1_8 *man_v1_8;
+	struct fw_image_manifest_v1_5 *man_v1_5;
+	struct fw_image_manifest_v1_5_sue *man_v1_5_sue;
+	struct fw_image_manifest_module *modules;
+	int exec_boot_ldr;
+};
+
+int ri_manifest_sign_v1_5(struct image *image);
+int ri_manifest_sign_v1_8(struct image *image);
+int ri_manifest_sign_v2_5(struct image *image);
+int ri_manifest_sign_ace_v1_5(struct image *image);
+
+int pkcs_v1_5_sign_man_v1_5(struct image *image,
+			    struct fw_image_manifest_v1_5 *man,
+			    void *ptr1, unsigned int size1);
+int pkcs_v1_5_sign_man_v1_8(struct image *image,
+			    struct fw_image_manifest_v1_8 *man,
+			    void *ptr1, unsigned int size1, void *ptr2,
+			    unsigned int size2);
+int pkcs_v1_5_sign_man_v2_5(struct image *image,
+			    struct fw_image_manifest_v2_5 *man,
+			    void *ptr1, unsigned int size1, void *ptr2,
+			    unsigned int size2);
+int pkcs_v1_5_sign_man_ace_v1_5(struct image *image,
+				struct fw_image_manifest_ace_v1_5 *man,
+				void *ptr1, unsigned int size1, void *ptr2,
+				unsigned int size2);
+
+int verify_image(struct image *image);
+int ri_manifest_verify_v1_5(struct image *image);
+int ri_manifest_verify_v1_8(struct image *image);
+int ri_manifest_verify_v2_5(struct image *image);
+int pkcs_v1_5_verify_man_v1_5(struct image *image,
+			    struct fw_image_manifest_v1_5 *man,
+			    void *ptr1, unsigned int size1);
+int pkcs_v1_5_verify_man_v1_8(struct image *image,
+			    struct fw_image_manifest_v1_8 *man,
+			    void *ptr1, unsigned int size1, void *ptr2,
+			    unsigned int size2);
+int pkcs_v1_5_verify_man_v2_5(struct image *image,
+			    struct fw_image_manifest_v2_5 *man,
+			    void *ptr1, unsigned int size1, void *ptr2,
+			    unsigned int size2);
+int pkcs_v1_5_verify_man_ace_v1_5(struct image *image,
+				  struct fw_image_manifest_ace_v1_5 *man,
+				  void *ptr1, unsigned int size1, void *ptr2,
+				  unsigned int size2);
+
+int resign_image(struct image *image);
+int get_key_size(struct image *image);
+
+#endif
diff --git a/tools/rimage/src/include/rimage/sof/kernel/ext_manifest.h b/tools/rimage/src/include/rimage/sof/kernel/ext_manifest.h
new file mode 100644
index 000000000000..7d9b77735a11
--- /dev/null
+++ b/tools/rimage/src/include/rimage/sof/kernel/ext_manifest.h
@@ -0,0 +1,81 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020 Intel Corporation. All rights reserved.
+ *
+ * Author: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
+ */
+
+/*
+ * Extended manifest is a place to store metadata about firmware, known during
+ * compilation time - for example firmware version or used compiler.
+ * Given information are read on host side before firmware startup.
+ * This part of output binary is not signed.
+ *
+ * To add new content to ext_man, in firmware code define struct which starts
+ * with ext_man_elem_head followed by usage dependent content and place whole
+ * struct in "fw_metadata" section. Moreover kernel code should be modified to
+ * properly read new packet.
+ *
+ * Extended manifest is designed to be extensible. In header there is a field
+ * which describe header length, so after appending some data to header then it
+ * can be easily skipped by device with older version of this header.
+ * Unknown ext_man elements should be just skipped by host,
+ * to be backward compatible. Field `ext_man_elem_header.elem_size` should be
+ * used in such a situation.
+ */
+
+#ifndef __RIMAGE_KERNEL_EXT_MANIFEST_H__
+#define __RIMAGE_KERNEL_EXT_MANIFEST_H__
+
+#include <stdint.h>
+
+#ifndef __packed
+#define __packed __attribute__((packed))
+#endif
+
+/* In ASCII `XMan` */
+#define EXT_MAN_MAGIC_NUMBER	0x6e614d58
+
+/* Build u32 number in format MMmmmppp */
+#define EXT_MAN_BUILD_VERSION(MAJOR, MINOR, PATH) ( \
+	((uint32_t)(MAJOR) << 24) | \
+	((uint32_t)(MINOR) << 12) | \
+	(uint32_t)(PATH))
+
+/* check extended manifest version consistency */
+#define EXT_MAN_VERSION_INCOMPATIBLE(host_ver, cli_ver) ( \
+	((host_ver) & GENMASK(31, 24)) != \
+	((cli_ver) & GENMASK(31, 24)))
+
+/* used extended manifest header version */
+#define EXT_MAN_VERSION		EXT_MAN_BUILD_VERSION(1, 0, 0)
+
+/* struct size alignment for ext_man elements */
+#define EXT_MAN_ALIGN 16
+
+/* extended manifest header, deleting any field breaks backward compatibility */
+struct ext_man_header {
+	uint32_t magic;		/**< identification number, */
+				/**< EXT_MAN_MAGIC_NUMBER */
+	uint32_t full_size;	/**< [bytes] full size of ext_man, */
+				/**< (header + content + padding) */
+	uint32_t header_size;	/**< [bytes] makes header extensionable, */
+				/**< after append new field to ext_man header */
+				/**< then backward compatible won't be lost */
+	uint32_t header_version; /**< value of EXT_MAN_VERSION */
+				/**< not related with following content */
+
+	/* just after this header should be list of ext_man_elem_* elements */
+} __packed;
+
+/* Now define extended manifest elements */
+
+/* extended manifest element header */
+struct ext_man_elem_header {
+	uint32_t type;		/**< EXT_MAN_ELEM_* */
+	uint32_t elem_size;	/**< in bytes, including header size */
+
+	/* just after this header should be type dependent content */
+} __packed;
+
+#endif /* __RIMAGE_KERNEL_EXT_MANIFEST_H__ */
diff --git a/tools/rimage/src/include/rimage/sof/kernel/fw.h b/tools/rimage/src/include/rimage/sof/kernel/fw.h
new file mode 100644
index 000000000000..14c8ca0c1585
--- /dev/null
+++ b/tools/rimage/src/include/rimage/sof/kernel/fw.h
@@ -0,0 +1,80 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2018 Intel Corporation. All rights reserved.
+ *
+ * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+ *         Keyon Jie <yang.jie@linux.intel.com>
+ */
+
+/*
+ * Firmware file format .
+ */
+
+#ifndef __RIMAGE_KERNEL_FW_H__
+#define __RIMAGE_KERNEL_FW_H__
+
+#include <stdint.h>
+
+#define SND_SOF_FW_SIG_SIZE	4
+#define SND_SOF_FW_ABI		1
+#define SND_SOF_FW_SIG		"Reef"
+
+/*
+ * Firmware module is made up of 1 . N blocks of different types. The
+ * Block header is used to determine where and how block is to be copied in the
+ * DSP/host memory space.
+ */
+enum snd_sof_fw_blk_type {
+	SOF_FW_BLK_TYPE_INVALID	= -1,
+	SOF_FW_BLK_TYPE_START	= 0,
+	SOF_FW_BLK_TYPE_RSRVD0	= SOF_FW_BLK_TYPE_START,
+	SOF_FW_BLK_TYPE_IRAM	= 1,	/* local instruction RAM */
+	SOF_FW_BLK_TYPE_DRAM	= 2,	/* local data RAM */
+	SOF_FW_BLK_TYPE_SRAM	= 3,	/* system RAM */
+	SOF_FW_BLK_TYPE_ROM	= 4,
+	SOF_FW_BLK_TYPE_IMR	= 5,
+	SOF_FW_BLK_TYPE_HPSRAM	= 6,
+	SOF_FW_BLK_TYPE_LPSRAM	= 7,
+	SOF_FW_BLK_TYPE_RSRVD8	= 8,
+	SOF_FW_BLK_TYPE_RSRVD9	= 9,
+	SOF_FW_BLK_TYPE_RSRVD10	= 10,
+	SOF_FW_BLK_TYPE_RSRVD11	= 11,
+	SOF_FW_BLK_TYPE_RSRVD12	= 12,
+	SOF_FW_BLK_TYPE_RSRVD13	= 13,
+	SOF_FW_BLK_TYPE_RSRVD14	= 14,
+	/* use SOF_FW_BLK_TYPE_RSVRDX for new block types */
+	SOF_FW_BLK_TYPE_NUM
+};
+
+struct snd_sof_blk_hdr {
+	enum snd_sof_fw_blk_type type;
+	uint32_t size;		/* bytes minus this header */
+	uint32_t offset;	/* offset from base */
+} __attribute__((packed));
+
+/*
+ * Firmware file is made up of 1 .. N different modules types. The module
+ * type is used to determine how to load and parse the module.
+ */
+enum snd_sof_fw_mod_type {
+	SOF_FW_BASE	= 0,	/* base firmware image */
+	SOF_FW_MODULE	= 1,	/* firmware module */
+};
+
+struct snd_sof_mod_hdr {
+	enum snd_sof_fw_mod_type type;
+	uint32_t size;		/* bytes minus this header */
+	uint32_t num_blocks;	/* number of blocks */
+} __attribute__((packed));
+
+/*
+ * Firmware file header.
+ */
+struct snd_sof_fw_header {
+	unsigned char sig[SND_SOF_FW_SIG_SIZE]; /* "Reef" */
+	uint32_t file_size;	/* size of file minus this header */
+	uint32_t num_modules;	/* number of modules */
+	uint32_t abi;		/* version of header format */
+} __attribute__((packed));
+
+#endif /* __RIMAGE_KERNEL_FW_H__ */
diff --git a/tools/rimage/src/include/rimage/sof/user/manifest.h b/tools/rimage/src/include/rimage/sof/user/manifest.h
new file mode 100644
index 000000000000..d270ce98b309
--- /dev/null
+++ b/tools/rimage/src/include/rimage/sof/user/manifest.h
@@ -0,0 +1,238 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2017 Intel Corporation. All rights reserved.
+ *
+ * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+ */
+
+/**
+ * \file include/user/manifest.h
+ * \brief FW Image Manifest definitions.
+ * \author Liam Girdwood <liam.r.girdwood@linux.intel.com>
+ */
+
+#ifndef __RIMAGE_USER_MANIFEST_H__
+#define __RIMAGE_USER_MANIFEST_H__
+
+#include <stdint.h>
+
+/* start offset for base FW module */
+#define SOF_MAN_ELF_TEXT_OFFSET		0x2000
+
+/* FW Extended Manifest Header id = $AE1 */
+#define SOF_MAN_EXT_HEADER_MAGIC	0x31454124
+
+/* module type load type */
+#define SOF_MAN_MOD_TYPE_BUILTIN	0
+#define SOF_MAN_MOD_TYPE_MODULE		1
+
+/* module init config */
+#define SOF_MAN_MOD_INIT_CONFIG_BASE_CFG               0 /* Base config only */
+#define SOF_MAN_MOD_INIT_CONFIG_BASE_CFG_WITH_EXT      1 /* Base config with extension */
+
+#define MAN_MAX_SIZE_V1_8		(38 * 1024)
+
+
+struct sof_man_module_type {
+	uint32_t load_type:4;	/* SOF_MAN_MOD_TYPE_ */
+	uint32_t auto_start:1;
+	uint32_t domain_ll:1;
+	uint32_t domain_dp:1;
+	uint32_t lib_code:1;
+	uint32_t init_config:4; /* SOF_MAN_MOD_INIT_CONFIG_ */
+	uint32_t rsvd_:20;
+};
+
+/* segment flags.type */
+#define SOF_MAN_SEGMENT_TEXT		0
+#define SOF_MAN_SEGMENT_RODATA		1
+#define SOF_MAN_SEGMENT_DATA		1
+#define SOF_MAN_SEGMENT_BSS		2
+#define SOF_MAN_SEGMENT_EMPTY		15
+
+union sof_man_segment_flags {
+	uint32_t ul;
+	struct {
+		uint32_t contents:1;
+		uint32_t alloc:1;
+		uint32_t load:1;
+		uint32_t readonly:1;
+		uint32_t code:1;
+		uint32_t data:1;
+		uint32_t _rsvd0:2;
+		uint32_t type:4;	/* MAN_SEGMENT_ */
+		uint32_t _rsvd1:4;
+		uint32_t length:16;	/* of segment in pages */
+	} r;
+} __attribute__((packed));
+
+/*
+ * Module segment descriptor. Used by ROM - Immutable.
+ */
+struct sof_man_segment_desc {
+	union sof_man_segment_flags flags;
+	uint32_t v_base_addr;
+	uint32_t file_offset;
+} __attribute__((packed));
+
+/*
+ * The firmware binary can be split into several modules.
+ */
+
+#define SOF_MAN_MOD_ID_LEN		4
+#define SOF_MAN_MOD_NAME_LEN		8
+#define SOF_MAN_MOD_SHA256_LEN		32
+#define SOF_MAN_MOD_SHA384_LEN		48
+#define SOF_MAN_MOD_ID			{'$', 'A', 'M', 'E'}
+
+/*
+ * Each module has an entry in the FW header. Used by ROM - Immutable.
+ */
+struct sof_man_module {
+	uint8_t struct_id[SOF_MAN_MOD_ID_LEN];	/* SOF_MAN_MOD_ID */
+	uint8_t name[SOF_MAN_MOD_NAME_LEN];
+	uint8_t uuid[16];
+	struct sof_man_module_type type;
+	uint8_t hash[SOF_MAN_MOD_SHA256_LEN];
+	uint32_t entry_point;
+	uint16_t cfg_offset;
+	uint16_t cfg_count;
+	uint32_t affinity_mask;
+	uint16_t instance_max_count;	/* max number of instances */
+	uint16_t instance_bss_size;	/* instance (pages) */
+	struct sof_man_segment_desc segment[3];
+} __attribute__((packed));
+
+/*
+ * Each module has a configuration in the FW header. Used by ROM - Immutable.
+ */
+struct sof_man_mod_config {
+	uint32_t par[4];	/* module parameters */
+	uint32_t is_pages;	/* actual size of instance .bss (pages) */
+	uint32_t cps;		/* cycles per second */
+	uint32_t ibs;		/* input buffer size (bytes) */
+	uint32_t obs;		/* output buffer size (bytes) */
+	uint32_t module_flags;	/* flags, reserved for future use */
+	uint32_t cpc;		/* cycles per single run */
+	uint32_t obls;		/* output block size, reserved for future use */
+} __attribute__((packed));
+
+/*
+ * FW Manifest Header
+ */
+
+#define SOF_MAN_FW_HDR_FW_NAME_LEN	8
+#define SOF_MAN_FW_HDR_ID		{'$', 'A', 'M', '1'}
+#define SOF_MAN_FW_HDR_NAME		"ADSPFW"
+#define SOF_MAN_FW_HDR_FLAGS		0x0
+#define SOF_MAN_FW_HDR_FEATURES		0xffff
+
+/*
+ * The firmware has a standard header that is checked by the ROM on firmware
+ * loading. preload_page_count is used by DMA code loader and is entire
+ * image size on CNL. i.e. CNL: total size of the binary’s .text and .rodata
+ * Used by ROM - Immutable.
+ */
+struct sof_man_fw_header {
+	uint8_t header_id[4];
+	uint32_t header_len;
+	uint8_t name[SOF_MAN_FW_HDR_FW_NAME_LEN];
+	/* number of pages of preloaded image loaded by driver */
+	uint32_t preload_page_count;
+	uint32_t fw_image_flags;
+	uint32_t feature_mask;
+	uint16_t major_version;
+	uint16_t minor_version;
+	uint16_t hotfix_version;
+	uint16_t build_version;
+	uint32_t num_module_entries;
+	uint32_t fw_compat;
+	uint32_t hw_buf_length;
+	/* target address for binary loading as offset in IMR - must be == base offset */
+	uint32_t load_offset;
+} __attribute__((packed));
+
+/*
+ * Firmware manifest descriptor. This can contain N modules and N module
+ * configs. Used by ROM - Immutable.
+ */
+struct sof_man_fw_desc {
+	struct sof_man_fw_header header;
+
+	/* Warning - hack for module arrays. For some unknown reason the we
+	 * have a variable size array of struct man_module followed by a
+	 * variable size array of struct mod_config. These should have been
+	 * merged into a variable array of a parent structure. We have to hack
+	 * around this in many places....
+	 *
+	 * struct sof_man_module man_module[];
+	 * struct sof_man_mod_config mod_config[];
+	 */
+
+} __attribute__((packed));
+
+#define SOF_MAN_COMP_SHA256_LEN		32
+#define SOF_MAN_COMP_SHA384_LEN		48
+
+/*
+ * Component Descriptor for manifest v1.8. Used by ROM - Immutable.
+ */
+struct sof_man_component_desc_v1_8 {
+	uint32_t reserved[2];	/* all 0 */
+	uint32_t version;
+	uint8_t hash[SOF_MAN_COMP_SHA256_LEN];
+	uint32_t base_offset;
+	uint32_t limit_offset;
+	uint32_t attributes[4];
+} __attribute__((packed));
+
+/*
+ * Audio DSP extended metadata for manifest v1.8. Used by ROM - Immutable.
+ */
+struct sof_man_adsp_meta_file_ext_v1_8 {
+	uint32_t ext_type;	/* always 17 for ADSP extension */
+	uint32_t ext_len;
+	uint32_t imr_type;
+	uint8_t reserved[16];	/* all 0 */
+	struct sof_man_component_desc_v1_8 comp_desc[1];
+} __attribute__((packed));
+
+/*
+ * Component Descriptor for manifest v2.5. Used by ROM - Immutable.
+ */
+struct sof_man_component_desc_v2_5 {
+	uint32_t reserved[2];	/* all 0 */
+	uint32_t version;
+	uint8_t hash[SOF_MAN_COMP_SHA384_LEN];
+	uint32_t base_offset;
+	uint32_t limit_offset;
+	uint32_t attributes[4];
+} __attribute__((packed));
+
+/*
+ * Audio DSP extended metadata for manifest v2.5. Used by ROM - Immutable.
+ */
+struct sof_man_adsp_meta_file_ext_v2_5 {
+	uint32_t ext_type;	/* always 17 for ADSP extension */
+	uint32_t ext_len;
+	uint32_t imr_type;
+	uint8_t reserved[16];	/* all 0 */
+	struct sof_man_component_desc_v2_5 comp_desc[1];
+} __attribute__((packed));
+
+/*
+ * Module Manifest for rimage module metadata. Not used by ROM.
+ */
+struct sof_man_module_manifest {
+	struct sof_man_module module;
+	uint32_t text_size;
+};
+
+/*
+ * Module offset in manifest.
+ */
+#define SOF_MAN_MODULE_OFFSET(index) \
+	(sizeof(struct sof_man_fw_header) + \
+		(index) * sizeof(struct sof_man_module))
+
+#endif /* __RIMAGE_USER_MANIFEST_H__ */
diff --git a/tools/rimage/src/include/rimage/toml_utils.h b/tools/rimage/src/include/rimage/toml_utils.h
new file mode 100644
index 000000000000..cd17bb4af28d
--- /dev/null
+++ b/tools/rimage/src/include/rimage/toml_utils.h
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright(c) 2023 Intel Corporation. All rights reserved.
+ *
+ * Author: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
+ *         Marc Herbert <marc.herbert@intel.com>
+ */
+
+#ifndef __TOML_UTILS_H__
+#define __TOML_UTILS_H__
+
+#include "toml.h"
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+/** parser counter, used to assert nothing left unparsed in toml data */
+struct parse_ctx {
+	int key_cnt;		/**< number of parsed key */
+	int table_cnt;		/**< number of parsed tables */
+	int array_cnt;		/**< number of parsed arrays */
+};
+
+/* macros used to dump values after parsing */
+#define DUMP_KEY_FMT "   %20s: "
+#define DUMP(fmt, ...) fprintf(stdout, fmt "\n", ##__VA_ARGS__)
+#define DUMP_KEY(key, fmt, ...) DUMP(DUMP_KEY_FMT fmt, key, ##__VA_ARGS__)
+
+void print_bytes(FILE *out, const uint8_t *arr, size_t len);
+
+#define DUMP_PRINTABLE_BYTES(name, var) _dump_printable_bytes(name, var, sizeof(var))
+
+void _dump_printable_bytes(const char *name, const uint8_t *arr, size_t len);
+
+/** private parser error trace function */
+void vlog_err(const char *msg, va_list vl);
+
+/** parser error trace function, error code is returned to shorten client code */
+int log_err(int err_code, const char *msg, ...);
+
+/** log malloc error message for given key */
+int err_malloc(const char *key);
+
+/** log key not found error */
+int err_key_not_found(const char *key);
+
+/** error during parsing key value, possible detailed message */
+int err_key_parse(const char *key, const char *extra_msg, ...);
+
+/** initialize parser context before parsing */
+void parse_ctx_init(struct parse_ctx *ctx);
+
+/** check nothing left unparsed in given parsing context */
+int assert_everything_parsed(const toml_table_t *table, struct parse_ctx *ctx);
+
+/**
+ * Parse hex value from key in given toml table
+ * @param table toml table where key is specified
+ * @param ctx parsing context, key counter will be incremented after successful key parse
+ * @param key field name
+ * @param def is default value or -1 when value don't have default value
+ * @param error code, 0 when success
+ * @return default, parsed, or UINT32_MAX value for error cases
+ */
+uint32_t parse_uint32_hex_key(const toml_table_t *table, struct parse_ctx *ctx,
+			      const char *key, int64_t def, int *error);
+
+/**
+ * Parse integer value from key in given toml table
+ * @param table toml table where key is specified
+ * @param ctx parsing context, key counter will be incremented after successful key parse
+ * @param key field name
+ * @param def is default value or -1 when value don't have default value
+ * @param error code, 0 when success
+ * @return default, parsed, or UINT32_MAX value for error cases
+ */
+uint32_t parse_uint32_key(const toml_table_t *table, struct parse_ctx *ctx, const char *key,
+			  int64_t def, int *error);
+
+/**
+ * Parse string value from key in given toml table to uint8_t array. The
+ * destination is NOT a string because it is padded with zeros if and
+ * only if there is some capacity left. For string destinations use
+ * parse_str_key().
+ *
+ * @param table toml table where key is specified
+ * @param ctx parsing context, key counter will be incremented after successful key parse
+ * @param key field name
+ * @param dst uint8_t[] destination
+ * @param capacity dst array size
+ * @param error code, 0 when success
+ */
+void parse_printable_key(const toml_table_t *table, struct parse_ctx *ctx, const char *key,
+			 uint8_t *dst, int capacity, int *error);
+
+/**
+ * Parse string value from key in given toml table to given
+ * char[]. Destination is padded with zeros. As the only difference with
+ * parse_printable_key(), dst is guaranteed to be null-terminated when
+ * there is no error because the last destination byte is reserved for
+ * that.
+ *
+ * @param table toml table where key is specified
+ * @param ctx parsing context, key counter will be incremented after successful key parse
+ * @param key field name
+ * @param dst char[] destination
+ * @param capacity dst array size including null termination.
+ * @param error code, 0 when success
+ */
+void parse_str_key(const toml_table_t *table, struct parse_ctx *ctx, const char *key,
+		   char *dst, int capacity, int *error);
+
+void parse_uuid(char *buf, uint8_t *uuid);
+
+/** version is stored as toml array with integer number, something like:
+ *   "version = [1, 8]"
+ */
+int parse_version(toml_table_t *toml, int64_t version[2]);
+
+#endif /* __TOML_UTILS_H__ */
diff --git a/tools/rimage/src/manifest.c b/tools/rimage/src/manifest.c
new file mode 100644
index 000000000000..19b73ee38e35
--- /dev/null
+++ b/tools/rimage/src/manifest.c
@@ -0,0 +1,1631 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2018-2022 Intel Corporation. All rights reserved.
+//
+// Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+//         Keyon Jie <yang.jie@linux.intel.com>
+//         Janusz Jankowski <janusz.jankowski@linux.intel.com>
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <time.h>
+#include <sys/time.h>
+
+#include <rimage/sof/user/manifest.h>
+
+#include <rimage/rimage.h>
+#include <rimage/css.h>
+#include <rimage/cse.h>
+#include <rimage/plat_auth.h>
+#include <rimage/manifest.h>
+#include <rimage/file_utils.h>
+#include <rimage/misc_utils.h>
+#include <rimage/hash.h>
+
+static int man_open_rom_file(struct image *image)
+{
+	uint32_t size;
+	int ret;
+
+	ret = create_file_name(image->out_rom_file, sizeof(image->out_rom_file), image->out_file,
+			       "rom");
+	if (ret)
+		return ret;
+
+	size = image->adsp->mem.zones[SOF_FW_BLK_TYPE_ROM].size;
+
+	/* allocate ROM image  */
+	image->rom_image = calloc(size, 1);
+	if (!image->rom_image)
+		return -ENOMEM;
+
+	/* open ROM outfile for writing */
+	image->out_rom_fd = fopen(image->out_rom_file, "wb");
+	if (!image->out_rom_fd)
+		return file_error("unable to open file for writing", image->out_rom_file);
+
+	return 0;
+}
+
+static int man_open_unsigned_file(struct image *image)
+{
+	int ret;
+
+	ret = create_file_name(image->out_unsigned_file, sizeof(image->out_unsigned_file),
+			       image->out_file, "uns");
+	if (ret)
+		return ret;
+
+	/* open unsigned FW outfile for writing */
+	image->out_unsigned_fd = fopen(image->out_unsigned_file, "wb");
+	if (!image->out_unsigned_fd)
+		return file_error("unable to open file for writing", image->out_unsigned_file);
+
+	return 0;
+}
+
+static int man_open_manifest_file(struct image *image)
+{
+	int ret;
+
+	ret = create_file_name(image->out_man_file, sizeof(image->out_man_file), image->out_file,
+			       "met");
+	if (ret)
+		return ret;
+
+	/* open manifest outfile for writing */
+	image->out_man_fd = fopen(image->out_man_file, "wb");
+	if (!image->out_man_fd)
+		return file_error("unable to open file for writing", image->out_man_file);
+
+	return 0;
+}
+
+static int man_init_image_v1_5(struct image *image)
+{
+	/* allocate image and copy template manifest */
+	image->fw_image = calloc(image->adsp->image_size, 1);
+	if (!image->fw_image)
+		return -ENOMEM;
+
+	memcpy(image->fw_image, image->adsp->man_v1_5,
+	       sizeof(struct fw_image_manifest_v1_5));
+
+	return 0;
+}
+
+static int man_init_image_v1_5_sue(struct image *image)
+{
+	/* allocate image and copy template manifest */
+	image->fw_image = calloc(image->adsp->image_size, 1);
+	if (!image->fw_image)
+		return -ENOMEM;
+
+	/* copy 1.5 sue manifest */
+	memcpy(image->fw_image + MAN_DESC_OFFSET_V1_5_SUE,
+	       image->adsp->man_v1_5_sue,
+	       sizeof(struct fw_image_manifest_v1_5_sue));
+
+	return 0;
+}
+
+static int man_init_image_v1_8(struct image *image)
+{
+	/* allocate image and copy template manifest */
+	image->fw_image = calloc(image->adsp->image_size, 1);
+	if (!image->fw_image)
+		return -ENOMEM;
+
+	memcpy(image->fw_image, image->adsp->man_v1_8,
+	       sizeof(struct fw_image_manifest_v1_8));
+
+	return 0;
+}
+
+static int man_init_image_v2_5(struct image *image)
+{
+	/* allocate image and copy template manifest */
+	image->fw_image = calloc(image->adsp->image_size, 1);
+	if (!image->fw_image)
+		return -ENOMEM;
+
+	memcpy(image->fw_image, image->adsp->man_v2_5,
+	       sizeof(struct fw_image_manifest_v2_5));
+
+	return 0;
+}
+
+/* write SRAM sections */
+static int man_copy_sram(struct image *image, const struct manifest_module *module,
+			 const struct sof_man_segment_desc *segment,
+			 const struct module_section *section)
+{
+	uint32_t offset, end;
+	int ret;
+
+	assert(section->load_address >= segment->v_base_addr);
+	offset = segment->file_offset + section->load_address - segment->v_base_addr;
+	end = offset + section->size;
+	assert((uint64_t)offset + section->size <= image->adsp->image_size);
+
+	ret = module_read_section(&module->file, section, image->fw_image + offset,
+				  image->adsp->image_size - offset);
+	if (ret)
+		return ret;
+
+	/* get module end offset  ? */
+	if (end > image->image_end)
+		image->image_end = end;
+
+	fprintf(stdout, "\t0x%x\t0x%zx\t\t0x%x\t%s\t%s\n", section->load_address, section->size,
+		offset, section->type == MST_TEXT ? "TEXT" : "DATA", section->header->name);
+
+	return 0;
+}
+
+/**
+ * Write all linked sections
+ * 
+ * @param image program global structure
+ * @param module modules manifest description
+ * @param section module section descriptor
+ * @return error code on error, 0 on success
+ */
+static int man_copy_elf_sections(struct image *image, struct manifest_module *module,
+				 const struct sof_man_segment_desc *segment,
+				 const struct module_section *section)
+{
+	int ret;
+
+	while (section) {
+		ret = man_copy_sram(image, module, segment, section);
+		if (ret < 0) {
+			fprintf(stderr, "error: failed to write section %s\n",
+				section->header->name);
+			return ret;
+		}
+
+		section = section->next_section;
+	}
+
+	return 0;
+}
+
+static int man_get_module_manifest(struct image *image, struct manifest_module *module,
+				   struct sof_man_module *man_module)
+{
+	struct elf_section section;
+	struct sof_man_segment_desc *segment;
+	const struct sof_man_module_manifest *sof_mod;
+	int ret;
+
+	fprintf(stdout, "Module Write: %s\n", module->file.elf.filename);
+
+	/* load in module manifest data */
+	ret = elf_section_read_by_name(&module->file.elf, ".module", &section);
+	if (ret) {
+		fprintf(stderr, "error: can't read module manifest from '.module' section.\n");
+		return ret;
+	}
+
+	if (sizeof(*sof_mod) > section.header.data.size) {
+		fprintf(stderr, "error: Invalid module manifest in '.module' section.\n");
+		ret = -ENODATA;
+		goto error;
+	}
+	sof_mod = section.data;
+
+	/* configure man_module with sofmod data */
+	memcpy(man_module->struct_id, "$AME", 4);
+	man_module->entry_point = sof_mod->module.entry_point;
+	memcpy(man_module->name, sof_mod->module.name, SOF_MAN_MOD_NAME_LEN);
+	memcpy(man_module->uuid, sof_mod->module.uuid, 16);
+	man_module->affinity_mask = sof_mod->module.affinity_mask;
+	man_module->type.auto_start = sof_mod->module.type.auto_start;
+	man_module->type.domain_dp = sof_mod->module.type.domain_dp;
+	man_module->type.domain_ll = sof_mod->module.type.domain_ll;
+	man_module->type.load_type = sof_mod->module.type.load_type;
+
+	/* read out text_fixup_size from memory mapping */
+	module->text_fixup_size = sof_mod->text_size;
+
+	/* text segment */
+	segment = &man_module->segment[SOF_MAN_SEGMENT_TEXT];
+	segment->flags.r.contents = 1;
+	segment->flags.r.alloc = 1;
+	segment->flags.r.load = 1;
+	segment->flags.r.readonly = 1;
+	segment->flags.r.code = 1;
+
+	/* data segment */
+	segment = &man_module->segment[SOF_MAN_SEGMENT_RODATA];
+	segment->flags.r.contents = 1;
+	segment->flags.r.alloc = 1;
+	segment->flags.r.load = 1;
+	segment->flags.r.readonly = 1;
+	segment->flags.r.data = 1;
+	segment->flags.r.type = 1;
+
+	/* bss segment */
+	segment = &man_module->segment[SOF_MAN_SEGMENT_BSS];
+	segment->flags.r.alloc = 1;
+	segment->flags.r.type = 2;
+
+	fprintf(stdout, " Entry point 0x%8.8x\n", man_module->entry_point);
+
+error:
+	elf_section_free(&section);
+	return ret;
+}
+
+static inline const char *segment_name(int i)
+{
+	switch (i) {
+	case SOF_MAN_SEGMENT_TEXT:
+		return "TEXT";
+	case SOF_MAN_SEGMENT_RODATA:
+		return "DATA";
+	case SOF_MAN_SEGMENT_BSS:
+		return "BSS";
+	default:
+		return "NONE";
+	}
+}
+
+/* make sure no segments collide */
+static int man_module_validate(struct sof_man_module *man_module)
+{
+	uint32_t istart, iend;
+	uint32_t jstart, jend;
+	int i, j;
+
+	for (i = 0; i < 3; i++) {
+		istart = man_module->segment[i].v_base_addr;
+		iend = istart + man_module->segment[i].flags.r.length *
+			MAN_PAGE_SIZE;
+
+		for (j = 0; j < 3; j++) {
+			/* don't validate segment against itself */
+			if (i == j)
+				continue;
+
+			jstart = man_module->segment[j].v_base_addr;
+			jend = jstart + man_module->segment[j].flags.r.length *
+				MAN_PAGE_SIZE;
+
+			if (jstart > istart && jstart < iend)
+				goto err;
+
+			if (jend > istart && jend < iend)
+				goto err;
+		}
+	}
+
+	/* success, no overlapping segments */
+	return 0;
+
+err:
+	fprintf(stderr, "error: segment %s [0x%8.8x:0x%8.8x] overlaps",
+		segment_name(i), istart, iend);
+	fprintf(stderr, " with %s [0x%8.8x:0x%8.8x]\n",
+		segment_name(j), jstart, jend);
+	return -EINVAL;
+}
+
+static int man_module_create(struct image *image, struct manifest_module *module,
+			     struct sof_man_module *man_module)
+{
+	/* create module and segments */
+	int err;
+	unsigned int pages;
+	const struct elf_section_header *bss;
+
+	image->image_end = 0;
+
+	err = man_get_module_manifest(image, module, man_module);
+	if (err < 0)
+		return err;
+
+	/* stack size ??? convert sizes to PAGES */
+	man_module->instance_bss_size = 1;
+
+	/* max number of instances of this module ?? */
+	man_module->instance_max_count = 1;
+
+	module_print_zones(&module->file);
+
+	/* main module */
+	fprintf(stdout, "\tAddress\t\tSize\t\tFile\tType\tName\n");
+
+	/* text section is first */
+	man_module->segment[SOF_MAN_SEGMENT_TEXT].file_offset = module->foffset;
+	man_module->segment[SOF_MAN_SEGMENT_TEXT].v_base_addr = module->file.text.start;
+
+	/* calculates those padding 0s by the start of next segment */
+	/* file_size is already aligned to MAN_PAGE_SIZE */
+	pages = module->file.text.file_size / MAN_PAGE_SIZE;
+
+	if (module->text_fixup_size == 0)
+		module->text_fixup_size = module->file.text.file_size;
+
+	/* check if text_file_size is bigger then text_fixup_size */
+	if (module->file.text.file_size > module->text_fixup_size) {
+		fprintf(stderr, "error: too small text size assigned!\n");
+		return -EINVAL;
+	}
+
+	man_module->segment[SOF_MAN_SEGMENT_TEXT].flags.r.length = pages;
+
+	/* Copy text sections content */
+	err = man_copy_elf_sections(image, module, &man_module->segment[SOF_MAN_SEGMENT_TEXT],
+				    module->file.text.first_section);
+	if (err)
+		return err;
+
+
+	/* data section */
+	man_module->segment[SOF_MAN_SEGMENT_RODATA].v_base_addr = module->file.data.start;
+	man_module->segment[SOF_MAN_SEGMENT_RODATA].file_offset = module->foffset +
+								  module->text_fixup_size;
+
+	/* file_size is already aligned to MAN_PAGE_SIZE */
+	pages = module->file.data.file_size / MAN_PAGE_SIZE;
+
+	man_module->segment[SOF_MAN_SEGMENT_RODATA].flags.r.length = pages;
+
+	/* Copy data sections content */
+	err = man_copy_elf_sections(image, module, &man_module->segment[SOF_MAN_SEGMENT_RODATA],
+				    module->file.data.first_section);
+	if (err)
+		return err;
+
+	/* bss is last */
+
+	/* I do not understand why only the section named .bss was taken into account. Other
+	 * sections of the same type were ignored (type = SHT_NOBITS, flags = SHF_ALLOC). I added
+	 * the reading of the .bss section here, to not change the behavior of the program.
+	 */
+	bss = NULL;
+
+	if (module->is_bootloader) {
+		/* Bootloader should not have .bss section. */
+		fprintf(stdout, "info: ignore .bss section for bootloader module\n");
+	} else {
+		err = elf_section_header_get_by_name(&module->file.elf, ".bss", &bss);
+		if (err)
+			fprintf(stderr, "warning: can't find '.bss' section in module %s.\n",
+				module->file.elf.filename);
+
+	}
+
+	man_module->segment[SOF_MAN_SEGMENT_BSS].file_offset = 0;
+	man_module->segment[SOF_MAN_SEGMENT_BSS].v_base_addr = 0;
+	pages = 0;
+
+	if (bss) {
+		man_module->segment[SOF_MAN_SEGMENT_BSS].v_base_addr =
+			uncache_to_cache(&image->adsp->mem.alias, bss->data.vaddr);
+
+		pages = DIV_ROUND_UP(bss->data.size, MAN_PAGE_SIZE);
+	}
+
+	man_module->segment[SOF_MAN_SEGMENT_BSS].flags.r.length = pages;
+	if (pages == 0) {
+		man_module->segment[SOF_MAN_SEGMENT_BSS].flags.ul = 0;
+		man_module->segment[SOF_MAN_SEGMENT_BSS].flags.r.type = SOF_MAN_SEGMENT_EMPTY;
+	}
+
+	if (man_module_validate(man_module) < 0)
+		return -EINVAL;
+
+	fprintf(stdout, "\n");
+
+	/* no need to update end for exec headers */
+	if (module->exec_header) {
+		image->image_end = FILE_TEXT_OFFSET_V1_5_SUE;
+		goto out;
+	}
+
+	/* round module end upto nearest page */
+	if (image->image_end % MAN_PAGE_SIZE) {
+		image->image_end = (image->image_end / MAN_PAGE_SIZE) + 1;
+		image->image_end *= MAN_PAGE_SIZE;
+	}
+
+out:
+	fprintf(stdout, " Total pages text %d data %d bss %d module file limit: 0x%x\n\n",
+		man_module->segment[SOF_MAN_SEGMENT_TEXT].flags.r.length,
+		man_module->segment[SOF_MAN_SEGMENT_RODATA].flags.r.length,
+		man_module->segment[SOF_MAN_SEGMENT_BSS].flags.r.length,
+		image->image_end);
+	return 0;
+}
+
+static int man_module_create_reloc(struct image *image, struct manifest_module *module,
+				   struct sof_man_module *man_module)
+{
+	/* create module and segments */
+	int err;
+
+	image->image_end = 0;
+
+	err = man_get_module_manifest(image, module, man_module);
+	if (err < 0)
+		return err;
+
+	/* stack size ??? convert sizes to PAGES */
+	man_module->instance_bss_size = 1;
+
+	/* max number of instances of this module ?? */
+	man_module->instance_max_count = 1;
+
+	module_print_zones(&module->file);
+
+	/* main module */
+	/* text section is first */
+	man_module->segment[SOF_MAN_SEGMENT_TEXT].file_offset =
+		module->foffset;
+	man_module->segment[SOF_MAN_SEGMENT_TEXT].v_base_addr = 0;
+	man_module->segment[SOF_MAN_SEGMENT_TEXT].flags.r.length = 0;
+
+	/* data section */
+	man_module->segment[SOF_MAN_SEGMENT_RODATA].v_base_addr = 0;
+	man_module->segment[SOF_MAN_SEGMENT_RODATA].file_offset = module->foffset;
+	man_module->segment[SOF_MAN_SEGMENT_RODATA].flags.r.length = module->file.data.file_size /
+								     MAN_PAGE_SIZE;
+
+	/* bss is last */
+	man_module->segment[SOF_MAN_SEGMENT_BSS].file_offset = 0;
+	man_module->segment[SOF_MAN_SEGMENT_BSS].v_base_addr = 0;
+	man_module->segment[SOF_MAN_SEGMENT_BSS].flags.r.length = 0;
+
+	fprintf(stdout, "\tNo\tAddress\t\tSize\t\tFile\tType\n");
+
+	assert((module->file.elf.file_size + module->foffset) <= image->adsp->image_size);
+	err = module_read_whole_elf(&module->file, image->fw_image + module->foffset,
+				    image->image_end - module->foffset);
+	if (err)
+		return err;
+
+	fprintf(stdout, "\t%d\t0x%8.8x\t0x%8.8zx\t0x%x\t%s\n", 0,
+		0, module->file.elf.file_size, 0, "DATA");
+
+	fprintf(stdout, "\n");
+	image->image_end = module->foffset + module->file.elf.file_size;
+
+	/* round module end up to nearest page */
+	if (image->image_end % MAN_PAGE_SIZE) {
+		image->image_end = (image->image_end / MAN_PAGE_SIZE) + 1;
+		image->image_end *= MAN_PAGE_SIZE;
+	}
+
+	fprintf(stdout, " Total pages text %d data %d bss %d module file limit: 0x%x\n\n",
+		man_module->segment[SOF_MAN_SEGMENT_TEXT].flags.r.length,
+		man_module->segment[SOF_MAN_SEGMENT_RODATA].flags.r.length,
+		man_module->segment[SOF_MAN_SEGMENT_BSS].flags.r.length,
+		image->image_end);
+	return 0;
+}
+
+static int man_write_unsigned_mod(struct image *image, int meta_start_offset,
+				  int meta_end_offset, size_t ext_file_size)
+{
+	int count;
+
+	/* write metadata file for unsigned FW */
+	count = fwrite(image->fw_image + meta_start_offset,
+		       ext_file_size, 1,
+		       image->out_man_fd);
+
+	/* did the metadata/manifest write succeed ? */
+	if (count != 1)
+		return file_error("failed to write meta", image->out_man_file);
+
+	fclose(image->out_man_fd);
+
+	/* now prepare the unsigned rimage */
+	count = fwrite(image->fw_image + meta_end_offset,
+		       image->image_end - meta_end_offset,
+		       1, image->out_unsigned_fd);
+
+	/* did the unsigned FW write succeed ? */
+	if (count != 1)
+		return file_error("failed to write firmware", image->out_unsigned_file);
+	fclose(image->out_unsigned_fd);
+
+	return 0;
+}
+
+static int man_write_fw_mod(struct image *image)
+{
+	int count;
+
+	/* write manifest and signed image */
+	count = fwrite(image->fw_image, image->image_end, 1, image->out_fd);
+
+	/* did the image write succeed ? */
+	if (count != 1)
+		return file_error("failed to write signed firmware", image->out_file);
+
+	return 0;
+}
+
+static int man_create_modules(struct image *image, struct sof_man_fw_desc *desc,
+			      int file_text_offset)
+{
+	struct manifest_module *module;
+	struct sof_man_module *man_module;
+	int err;
+	int i = 0, offset = 0;
+
+	/* if first module is executable then write before manifest */
+	if (image->adsp->exec_boot_ldr) {
+		man_module = (void *)desc + SOF_MAN_MODULE_OFFSET(0);
+		module = &image->module[0];
+
+		fprintf(stdout, "Module: %s used as executable header\n",
+			module->file.elf.filename);
+		module->exec_header = 1;
+
+		/* set module file offset */
+		module->foffset = 0;
+
+		err = man_module_create(image, module, man_module);
+		if (err < 0)
+			return err;
+
+		/* setup man_modules for missing exec loader module */
+		i = 1;
+		offset = 1;
+	}
+
+	for (; i < image->num_modules; i++) {
+		man_module = (void *)desc + SOF_MAN_MODULE_OFFSET(i - offset);
+
+		/* Some platforms dont have modules configuration in toml file */
+		if (image->adsp->modules) {
+			/* Use manifest created using toml files as template */
+			assert(i < image->adsp->modules->mod_man_count);
+			memcpy(man_module, &image->adsp->modules->mod_man[i], sizeof(*man_module));
+		}
+
+		module = &image->module[i];
+
+		if (i == 0)
+			module->foffset = file_text_offset;
+		else
+			module->foffset = image->image_end;
+
+		if (image->reloc)
+			err = man_module_create_reloc(image, module,
+						      man_module);
+		else
+			err = man_module_create(image, module, man_module);
+
+		if (err < 0)
+			return err;
+	}
+
+	return 0;
+}
+
+static void man_create_modules_in_config(struct image *image, struct sof_man_fw_desc *desc)
+{
+	struct fw_image_manifest_module *modules;
+	struct sof_man_module *man_module;
+	void *cfg_start;
+	int i;
+
+	modules = image->adsp->modules;
+	if (!modules)
+		return;
+
+	/* skip modules passed as parameters. Their manifests have already been copied by the
+	 * man_create_modules function. */
+	for (i = image->num_modules; i < modules->mod_man_count; i++) {
+		man_module = (void *)desc + SOF_MAN_MODULE_OFFSET(i);
+		memcpy(man_module, &modules->mod_man[i], sizeof(*man_module));
+	}
+
+	/* We need to copy the configurations for all modules. */
+	cfg_start = (void *)desc + SOF_MAN_MODULE_OFFSET(i);
+	memcpy(cfg_start, modules->mod_cfg, modules->mod_cfg_count * sizeof(struct sof_man_mod_config));
+
+	desc->header.num_module_entries = modules->mod_man_count;
+}
+
+static int man_hash_modules(struct image *image, struct sof_man_fw_desc *desc)
+{
+	struct sof_man_module *man_module;
+	size_t mod_offset, mod_size;
+	int i, ret = 0;
+
+	for (i = 0; i < image->num_modules; i++) {
+		man_module = (void *)desc + SOF_MAN_MODULE_OFFSET(i);
+
+		if (image->adsp->exec_boot_ldr && i == 0) {
+			fprintf(stdout, " module: no need to hash %s\n as its exec header\n",
+				man_module->name);
+			continue;
+		}
+
+		mod_offset = man_module->segment[SOF_MAN_SEGMENT_TEXT].file_offset;
+		mod_size = (man_module->segment[SOF_MAN_SEGMENT_TEXT].flags.r.length +
+			man_module->segment[SOF_MAN_SEGMENT_RODATA].flags.r.length) *
+			MAN_PAGE_SIZE;
+
+		assert((mod_offset + mod_size) <= image->adsp->image_size);
+
+		ret = hash_sha256(image->fw_image + mod_offset, mod_size, man_module->hash, sizeof(man_module->hash));
+		if (ret)
+			break;
+	}
+
+	return ret;
+}
+
+/* used by others */
+int man_write_fw_v1_5(struct image *image)
+{
+	struct sof_man_fw_desc *desc;
+	struct fw_image_manifest_v1_5 *m;
+	int ret;
+
+	/* init image */
+	ret = man_init_image_v1_5(image);
+	if (ret < 0)
+		goto err;
+
+	/* open ROM image */
+	ret = man_open_rom_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* open unsigned firmware */
+	ret = man_open_unsigned_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the manifest */
+	ret = man_open_manifest_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the module */
+	m = image->fw_image;
+	desc = image->fw_image + MAN_DESC_OFFSET_V1_5;
+
+	/* firmware and build version */
+	m->desc.header.major_version = image->fw_ver_major;
+	m->desc.header.minor_version = image->fw_ver_minor;
+	m->desc.header.hotfix_version = image->fw_ver_micro;
+	m->desc.header.build_version = image->fw_ver_build;
+
+	/* create each module */
+	m->desc.header.num_module_entries = image->num_modules;
+	ret = man_create_modules(image, desc, FILE_TEXT_OFFSET_V1_5);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, "Firmware completing manifest v1.5\n");
+
+	/* create structures from end of file to start of file */
+	ri_css_v1_5_hdr_create(image);
+
+	fprintf(stdout, "Firmware file size 0x%x page count %d\n",
+		FILE_TEXT_OFFSET_V1_5 - MAN_DESC_OFFSET_V1_5 + image->image_end,
+		desc->header.preload_page_count);
+
+	/* calculate hash for each module */
+	man_hash_modules(image, desc);
+
+	/* sign manifest */
+	ret = ri_manifest_sign_v1_5(image);
+	if (ret < 0)
+		goto err;
+
+	/* write the firmware */
+	ret = man_write_fw_mod(image);
+	if (ret < 0)
+		goto err;
+
+	/* write the unsigned files*/
+	ret = man_write_unsigned_mod(image, MAN_META_EXT_OFFSET_V1_5,
+				     MAN_FW_DESC_OFFSET_V1_5,
+				     sizeof(struct sof_man_adsp_meta_file_ext_v1_8));
+	if (ret < 0)
+		goto err;
+
+	fprintf(stdout, "Firmware manifest and signing completed !\n");
+	return 0;
+
+err:
+	free(image->rom_image);
+	free(image->fw_image);
+	unlink(image->out_file);
+	unlink(image->out_rom_file);
+	return ret;
+}
+
+/* used by others */
+int man_write_fw_v1_5_sue(struct image *image)
+{
+	struct fw_image_manifest_v1_5_sue *m;
+	uint32_t preload_size;
+	int ret;
+
+	/* init image */
+	ret = man_init_image_v1_5_sue(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the manifest */
+	ret = man_open_manifest_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the module */
+	m = image->fw_image + MAN_DESC_OFFSET_V1_5_SUE;
+
+	/* firmware and build version */
+	m->desc.header.major_version = image->fw_ver_major;
+	m->desc.header.minor_version = image->fw_ver_minor;
+	m->desc.header.hotfix_version = image->fw_ver_micro;
+	m->desc.header.build_version = image->fw_ver_build;
+
+	/* create each module - subtract the boot loader exec header */
+	m->desc.header.num_module_entries = image->num_modules - 1;
+	ret = man_create_modules(image, &m->desc, FILE_TEXT_OFFSET_V1_5_SUE);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, "Firmware completing manifest v1.5\n");
+
+	/* write preload page count */
+	preload_size = image->image_end - MAN_DESC_OFFSET_V1_5_SUE;
+	preload_size += MAN_PAGE_SIZE - (preload_size % MAN_PAGE_SIZE);
+	m->desc.header.preload_page_count = preload_size / MAN_PAGE_SIZE;
+
+	fprintf(stdout, "Firmware file size 0x%x page count %d\n",
+		FILE_TEXT_OFFSET_V1_5_SUE - MAN_DESC_OFFSET_V1_5_SUE +
+		image->image_end, m->desc.header.preload_page_count);
+
+	/* calculate hash for each module */
+	man_hash_modules(image, &m->desc);
+
+	/* write the firmware */
+	ret = man_write_fw_mod(image);
+	if (ret < 0)
+		goto err;
+
+	fprintf(stdout, "Firmware manifest and signing completed !\n");
+	return 0;
+
+err:
+	free(image->fw_image);
+	unlink(image->out_file);
+	return ret;
+}
+
+/* used by others */
+int man_write_fw_v1_8(struct image *image)
+{
+	struct sof_man_fw_desc *desc;
+	struct fw_image_manifest_v1_8 *m;
+	int ret;
+
+	/* init image */
+	ret = man_init_image_v1_8(image);
+	if (ret < 0)
+		goto err;
+
+	/* open ROM image */
+	ret = man_open_rom_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* open unsigned firmware */
+	ret = man_open_unsigned_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the manifest */
+	ret = man_open_manifest_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the module */
+	m = image->fw_image;
+	desc = image->fw_image + MAN_DESC_OFFSET_V1_8;
+
+	/* firmware and build version */
+	m->css.version.major_version = image->fw_ver_major;
+	m->css.version.minor_version = image->fw_ver_minor;
+	m->css.version.build_version = image->fw_ver_build;
+	m->desc.header.major_version = image->fw_ver_major;
+	m->desc.header.minor_version = image->fw_ver_minor;
+	m->desc.header.hotfix_version = image->fw_ver_micro;
+	m->desc.header.build_version = image->fw_ver_build;
+
+	/* create each module */
+	m->desc.header.num_module_entries = image->num_modules;
+	ret = man_create_modules(image, desc, FILE_TEXT_OFFSET_V1_8);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, "Firmware completing manifest v1.8\n");
+
+	/* create structures from end of file to start of file */
+	ri_adsp_meta_data_create_v1_8(image, MAN_META_EXT_OFFSET_V1_8,
+				      MAN_FW_DESC_OFFSET_V1_8);
+	ri_plat_ext_data_create(image);
+	ri_css_v1_8_hdr_create(image);
+	ri_cse_create(image);
+
+	fprintf(stdout, "Firmware file size 0x%x page count %d\n",
+		FILE_TEXT_OFFSET_V1_8 - MAN_DESC_OFFSET_V1_8 + image->image_end,
+		desc->header.preload_page_count);
+
+	/* calculate hash for each module */
+	man_hash_modules(image, desc);
+
+	/* calculate hash for ADSP meta data extension - 0x480 to end */
+	/* image_end is updated every time a section is added */
+	assert(image->image_end > MAN_FW_DESC_OFFSET_V1_8);
+	ret = hash_sha256(image->fw_image + MAN_FW_DESC_OFFSET_V1_8,
+			  image->image_end - MAN_FW_DESC_OFFSET_V1_8,
+			  m->adsp_file_ext.comp_desc[0].hash,
+			  sizeof(m->adsp_file_ext.comp_desc[0].hash));
+	if (ret)
+		goto err;
+
+	/* calculate hash for platform auth data - repeated in hash 2 and 4 */
+	assert(image->image_end > (MAN_FW_DESC_OFFSET_V1_8 +
+				   sizeof(struct sof_man_adsp_meta_file_ext_v1_8)));
+
+	ret = hash_sha256(image->fw_image + MAN_FW_DESC_OFFSET_V1_8,
+			  image->image_end - MAN_FW_DESC_OFFSET_V1_8,
+			  m->signed_pkg.module[0].hash,
+			  sizeof(m->signed_pkg.module[0].hash));
+	if (ret)
+		goto err;
+
+	/* hash values in reverse order */
+	bytes_swap(m->signed_pkg.module[0].hash, sizeof(m->signed_pkg.module[0].hash));
+
+	/* Copy module hash to partition_info */
+	assert(sizeof(m->partition_info.module[0].hash) == sizeof(m->signed_pkg.module[0].hash));
+	memcpy(m->partition_info.module[0].hash, m->signed_pkg.module[0].hash,
+	       sizeof(m->partition_info.module[0].hash));
+
+	/* sign manifest */
+	ret = ri_manifest_sign_v1_8(image);
+	if (ret < 0)
+		goto err;
+
+	/* write the firmware */
+	ret = man_write_fw_mod(image);
+	if (ret < 0)
+		goto err;
+
+	/* write the unsigned files*/
+	ret = man_write_unsigned_mod(image, MAN_META_EXT_OFFSET_V1_8,
+				     MAN_FW_DESC_OFFSET_V1_8,
+				     sizeof(struct sof_man_adsp_meta_file_ext_v1_8));
+	if (ret < 0)
+		goto err;
+
+	fprintf(stdout, "Firmware manifest and signing completed !\n");
+	return 0;
+
+err:
+	free(image->rom_image);
+	free(image->fw_image);
+	unlink(image->out_file);
+	unlink(image->out_rom_file);
+	return ret;
+}
+
+/* used to sign with MEU */
+int man_write_fw_meu_v1_5(struct image *image)
+{
+	const int meta_start_offset = image->meu_offset -
+		sizeof(struct sof_man_adsp_meta_file_ext_v1_8) - MAN_EXT_PADDING;
+	struct sof_man_adsp_meta_file_ext_v1_8 *meta;
+	struct sof_man_fw_desc *desc;
+	uint32_t preload_size;
+	int ret;
+
+	/* allocate image */
+	image->fw_image = calloc(image->adsp->image_size, 1);
+	if (!image->fw_image) {
+		ret = -ENOMEM;
+		goto err;
+	}
+
+	/* open unsigned firmware */
+	ret = man_open_unsigned_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the manifest */
+	ret = man_open_manifest_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the module */
+	meta = image->fw_image + meta_start_offset;
+	desc = image->fw_image + MAN_DESC_OFFSET_V1_5;
+
+	/* copy data */
+	memcpy(desc, &image->adsp->man_v1_5->desc,
+	       sizeof(struct sof_man_fw_desc));
+
+	/* firmware and build version */
+	desc->header.major_version = image->fw_ver_major;
+	desc->header.minor_version = image->fw_ver_minor;
+	desc->header.hotfix_version = image->fw_ver_micro;
+	desc->header.build_version = image->fw_ver_build;
+
+	/* create each module */
+	desc->header.num_module_entries = image->num_modules;
+	ret = man_create_modules(image, desc, FILE_TEXT_OFFSET_V1_5);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, "Firmware completing manifest v1.5\n");
+
+	/* create structures from end of file to start of file */
+	ri_adsp_meta_data_create_v1_8(image, meta_start_offset,
+				      image->meu_offset);
+
+	/* write preload page count */
+	preload_size = meta->comp_desc[0].limit_offset - MAN_DESC_OFFSET_V1_5;
+	preload_size += MAN_PAGE_SIZE - (preload_size % MAN_PAGE_SIZE);
+	desc->header.preload_page_count = preload_size / MAN_PAGE_SIZE;
+
+	/* calculate hash for each module */
+	man_hash_modules(image, desc);
+
+	/* calculate hash for ADSP meta data extension */
+	assert(image->meu_offset < image->image_end);
+	ret = hash_sha256(image->fw_image + image->meu_offset, image->image_end - image->meu_offset,
+			  meta->comp_desc[0].hash, sizeof(meta->comp_desc[0].hash));
+	if (ret)
+		goto err;
+
+	/* write the unsigned files */
+	ret = man_write_unsigned_mod(image, meta_start_offset,
+				     image->meu_offset,
+				     sizeof(struct sof_man_adsp_meta_file_ext_v1_8));
+	if (ret < 0)
+		goto err;
+
+	fprintf(stdout, "Firmware manifest completed!\n");
+	return 0;
+
+err:
+	free(image->fw_image);
+	unlink(image->out_file);
+	return ret;
+}
+
+/* used to sign with MEU */
+int man_write_fw_meu_v1_8(struct image *image)
+{
+	const int meta_start_offset = image->meu_offset -
+		sizeof(struct sof_man_adsp_meta_file_ext_v1_8) - MAN_EXT_PADDING;
+	struct sof_man_adsp_meta_file_ext_v1_8 *meta;
+	struct sof_man_fw_desc *desc;
+	uint32_t preload_size;
+	int ret;
+
+	/* allocate image */
+	image->fw_image = calloc(image->adsp->image_size, 1);
+	if (!image->fw_image) {
+		ret = -ENOMEM;
+		goto err;
+	}
+
+	/* open unsigned firmware */
+	ret = man_open_unsigned_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the manifest */
+	ret = man_open_manifest_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the module */
+	meta = image->fw_image + meta_start_offset;
+	desc = image->fw_image + MAN_DESC_OFFSET_V1_8;
+
+	/* copy data */
+	memcpy(meta, &image->adsp->man_v1_8->adsp_file_ext,
+	       sizeof(struct sof_man_adsp_meta_file_ext_v1_8));
+	memcpy(desc, &image->adsp->man_v1_8->desc,
+	       sizeof(struct sof_man_fw_desc));
+
+	/* firmware and build version */
+	desc->header.major_version = image->fw_ver_major;
+	desc->header.minor_version = image->fw_ver_minor;
+	desc->header.hotfix_version = image->fw_ver_micro;
+	desc->header.build_version = image->fw_ver_build;
+
+	/* create each module */
+	desc->header.num_module_entries = image->num_modules;
+	ret = man_create_modules(image, desc, FILE_TEXT_OFFSET_V1_8);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, "Firmware completing manifest v1.8\n");
+
+	/* create structures from end of file to start of file */
+	ri_adsp_meta_data_create_v1_8(image, meta_start_offset,
+				      image->meu_offset);
+
+	/* write preload page count */
+	preload_size = meta->comp_desc[0].limit_offset - MAN_DESC_OFFSET_V1_8;
+	preload_size += MAN_PAGE_SIZE - (preload_size % MAN_PAGE_SIZE);
+	desc->header.preload_page_count = preload_size / MAN_PAGE_SIZE;
+
+	/* calculate hash for each module */
+	man_hash_modules(image, desc);
+
+	/* calculate hash for ADSP meta data extension */
+	assert(image->meu_offset < image->image_end);
+	ret = hash_sha256(image->fw_image + image->meu_offset, image->image_end - image->meu_offset,
+			  meta->comp_desc[0].hash, sizeof(meta->comp_desc[0].hash));
+	if (ret)
+		goto err;
+
+	/* write the unsigned files */
+	ret = man_write_unsigned_mod(image, meta_start_offset,
+				     image->meu_offset,
+				     sizeof(struct sof_man_adsp_meta_file_ext_v1_8));
+	if (ret < 0)
+		goto err;
+
+	fprintf(stdout, "Firmware manifest completed!\n");
+	return 0;
+
+err:
+	free(image->fw_image);
+	unlink(image->out_file);
+	return ret;
+}
+
+/* used to sign with MEU */
+int man_write_fw_meu_v2_5(struct image *image)
+{
+	const int meta_start_offset = image->meu_offset -
+		sizeof(struct sof_man_adsp_meta_file_ext_v2_5) - MAN_EXT_PADDING;
+	struct sof_man_adsp_meta_file_ext_v2_5 *meta;
+	struct sof_man_fw_desc *desc;
+	uint32_t preload_size;
+	int ret;
+
+	/* allocate image */
+	image->fw_image = calloc(image->adsp->image_size, 1);
+	if (!image->fw_image) {
+		ret = -ENOMEM;
+		goto err;
+	}
+
+	/* open unsigned firmware */
+	ret = man_open_unsigned_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the manifest */
+	ret = man_open_manifest_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the module */
+	meta = image->fw_image + meta_start_offset;
+	desc = image->fw_image + MAN_DESC_OFFSET_V1_8;
+
+	/* copy data */
+	memcpy(meta, &image->adsp->man_v2_5->adsp_file_ext,
+	       sizeof(struct sof_man_adsp_meta_file_ext_v2_5));
+	memcpy(desc, &image->adsp->man_v2_5->desc,
+	       sizeof(struct sof_man_fw_desc));
+
+	/* firmware and build version */
+	desc->header.major_version = image->fw_ver_major;
+	desc->header.minor_version = image->fw_ver_minor;
+	desc->header.hotfix_version = image->fw_ver_micro;
+	desc->header.build_version = image->fw_ver_build;
+
+	/* create each module */
+	desc->header.num_module_entries = image->num_modules;
+	ret = man_create_modules(image, desc, FILE_TEXT_OFFSET_V1_8);
+	if (ret)
+		goto err;
+
+	/* platform config defines some modules except bringup & base modules */
+	man_create_modules_in_config(image, desc);
+
+	fprintf(stdout, "Firmware completing manifest v2.5\n");
+
+	/* create structures from end of file to start of file */
+	ri_adsp_meta_data_create_v2_5(image, meta_start_offset,
+				      image->meu_offset);
+
+	/* write preload page count */
+	preload_size = meta->comp_desc[0].limit_offset - MAN_DESC_OFFSET_V1_8;
+	preload_size += MAN_PAGE_SIZE - (preload_size % MAN_PAGE_SIZE);
+	desc->header.preload_page_count = preload_size / MAN_PAGE_SIZE;
+
+	/* calculate hash for each module */
+	man_hash_modules(image, desc);
+
+	/* calculate hash for ADSP meta data extension */
+	assert(image->meu_offset < image->image_end);
+	ret = hash_sha384(image->fw_image + image->meu_offset, image->image_end - image->meu_offset,
+			  meta->comp_desc[0].hash, sizeof(meta->comp_desc[0].hash));
+	if (ret)
+		goto err;
+
+	/* write the unsigned files */
+	ret = man_write_unsigned_mod(image, meta_start_offset,
+				     image->meu_offset,
+				     sizeof(struct sof_man_adsp_meta_file_ext_v2_5));
+	if (ret < 0)
+		goto err;
+
+	fprintf(stdout, "Firmware manifest completed!\n");
+	return 0;
+
+err:
+	free(image->fw_image);
+	unlink(image->out_file);
+	return ret;
+}
+
+/* used by others */
+int man_write_fw_v2_5(struct image *image)
+{
+	struct sof_man_fw_desc *desc;
+	struct fw_image_manifest_v2_5 *m;
+	int ret;
+
+	/* init image */
+	ret = man_init_image_v2_5(image);
+	if (ret < 0)
+		goto err;
+
+	/* use default meu offset for TGL if not provided */
+	if (!image->meu_offset)
+		image->meu_offset = MAN_FW_DESC_OFFSET_V2_5 - 0x10;
+
+	/* open ROM image */
+	ret = man_open_rom_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* open unsigned firmware */
+	ret = man_open_unsigned_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the manifest */
+	ret = man_open_manifest_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the module */
+	m = image->fw_image;
+	desc = image->fw_image + MAN_DESC_OFFSET_V1_8;
+
+	/* firmware and build version */
+	m->css.version.major_version = image->fw_ver_major;
+	m->css.version.minor_version = image->fw_ver_minor;
+	m->css.version.build_version = image->fw_ver_build;
+	m->desc.header.major_version = image->fw_ver_major;
+	m->desc.header.minor_version = image->fw_ver_minor;
+	m->desc.header.hotfix_version = image->fw_ver_micro;
+	m->desc.header.build_version = image->fw_ver_build;
+
+	/* create each module */
+	m->desc.header.num_module_entries = image->num_modules;
+	ret = man_create_modules(image, desc, FILE_TEXT_OFFSET_V1_8);
+	if (ret)
+		goto err;
+
+	/* platform config defines some modules except bringup & base modules */
+	man_create_modules_in_config(image, desc);
+
+	fprintf(stdout, "Firmware completing manifest v2.5\n");
+
+	/* create structures from end of file to start of file */
+	ri_adsp_meta_data_create_v2_5(image, MAN_META_EXT_OFFSET_V2_5,
+			image->meu_offset);
+	ri_plat_ext_data_create_v2_5(image);
+	ri_css_v2_5_hdr_create(image);
+	ri_cse_create_v2_5(image);
+
+	fprintf(stdout, "Firmware file size 0x%x page count %d\n",
+		FILE_TEXT_OFFSET_V1_8 - MAN_DESC_OFFSET_V1_8 + image->image_end,
+		desc->header.preload_page_count);
+
+	/* calculate hash for each module */
+	man_hash_modules(image, desc);
+
+	/* calculate hash inside ADSP meta data extension for padding to end */
+	assert(image->meu_offset < image->image_end);
+	ret = hash_sha384(image->fw_image + image->meu_offset, image->image_end - image->meu_offset,
+			  m->adsp_file_ext.comp_desc[0].hash,
+			  sizeof(m->adsp_file_ext.comp_desc[0].hash));
+	if (ret)
+		goto err;
+
+	/* mue writes 0xff to 16 bytes of padding */
+	memset(m->reserved, 0xff, 16);
+
+	/* calculate hash inside ext info 16 of sof_man_adsp_meta_file_ext_v2_5 */
+	assert((MAN_META_EXT_OFFSET_V2_5 + sizeof(struct sof_man_adsp_meta_file_ext_v2_5)) <
+	       image->image_end);
+
+	ret = hash_sha384(image->fw_image + MAN_META_EXT_OFFSET_V2_5,
+			  sizeof(struct sof_man_adsp_meta_file_ext_v2_5),
+			  m->signed_pkg.module[0].hash, sizeof(m->signed_pkg.module[0].hash));
+	if (ret)
+		goto err;
+
+	/* hash values in reverse order */
+	bytes_swap(m->signed_pkg.module[0].hash, sizeof(m->signed_pkg.module[0].hash));
+
+	/* sign manifest */
+	ret = ri_manifest_sign_v2_5(image);
+	if (ret < 0)
+		goto err;
+
+#if 0
+	/* calculate hash - SHA384 on CAVS2_5+ */
+	module_sha384_create(image);
+	module_sha_update(image, image->fw_image,
+			sizeof(struct CsePartitionDirHeader_v2_5) +
+			sizeof(struct CsePartitionDirEntry) * 3);
+	module_sha_update(image, image->fw_image + 0x4c0, image->image_end - 0x4c0);
+	module_sha_complete(image, hash);
+
+	/* hash values in reverse order */
+	for (i = 0; i < SOF_MAN_MOD_SHA384_LEN; i++) {
+		m->info_0x16.hash[i] =
+			hash[SOF_MAN_MOD_SHA384_LEN - 1 - i];
+	}
+#endif
+	/* write the firmware */
+	ret = man_write_fw_mod(image);
+	if (ret < 0)
+		goto err;
+
+	/* write the unsigned files*/
+	ret = man_write_unsigned_mod(image, MAN_META_EXT_OFFSET_V2_5,
+				     MAN_FW_DESC_OFFSET_V2_5,
+				     sizeof(struct sof_man_adsp_meta_file_ext_v2_5));
+	if (ret < 0)
+		goto err;
+
+	fprintf(stdout, "Firmware manifest and signing completed !\n");
+	return 0;
+
+err:
+	free(image->rom_image);
+	free(image->fw_image);
+	unlink(image->out_file);
+	unlink(image->out_rom_file);
+	return ret;
+}
+
+static int man_init_image_ace_v1_5(struct image *image)
+{
+	/* allocate image and copy template manifest */
+	image->fw_image = calloc(image->adsp->image_size, 1);
+	if (!image->fw_image)
+		return -ENOMEM;
+
+	memcpy(image->fw_image, image->adsp->man_ace_v1_5,
+	       sizeof(struct fw_image_manifest_ace_v1_5));
+
+	return 0;
+}
+
+int man_write_fw_ace_v1_5(struct image *image)
+{
+	struct hash_context hash;
+	struct sof_man_fw_desc *desc;
+	struct fw_image_manifest_ace_v1_5 *m;
+	int ret;
+
+	/* init image */
+	ret = man_init_image_ace_v1_5(image);
+	if (ret < 0)
+		goto err;
+
+	/* use default meu offset for TGL if not provided */
+	if (!image->meu_offset)
+		image->meu_offset = MAN_FW_DESC_OFFSET_ACE_V1_5 - 0x10;
+
+	/* open ROM image */
+	ret = man_open_rom_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* open unsigned firmware */
+	ret = man_open_unsigned_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the manifest */
+	ret = man_open_manifest_file(image);
+	if (ret < 0)
+		goto err;
+
+	/* create the module */
+	m = image->fw_image;
+	desc = image->fw_image + MAN_DESC_OFFSET_V1_8;
+
+	/* firmware and build version */
+	m->css.version.major_version = image->fw_ver_major;
+	m->css.version.minor_version = image->fw_ver_minor;
+	m->css.version.build_version = image->fw_ver_build;
+	m->desc.header.major_version = image->fw_ver_major;
+	m->desc.header.minor_version = image->fw_ver_minor;
+	m->desc.header.hotfix_version = image->fw_ver_micro;
+	m->desc.header.build_version = image->fw_ver_build;
+
+	m->desc.header.feature_mask = 0x2; // -> should be feature mask - to fix
+	m->desc.header.fw_image_flags = 0x2; // -> should be feature mask - to fix
+	m->desc.header.fw_compat = 0x100000; // -> PUT PROPER STRUCT
+
+	/* create each module */
+	m->desc.header.num_module_entries = image->num_modules;
+	ret = man_create_modules(image, desc, FILE_TEXT_OFFSET_V1_8);
+	if (ret)
+		goto err;
+
+	/* platform config defines some modules except bringup & base modules */
+	man_create_modules_in_config(image, desc);
+
+	fprintf(stdout, "Firmware completing manifest v2.5\n");
+
+	/* create structures from end of file to start of file */
+	ri_adsp_meta_data_create_v2_5(image, MAN_META_EXT_OFFSET_ACE_V1_5,
+			image->meu_offset);
+	ri_plat_ext_data_create_ace_v1_5(image);
+	ri_css_v2_5_hdr_create(image);
+	ri_cse_create_ace_v1_5(image);
+
+	fprintf(stdout, "Firmware file size 0x%x page count %d\n",
+		FILE_TEXT_OFFSET_V1_8 - MAN_DESC_OFFSET_V1_8 + image->image_end,
+		desc->header.preload_page_count);
+
+	/* calculate hash for each module */
+	man_hash_modules(image, desc);
+
+	/* calculate hash inside ADSP meta data extension for padding to end */
+	assert(image->meu_offset < image->image_end);
+	ret = hash_sha384(image->fw_image + image->meu_offset, image->image_end - image->meu_offset,
+			  m->adsp_file_ext.comp_desc[0].hash,
+			  sizeof(m->adsp_file_ext.comp_desc[0].hash));
+	if (ret)
+		goto err;
+
+	/* mue writes 0xff to 16 bytes of padding */
+	memset(m->reserved, 0xff, 16);
+
+	/* calculate hash inside ext info 16 of sof_man_adsp_meta_file_ext_v2_5 */
+	assert((MAN_META_EXT_OFFSET_ACE_V1_5 + sizeof(struct sof_man_adsp_meta_file_ext_v2_5)) <
+	       image->image_end);
+
+	ret = hash_sha384(image->fw_image + MAN_META_EXT_OFFSET_ACE_V1_5,
+			  sizeof(struct sof_man_adsp_meta_file_ext_v2_5),
+			  m->signed_pkg.module[0].hash, sizeof(m->signed_pkg.module[0].hash));
+	if (ret)
+		goto err;
+
+	/* hash values in reverse order */
+	bytes_swap(m->signed_pkg.module[0].hash, sizeof(m->signed_pkg.module[0].hash));
+
+	/* calculate hash - SHA384 on CAVS2_5+ */
+	hash_sha384_init(&hash);
+	hash_update(&hash, image->fw_image,
+		    sizeof(struct CsePartitionDirHeader_v2_5) +
+		    sizeof(struct CsePartitionDirEntry) * 3);
+
+	hash_update(&hash, image->fw_image + 0x4c0, image->image_end - 0x4c0);
+	hash_finalize(&hash);
+
+	/* hash values in reverse order */
+	ret = hash_get_digest(&hash, m->info_0x16.hash, sizeof(m->info_0x16.hash));
+	if (ret < 0)
+		goto err;
+	bytes_swap(m->info_0x16.hash, sizeof(m->info_0x16.hash));
+
+	/* sign manifest */
+	ret = ri_manifest_sign_ace_v1_5(image);
+	if (ret < 0)
+		goto err;
+
+	/* write the firmware */
+	ret = man_write_fw_mod(image);
+	if (ret < 0)
+		goto err;
+
+	/* write the unsigned files*/
+	ret = man_write_unsigned_mod(image, MAN_META_EXT_OFFSET_ACE_V1_5,
+				     MAN_FW_DESC_OFFSET_ACE_V1_5,
+				     sizeof(struct sof_man_adsp_meta_file_ext_v2_5));
+	if (ret < 0)
+		goto err;
+
+	fprintf(stdout, "Firmware manifest and signing completed !\n");
+	return 0;
+
+err:
+	free(image->rom_image);
+	free(image->fw_image);
+	unlink(image->out_file);
+	unlink(image->out_rom_file);
+	return ret;
+}
+
+int verify_image(struct image *image)
+{
+	FILE *in_file;
+	int ret;
+	void *buffer;
+	size_t size, read, i;
+
+	/* is verify supported for target ? */
+	if (!image->adsp->verify_firmware) {
+		fprintf(stderr, "error: verify not supported for target\n");
+		return -EINVAL;
+	}
+
+	/* open image for reading */
+	in_file = fopen(image->verify_file, "rb");
+	if (!in_file)
+		return file_error("unable to open file for reading", image->verify_file);
+
+	/* get file size */
+	ret = get_file_size(in_file, image->verify_file, &size);
+	if (ret < 0) {
+		goto out;
+	}
+
+	/* allocate buffer for parsing */
+	buffer = malloc(size);
+	if (!buffer) {
+		ret = -ENOMEM;
+		goto out;
+	}
+
+	/* find start of fw image and verify */
+	read = fread(buffer, 1, size, in_file);
+	if (read != size) {
+		ret = file_error("unable to read whole file", image->verify_file);
+		goto out;
+	}
+	for (i = 0; i < size; i += sizeof(uint32_t)) {
+		/* find CSE header marker "$CPD" */
+		if (*(uint32_t *)(buffer + i) == CSE_HEADER_MAKER) {
+			image->fw_image = buffer + i;
+			ret = image->adsp->verify_firmware(image);
+			goto out;
+		}
+	}
+
+	/* no header found */
+	fprintf(stderr, "error: could not find valid CSE header $CPD in %s\n",
+		image->verify_file);
+out:
+	fclose(in_file);
+	return 0;
+}
+
+
+int resign_image(struct image *image)
+{
+	int key_size, key_file_size;
+	void *buffer = NULL;
+	size_t size, read;
+	FILE *in_file;
+	int ret, i;
+
+	/* open image for reading */
+	in_file = fopen(image->in_file, "rb");
+	if (!in_file)
+		return file_error("unable to open file for reading", image->in_file);
+
+	/* get file size */
+	ret = get_file_size(in_file, image->in_file, &size);
+	if (ret < 0) {
+		goto out;
+	}
+
+	/* allocate buffer for parsing */
+	buffer = malloc(size);
+	if (!buffer) {
+		ret = -ENOMEM;
+		goto out;
+	}
+
+	/* read file into buffer */
+	read = fread(buffer, 1, size, in_file);
+	if (read != size) {
+		ret = file_error("unable to read whole file", image->in_file);
+		goto out;
+	}
+
+	fclose(in_file);
+
+	for (i = 0; i < size; i += sizeof(uint32_t)) {
+		/* find CSE header marker "$CPD" */
+		if (*(uint32_t *)(buffer + i) == CSE_HEADER_MAKER) {
+			image->fw_image = buffer + i;
+			break;
+		}
+	}
+
+	if (i >= size) {
+		fprintf(stderr, "error: didn't found header marker %d\n", i);
+		ret = -EINVAL;
+		goto out;
+	}
+
+	image->image_end = size;
+
+	/* check that key size matches */
+	if (image->adsp->man_v2_5) {
+		key_size = 384;
+	} else {
+		key_size = 256;
+	}
+
+	key_file_size = get_key_size(image);
+
+	if (key_file_size > key_size) {
+		fprintf(stderr, "error: key size %d is longer than original key %d\n",
+			key_file_size, key_size);
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/* resign */
+	if (image->adsp->man_v1_5)
+		ret = ri_manifest_sign_v1_5(image);
+	else if (image->adsp->man_v1_8)
+		ret = ri_manifest_sign_v1_8(image);
+	else if (image->adsp->man_v2_5)
+		ret = ri_manifest_sign_v2_5(image);
+	else
+		ret = -EINVAL;
+
+	if (ret < 0) {
+		fprintf(stderr, "error: unable to sign image\n");
+		goto out;
+	}
+
+	/* open outfile for writing */
+	unlink(image->out_file);
+	image->out_fd = fopen(image->out_file, "wb");
+	if (!image->out_fd) {
+		ret = file_error("unable to open file for writting", image->out_file);
+		goto out;
+	}
+
+	man_write_fw_mod(image);
+
+out:
+	free(buffer);
+	return ret;
+}
diff --git a/tools/rimage/src/misc_utils.c b/tools/rimage/src/misc_utils.c
new file mode 100644
index 000000000000..2c0146f5bdd9
--- /dev/null
+++ b/tools/rimage/src/misc_utils.c
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright(c) 2018-2023 Intel Corporation. All rights reserved.
+ *
+ * Author: Adrian Warecki <adrian.warecki@intel.com>
+ */
+
+#include <stdio.h>
+#include <rimage/misc_utils.h>
+
+void bytes_swap(uint8_t *ptr, uint32_t size)
+{
+	uint8_t tmp;
+	uint32_t index;
+
+	for (index = 0; index < (size / 2); index++) {
+		tmp = ptr[index];
+		ptr[index] = ptr[size - 1 - index];
+		ptr[size - 1 - index] = tmp;
+	}
+}
+
+void print_enum(unsigned long value, const struct name_val *values)
+{
+	while (values->name) {
+		if (values->value == value) {
+			fprintf(stdout, "%s\n", values->name);
+			return;
+		}
+		
+		values++;
+	}
+
+	printf("Unknown: 0x%lx\n", value);
+}
+
+void print_flags(unsigned long value, const struct name_val *flags)
+{
+	while (flags->name) {
+		if (value & flags->value) {
+			fprintf(stdout, "%s ", flags->name);
+			value &= ~flags->value;
+		}
+
+		flags++;
+	}
+
+	if (value)
+		fprintf(stdout, "+ 0x%lx", value);
+	printf("\n");
+}
diff --git a/tools/rimage/src/module.c b/tools/rimage/src/module.c
new file mode 100644
index 000000000000..0fb4de075de7
--- /dev/null
+++ b/tools/rimage/src/module.c
@@ -0,0 +1,503 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright(c) 2023 Intel Corporation. All rights reserved.
+ *
+ * Author: Adrian Warecki <adrian.warecki@intel.com>
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <assert.h>
+
+#include <rimage/module.h>
+#include <rimage/elf_file.h>
+#include <rimage/file_utils.h>
+#include <rimage/rimage.h>
+
+
+int module_read_section(const struct module *module, const struct module_section *section,
+			void *buffer, const size_t size)
+{
+	return elf_section_read_content(&module->elf, section->header, buffer, size);
+}
+
+int module_write_section(const struct module *module, const struct module_section *section,
+			 const int padding, FILE *out_file, const char *filename)
+{
+	int ret;
+	struct elf_section section_data;
+	size_t count;
+	char padding_buf[4];
+
+	ret = elf_section_read(&module->elf, section->header, &section_data);
+	if (ret)
+		return ret;
+
+	/* write out section data */
+	count = fwrite(section_data.data, section->size, 1, out_file);
+	if (count != 1) {
+		ret = file_error("cant write section", filename);
+		goto out;
+	}
+
+	/* write padding data */
+	if (padding) {
+		assert(padding <= sizeof(padding_buf));
+
+		memset(padding_buf, 0, padding);
+		count = fwrite(padding_buf, padding, 1, out_file);
+		if (count != 1) {
+			ret = file_error("cant write padding", filename);
+			goto out;
+		}
+	}
+
+out:
+	elf_section_free(&section_data);
+	return ret;
+}
+
+int module_read_whole_elf(const struct module *module, void *buffer, size_t size)
+{
+	int ret;
+	size_t count;
+
+	if (module->elf.file_size > size) {
+		fprintf(stderr, "error: Output buffer too small.\n");
+		return -ENOSPC;
+	}
+
+	/* read in file data */
+	ret = fseek(module->elf.file, 0, SEEK_SET);
+	if (ret)
+		return file_error("can't seek set", module->elf.filename);
+
+	count = fread(buffer, module->elf.file_size, 1, module->elf.file);
+	if (count != 1)
+		return file_error("can't read data", module->elf.filename);
+
+	return ret;
+}
+
+int module_write_whole_elf(const struct module *module, FILE *out_file, const char *filename)
+{
+	int ret;
+	char *buffer;
+	size_t count;
+
+	/* alloc data data */
+	buffer = calloc(1, module->elf.file_size);
+	if (!buffer)
+		return -ENOMEM;
+
+	ret = module_read_whole_elf(module, buffer, module->elf.file_size);
+	if (ret)
+		goto out;
+
+	/* write out section data */
+	count = fwrite(buffer, module->elf.file_size, 1, out_file);
+	if (count != 1) {
+		ret = file_error("can't write data", "");// TODO: image->out_file);
+		goto out;
+	}
+
+out:
+	free(buffer);
+	return ret;
+}
+
+void module_print_zones(const struct module *module)
+{
+	fprintf(stdout, "\n\tTotals\tStart\t\tEnd\t\tSize");
+
+	fprintf(stdout, "\n\tTEXT\t0x%8.8x\t0x%8.8x\t0x%x\n",
+		module->text.start, module->text.end,
+		module->text.end - module->text.start);
+	fprintf(stdout, "\tDATA\t0x%8.8x\t0x%8.8x\t0x%x\n",
+		module->data.start, module->data.end,
+		module->data.end - module->data.start);
+	fprintf(stdout, "\tBSS\t0x%8.8x\t0x%8.8x\t0x%x\n\n",
+		module->bss.start, module->bss.end,
+		module->bss.end - module->bss.start);
+}
+
+/**
+ * Print a list of valid program headers
+ * 
+ * @param module pointer to a module structure
+ */
+static void module_print_programs(const struct module *module)
+{
+	const Elf32_Phdr *header;
+	int i;
+
+	/* check each program */
+	for (i = 0; i < module->elf.header.phnum; i++) {
+		header = &module->elf.programs[i];
+
+		if (header->filesz == 0 || header->type != PT_LOAD)
+			continue;
+
+		fprintf(stdout, "%s program-%d:\n", module->elf.filename, i);
+		elf_program_header_print(header);
+	}
+}
+
+/**
+ * Goes through program headers array to find the physical address based on the virtual address.
+ * 
+ * @param elf elf file structure
+ * @param vaddr virtual address
+ * @return physical address when success, virtual address on error
+ */
+static uint32_t find_physical_address(struct elf_file *file, size_t vaddr)
+{
+	uint16_t i;
+	const Elf32_Phdr *prog;
+
+	for (i = 0; i < file->programs_count; i++) {
+		prog = &file->programs[i];
+
+		if (prog->type != PT_LOAD)
+			continue;
+
+		if (vaddr >= prog->vaddr && vaddr < (prog->vaddr + file->programs[i].memsz))
+			return file->programs[i].paddr + vaddr - prog->vaddr;
+	}
+
+	return vaddr;
+}
+
+unsigned long uncache_to_cache(const struct memory_alias *alias, unsigned long address)
+{
+	return (address & ~alias->mask) | alias->cached;
+}
+
+/**
+ * Checks if the section is placed in the rom memory address space
+ * 
+ * @param config Memory configuration structure
+ * @param section section to be checked
+ * @return true if section is placed in rom memory address space
+ */
+static bool section_is_rom(const struct memory_config *config,
+			   const struct elf_section_header *section)
+{
+	uint32_t sect_start, sect_end;
+	uint32_t rom_start, rom_end;
+
+	sect_start = section->data.vaddr;
+	sect_end = sect_start + section->data.size;
+
+	rom_start = config->zones[SOF_FW_BLK_TYPE_ROM].base;
+	rom_end = rom_start + config->zones[SOF_FW_BLK_TYPE_ROM].size;
+
+	if (sect_end <= rom_start || sect_start >= rom_end)
+		return false;
+	if (sect_start >= rom_start && sect_end <= rom_end)
+		return true;
+
+	fprintf(stderr, "Warning! Section %s partially overlaps with rom memory.\n", section->name);
+	return false;
+}
+
+/**
+ * Initialize module_sections_info structure
+ * 
+ * @param info Pointer to a module_sections_info structure
+ */
+static void sections_info_init(struct module_sections_info *info)
+{
+	memset(info, 0, sizeof(*info));
+
+	info->start = UINT32_MAX;
+}
+
+/**
+ * Adds section to module_sections_info structure
+ * 
+ * @param info Pointer to a module_sections_info structure
+ * @param address section address
+ * @param size section size
+ */
+static void sections_info_add(struct module_sections_info *info, const uint32_t address,
+			      const size_t size)
+{
+	const uint32_t end = address + size;
+
+	if (address < info->start)
+		info->start = address;
+
+	if (end > info->end)
+		info->end = end;
+
+	info->size += size;
+	info->count++;
+}
+
+/**
+ * Calculates file size after adding all sections
+ * 
+ * @param info Pointer to a module_sections_info structure
+ */
+static void sections_info_finalize(struct module_sections_info *info)
+{
+	info->file_size = info->end - info->start;
+
+	/* file sizes round up to nearest page */
+	info->file_size = (info->file_size + MAN_PAGE_SIZE - 1) & ~(MAN_PAGE_SIZE - 1);
+}
+
+/**
+ * Checks the section header (type and flags) to determine the section type.
+ * 
+ * @param section section header
+ * @return enum module_section_type
+ */
+static enum module_section_type get_section_type(const struct elf_section_header *section)
+{
+	switch (section->data.type) {
+	case SHT_INIT_ARRAY:
+		/* fall through */
+	case SHT_PROGBITS:
+		/* text or data */
+		return (section->data.flags & SHF_EXECINSTR) ? MST_TEXT : MST_DATA;
+
+	case SHT_NOBITS:
+		/* bss or heap */
+		return MST_BSS;
+
+	case SHT_NOTE:
+		return MST_NOTE;
+
+	default:
+		return MST_UNKNOWN;
+	}
+}
+
+void module_parse_sections(struct module *module, const struct memory_config *mem_cfg, bool verbose)
+{
+	const uint32_t valid = (SHF_WRITE | SHF_ALLOC | SHF_EXECINSTR);
+	uint16_t i;
+
+	struct module_section *out_section = module->sections;
+
+	fprintf(stdout, "  Found %d sections, listing valid sections...\n",
+		module->elf.sections_count);
+
+	fprintf(stdout, "\tNo\tLMA\t\tVMA\t\tEnd\t\tSize\tType\tName\n");
+
+	/* parse each section */
+	for (i = 0; i < module->elf.sections_count; i++) {
+		const struct elf_section_header *sect = &module->elf.sections[i];
+		struct module_sections_info *info = NULL;
+
+		/* only write valid sections */
+		if (!(sect->data.flags & valid))
+			continue;
+
+		/* Comment from fix_elf_addrs.py:
+		 * The sof-derived linker scripts currently emit some zero-length sections
+		 * at address zero. This is benign, and the linker is happy
+		 *
+		 * So we gleefully skip them. */
+		if (sect->data.size == 0)
+			continue;
+
+		out_section->header = sect;
+		out_section->size = sect->data.size;
+		out_section->type = get_section_type(sect);
+		out_section->rom = section_is_rom(mem_cfg, sect);
+		out_section->address = sect->data.vaddr;
+		out_section->load_address = find_physical_address(&module->elf, sect->data.vaddr);
+
+		/* Don't convert ROM addresses, ROM sections aren't included in the output image */
+		if (!out_section->rom) {
+			/* Walk the sections in the ELF file, changing the VMA/LMA of each uncached section
+			 * to the equivalent address in the cached area of memory. */
+			out_section->address = uncache_to_cache(&mem_cfg->alias,
+								out_section->address);
+			out_section->load_address = uncache_to_cache(&mem_cfg->alias,
+								     out_section->load_address);
+		}
+
+		fprintf(stdout, "\t%d\t0x%8.8x\t0x%8.8x\t0x%8.8zx\t0x%zx", i,
+			out_section->load_address, out_section->address,
+			out_section->address + out_section->size, out_section->size);
+
+
+		switch (out_section->type) {
+		case MST_DATA:
+			info = &module->data;
+			fprintf(stdout, "\tDATA");
+			break;
+
+		case MST_TEXT:
+			info = &module->text;
+			fprintf(stdout, "\tTEXT");
+			break;
+
+		case MST_BSS:
+			info = &module->bss;
+			fprintf(stdout, "\tBSS");
+			break;
+
+		case MST_NOTE:
+			fprintf(stdout, "\tNOTE");
+			break;
+
+		default:
+			break;
+		}
+
+		if (out_section->rom) {
+			/* ROM sections aren't included in the output image */
+			fprintf(stdout, " ROM");
+		} else {
+			/* Add section to list */
+			if (info) {
+				sections_info_add(info, out_section->load_address, out_section->size);
+				out_section->next_section = info->first_section;
+				info->first_section = out_section;
+			}
+		}
+
+		module->num_sections++;
+		out_section++;
+
+		/* section name */
+		fprintf(stdout, "\t%s\n", sect->name);
+
+		if (verbose) {
+			fprintf(stdout, "%s section-%d:\n", module->elf.filename, i);
+			elf_section_header_print(sect);
+		}
+	}
+
+	sections_info_finalize(&module->text);
+	sections_info_finalize(&module->data);
+	sections_info_finalize(&module->bss);
+
+	size_t fw_size = module->data.size + module->text.size;
+
+	fprintf(stdout, " module: input size %zd (0x%zx) bytes %d sections\n",
+		fw_size, fw_size, module->num_sections);
+	fprintf(stdout, " module: text %zu (0x%zx) bytes\n"
+		"\tdata %zu (0x%zx) bytes\n"
+		"\tbss  %zu (0x%zx) bytes\n\n",
+		module->text.size, module->text.size,
+		module->data.size, module->data.size,
+		module->bss.size, module->bss.size);
+}
+
+int module_open(struct module *module, const char *filename, const bool verbose)
+{
+	int ret;
+
+	memset(module, 0, sizeof(*module));
+
+	ret = elf_open(&module->elf, filename);
+	if (ret)
+		return ret;
+
+	if (verbose) {
+		fprintf(stdout, "%s elf header:\n", module->elf.filename);
+		elf_header_print(&module->elf);
+		module_print_programs(module);
+	}
+
+	module->sections = calloc(module->elf.sections_count, sizeof(struct module_section));
+	if (!module->sections) {
+		elf_free(&module->elf);
+		return -ENOMEM;
+	}
+
+	sections_info_init(&module->data);
+	sections_info_init(&module->bss);
+	sections_info_init(&module->text);
+
+	return 0;
+}
+
+void module_close(struct module *module)
+{
+	elf_free(&module->elf);
+}
+
+/**
+ * Checks if the contents of the section overlaps
+ * 
+ * @param a first section to check
+ * @param b second section to check
+ * @return true if space of a sections overlap
+ */
+static bool section_check_overlap(const struct module_section *a, const struct module_section *b)
+{
+	uint32_t a_start = a->address;
+	uint32_t a_end = a_start + a->size;
+
+	uint32_t b_start = b->address;
+	uint32_t b_end = b_start + b->size;
+
+	/* is section start overlapping ? */
+	return (a_start >= b_start && a_start < b_end) ||
+	/* is section end overlapping ? */
+	       (a_end > b_start && a_end <= b_end);
+}
+
+/**
+ * Checks if the contents of the modules overlaps
+ * 
+ * @param mod first module to check
+ * @param mod2 second module to check
+ * @return error code
+ */
+static int module_check_overlap(const struct module *mod, const struct module *mod2)
+{
+	unsigned int i, j;
+
+	/* for each section from first module */
+	for (i = 0; i < mod->num_sections; i++) {
+		/* and for each section from second module */
+		for (j = 0; j < mod2->num_sections; j++) {
+			const struct module_section *section = &mod->sections[i];
+			const struct module_section *section2 = &mod2->sections[j];
+
+			/* don't compare section with itself */
+			if (section == section2)
+				continue;
+
+			/* check section overlapping */
+			if (section_check_overlap(section, section2)) {
+
+				fprintf(stderr, "error: Detected overlapping sections:\n");
+				fprintf(stderr, "\t[0x%x : 0x%zx] %s from %s\n", section->address,
+					section->address + section->size - 1,
+					section->header->name, mod->elf.filename);
+				fprintf(stderr, "\t[0x%x : 0x%zx] %s from %s\n", section2->address,
+					section2->address + section2->size - 1,
+					section2->header->name, mod2->elf.filename);
+
+				return -EINVAL;
+			}
+		}
+	}
+
+	return 0;
+}
+
+int modules_validate(const struct image *image)
+{
+	int i, j, ret;
+
+	for (i = 0; i < image->num_modules; i++) {
+		for (j = 0; j < image->num_modules; j++) {
+			ret = module_check_overlap(&image->module[i].file, &image->module[j].file);
+			if (ret)
+				return ret;
+		}
+	}
+
+	return 0;
+}
diff --git a/tools/rimage/src/pkcs1_5.c b/tools/rimage/src/pkcs1_5.c
new file mode 100644
index 000000000000..de063ee03bec
--- /dev/null
+++ b/tools/rimage/src/pkcs1_5.c
@@ -0,0 +1,970 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2017 Intel Corporation. All rights reserved.
+//
+// Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+//         Keyon Jie <yang.jie@linux.intel.com>
+
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/bio.h>
+#include <openssl/sha.h>
+#include <openssl/objects.h>
+#include <openssl/bn.h>
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+#include <openssl/core_names.h>
+#endif
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
+#include <rimage/rimage.h>
+#include <rimage/css.h>
+#include <rimage/manifest.h>
+#include <rimage/misc_utils.h>
+#include <rimage/file_utils.h>
+#include <rimage/hash.h>
+
+#define DEBUG_PKCS	0
+
+enum manver {
+	V15 = 0,
+	V18 = 1,
+	V25 = 2,
+	VACE15 = 3
+};
+
+static int rimage_read_key(EVP_PKEY **privkey, struct image *image)
+{
+	char path[256];
+	FILE *fp;
+
+	/* requires private key */
+	if (!image->key_name) {
+		fprintf(stderr, "error: no private key set \n");
+		return -EINVAL;
+	}
+
+	/* create new key */
+	*privkey = EVP_PKEY_new();
+	if (!(*privkey))
+		return -ENOMEM;
+
+	/* load in RSA private key from PEM file */
+	memset(path, 0, sizeof(path));
+	strncpy(path, image->key_name, sizeof(path) - 1);
+
+	fprintf(stdout, " %s: read key '%s'\n", __func__, path);
+	fp = fopen(path, "rb");
+	if (!fp)
+		return file_error("unable to open file for reading", path);
+	
+	PEM_read_PrivateKey(fp, privkey, NULL, NULL);
+	fclose(fp);
+
+	return 0;
+}
+
+/*
+ * Here we have different implementations of following functionality
+ * (based on different openssl versions):
+ *
+ * rimage_check_key
+ *
+ * rimage_set_modexp
+ *
+ * rimage_sign
+ *
+ * rimage_verify
+ *
+ * rimage_get_key_size
+ *
+*/
+
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
+static int rimage_check_key(EVP_PKEY *privkey)
+{
+	RSA *priv_rsa = NULL;
+
+	priv_rsa = EVP_PKEY_get1_RSA(privkey);
+
+	return RSA_check_key(priv_rsa);
+}
+#else
+static int rimage_check_key(EVP_PKEY *privkey)
+{
+	EVP_PKEY_CTX *ctx;
+	int ret = 0;
+
+	ctx = EVP_PKEY_CTX_new(privkey, NULL /* no engine */);
+	if (!ctx)
+		return -EINVAL;
+
+	ret = EVP_PKEY_private_check(ctx);
+
+	EVP_PKEY_CTX_free(ctx);
+
+	return ret;
+}
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+static void rimage_set_modexp(EVP_PKEY *privkey, unsigned char *mod, unsigned char *exp)
+{
+	RSA *priv_rsa = NULL;
+	const BIGNUM *n;
+	const BIGNUM *e;
+
+	priv_rsa = EVP_PKEY_get1_RSA(privkey);
+
+	n = priv_rsa->n;
+	e = priv_rsa->e;
+
+	BN_bn2bin(n, mod);
+	BN_bn2bin(e, exp);
+}
+#elif OPENSSL_VERSION_NUMBER < 0x30000000L
+static void rimage_set_modexp(EVP_PKEY *privkey, unsigned char *mod, unsigned char *exp)
+{
+	const BIGNUM *n;
+	const BIGNUM *e;
+	const BIGNUM *d;
+	RSA *priv_rsa = NULL;
+
+	priv_rsa = EVP_PKEY_get1_RSA(privkey);
+
+	RSA_get0_key(priv_rsa, &n, &e, &d);
+
+	BN_bn2bin(n, mod);
+	BN_bn2bin(e, exp);
+}
+#else
+static void rimage_set_modexp(EVP_PKEY *privkey, unsigned char *mod, unsigned char *exp)
+{
+	BIGNUM *n = NULL;
+	BIGNUM *e = NULL;
+
+	EVP_PKEY_get_bn_param(privkey, OSSL_PKEY_PARAM_RSA_N, &n);
+	EVP_PKEY_get_bn_param(privkey, OSSL_PKEY_PARAM_RSA_E, &e);
+
+	BN_bn2bin(n, mod);
+	BN_bn2bin(e, exp);
+}
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
+static int rimage_sign(EVP_PKEY *privkey, enum manver ver, struct hash_context *digest,
+		       unsigned char *signature)
+{
+	unsigned char sig[MAN_RSA_SIGNATURE_LEN_2_5];
+	unsigned int siglen = MAN_RSA_SIGNATURE_LEN;
+	RSA *priv_rsa = NULL;
+	int ret;
+
+	priv_rsa = EVP_PKEY_get1_RSA(privkey);
+
+	switch (ver) {
+	case V15:
+		/* fallthrough */
+	case V18:
+		ret = RSA_sign(NID_sha256, digest->digest, digest->digest_length,
+			       signature, &siglen, priv_rsa);
+		break;
+	case V25:
+		/* fallthrough */
+	case VACE15:
+		ret = RSA_padding_add_PKCS1_PSS(priv_rsa, sig, digest->digest, digest->algo,
+						/* salt length */ 32);
+		if (ret > 0)
+			ret = RSA_private_encrypt(RSA_size(priv_rsa), sig, signature, priv_rsa,
+						  RSA_NO_PADDING);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return ret;
+}
+#else
+static int rimage_sign(EVP_PKEY *privkey, enum manver ver,
+		       struct hash_context *digest, unsigned char *signature)
+{
+	EVP_PKEY_CTX *ctx = NULL;
+	size_t siglen = MAN_RSA_SIGNATURE_LEN;
+	int ret;
+
+	ctx = EVP_PKEY_CTX_new(privkey, NULL /* no engine */);
+	if (!ctx)
+		return -ENOMEM;
+
+	ret = EVP_PKEY_sign_init(ctx);
+	if (ret <= 0)
+		goto out;
+
+	if (ver == V25 || ver == VACE15) {
+		ret = EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PSS_PADDING);
+		if (ret <= 0) {
+			fprintf(stderr, "error: failed to set rsa padding\n");
+			goto out;
+		}
+
+		ret = EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, 32);
+		if (ret <= 0) {
+			fprintf(stderr, "error: failed to set saltlen\n");
+			goto out;
+		}
+
+		siglen = MAN_RSA_SIGNATURE_LEN_2_5;
+	}
+
+	ret = EVP_PKEY_CTX_set_signature_md(ctx, digest->algo);
+	if (ret <= 0) {
+		fprintf(stderr, "error: failed to set signature algorithm\n");
+		goto out;
+	}
+
+	ret = EVP_PKEY_sign(ctx, signature, &siglen, digest->digest, digest->digest_length);
+	if (ret <= 0) {
+		fprintf(stderr, "error: failed to sign manifest\n");
+		goto out;
+	}
+
+out:
+	EVP_PKEY_CTX_free(ctx);
+
+	return ret;
+}
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
+static int rimage_verify(EVP_PKEY *privkey, enum manver ver, struct hash_context *digest,
+			 unsigned char *signature)
+{
+	unsigned char sig[MAN_RSA_SIGNATURE_LEN_2_5];
+	unsigned int siglen = MAN_RSA_SIGNATURE_LEN;
+	RSA *priv_rsa = NULL;
+	char err_buf[256];
+	int ret;
+
+	priv_rsa = EVP_PKEY_get1_RSA(privkey);
+
+	switch (ver) {
+	case V15:
+		/* fallthrough */
+	case V18:
+		ret = RSA_verify(NID_sha256, digest->digest, digest->digest_length, signature,
+				 siglen, priv_rsa);
+
+		if (ret <= 0) {
+			ERR_error_string(ERR_get_error(), err_buf);
+			fprintf(stderr, "error: verify %s\n", err_buf);
+		}
+		break;
+	case V25:
+		/* fallthrough */
+	case VACE15:
+		/* decrypt signature */
+		ret = RSA_public_decrypt(RSA_size(priv_rsa), signature, sig, priv_rsa,
+					 RSA_NO_PADDING);
+		if (ret <= 0) {
+			ERR_error_string(ERR_get_error(), err_buf);
+			fprintf(stderr, "error: verify decrypt %s\n", err_buf);
+			return ret;
+		}
+
+		ret = RSA_verify_PKCS1_PSS(priv_rsa, digest->digest, digest->algo, sig, 32);
+		if (ret <= 0) {
+			ERR_error_string(ERR_get_error(), err_buf);
+			fprintf(stderr, "error: verify %s\n", err_buf);
+		}
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return ret;
+}
+#else
+static int rimage_verify(EVP_PKEY *privkey, enum manver ver,struct hash_context *digest,
+			 unsigned char *signature)
+{
+	EVP_PKEY_CTX *ctx = NULL;
+	size_t siglen = MAN_RSA_SIGNATURE_LEN;
+	char err_buf[256];
+	int ret;
+
+	ctx = EVP_PKEY_CTX_new(privkey, NULL /* no engine */);
+	if (!ctx)
+		return -ENOMEM;
+
+	ret = EVP_PKEY_verify_init(ctx);
+	if (ret <= 0)
+		goto out;
+
+	ret = EVP_PKEY_CTX_set_signature_md(ctx, digest->algo);
+	if (ret <= 0) {
+		ERR_error_string(ERR_get_error(), err_buf);
+		fprintf(stderr, "error: set signature %s\n", err_buf);
+		goto out;
+	}
+
+	switch (ver) {
+	case V15:	/* fallthrough */
+	case V18:
+		break;
+
+	case V25:	/* fallthrough */
+	case VACE15:
+		ret = EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PSS_PADDING);
+		if (ret <= 0)
+			goto out;
+
+		ret = EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, 32);
+		if (ret <= 0)
+			goto out;
+
+		siglen = MAN_RSA_SIGNATURE_LEN_2_5;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	ret = EVP_PKEY_verify(ctx, signature, siglen, digest->digest, digest->digest_length);
+	if (ret <= 0) {
+		ERR_error_string(ERR_get_error(), err_buf);
+		fprintf(stderr, "error: verify %s\n", err_buf);
+	}
+
+out:
+	EVP_PKEY_CTX_free(ctx);
+
+	return ret;
+}
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
+static int rimage_get_key_size(EVP_PKEY *privkey)
+{
+	RSA *priv_rsa = NULL;
+	int key_length;
+
+	priv_rsa = EVP_PKEY_get1_RSA(privkey);
+	key_length = RSA_size(priv_rsa);
+
+	RSA_free(priv_rsa);
+
+	return key_length;
+}
+#else
+static int rimage_get_key_size(EVP_PKEY *privkey)
+{
+	return EVP_PKEY_get_size(privkey);
+}
+#endif
+
+/*
+ * RSA signature of manifest. The signature is an PKCS
+ * #1-v1_5 of the entire manifest structure, including all
+ * extensions, and excluding the last 3 fields of the
+ * manifest header (Public Key, Exponent and Signature).
+ */
+
+int pkcs_v1_5_sign_man_v1_5(struct image *image,
+			    struct fw_image_manifest_v1_5 *man,
+			    void *ptr1, unsigned int size1)
+{
+	EVP_PKEY *privkey;
+	struct hash_context digest;
+	unsigned char mod[MAN_RSA_KEY_MODULUS_LEN];
+	int ret = -EINVAL, i;
+
+#if DEBUG_PKCS
+	fprintf(stdout, "offsets 0x%lx size 0x%x\n",
+		ptr1 - (void *)man, size1);
+#endif
+
+	ret = rimage_read_key(&privkey, image);
+	if (ret < 0)
+		return ret;
+
+	if (rimage_check_key(privkey) > 0) {
+		fprintf(stdout, " pkcs: RSA private key is valid.\n");
+	} else {
+		fprintf(stderr, "error: validating RSA private key.\n");
+		return -EINVAL;
+	}
+
+	/* calculate the digest */
+	hash_sha256_init(&digest);
+	hash_update(&digest, ptr1, size1);
+	ret = hash_finalize(&digest);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, " pkcs: digest for manifest is ");
+	hash_print(&digest);
+
+	/* sign the manifest */
+	ret = rimage_sign(privkey, V15, &digest, (unsigned char *)man->css_header.signature);
+	if (ret <= 0) {
+		fprintf(stderr, "error: failed to sign manifest\n");
+		goto err;
+	}
+
+	/* copy public key modulus and exponent to manifest */
+	rimage_set_modexp(privkey, mod, (unsigned char *)man->css_header.exponent);
+
+	/* modulus is reveresd  */
+	for (i = 0; i < MAN_RSA_KEY_MODULUS_LEN; i++)
+		man->css_header.modulus[i]
+		= mod[MAN_RSA_KEY_MODULUS_LEN - (1 + i)];
+
+	/* signature is reveresd, swap it */
+	bytes_swap(man->css_header.signature,
+		   sizeof(man->css_header.signature));
+
+err:
+	EVP_PKEY_free(privkey);
+	return ret;
+}
+
+/*
+ * RSA signature of manifest. The signature is an PKCS
+ * #1-v1_5 of the entire manifest structure, including all
+ * extensions, and excluding the last 3 fields of the
+ * manifest header (Public Key, Exponent and Signature).
+ */
+
+int pkcs_v1_5_sign_man_v1_8(struct image *image,
+			    struct fw_image_manifest_v1_8 *man,
+			    void *ptr1, unsigned int size1, void *ptr2,
+			    unsigned int size2)
+{
+	EVP_PKEY *privkey;
+	struct hash_context digest;
+	unsigned char mod[MAN_RSA_KEY_MODULUS_LEN];
+	int ret = -EINVAL, i;
+
+#if DEBUG_PKCS
+	fprintf(stdout, "offsets 0x%lx size 0x%x offset 0x%lx size 0x%x\n",
+		ptr1 - (void *)man, size1, ptr2 - (void *)man, size2);
+#endif
+
+	ret = rimage_read_key(&privkey, image);
+	if (ret < 0)
+		return ret;
+
+	/* validate RSA private key */
+	if (rimage_check_key(privkey) > 0) {
+		fprintf(stdout, " pkcs: RSA private key is valid.\n");
+	} else {
+		fprintf(stderr, "error: validating RSA private key.\n");
+		return -EINVAL;
+	}
+
+	/* calculate the digest */
+	hash_sha256_init(&digest);
+	hash_update(&digest, ptr1, size1);
+	hash_update(&digest, ptr2, size2);
+	ret = hash_finalize(&digest);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, " pkcs: digest for manifest is ");
+	hash_print(&digest);
+
+	/* sign the manifest */
+	ret = rimage_sign(privkey, V18, &digest, (unsigned char *)man->css.signature);
+	if (ret <= 0) {
+		fprintf(stderr, "error: failed to sign manifest\n");
+		goto err;
+	}
+
+	/* copy public key modulus and exponent to manifest */
+	rimage_set_modexp(privkey, mod, (unsigned char *)man->css.exponent);
+
+	/* modulus is reveresd  */
+	for (i = 0; i < MAN_RSA_KEY_MODULUS_LEN; i++)
+		man->css.modulus[i] = mod[MAN_RSA_KEY_MODULUS_LEN - (1 + i)];
+
+	/* signature is reveresd, swap it */
+	bytes_swap(man->css.signature, sizeof(man->css.signature));
+
+err:
+	EVP_PKEY_free(privkey);
+	return ret;
+}
+
+int pkcs_v1_5_sign_man_v2_5(struct image *image,
+			    struct fw_image_manifest_v2_5 *man,
+			    void *ptr1, unsigned int size1, void *ptr2,
+			    unsigned int size2)
+{
+	EVP_PKEY *privkey;
+	struct hash_context digest;
+	unsigned char mod[MAN_RSA_KEY_MODULUS_LEN_2_5];
+	int ret = -EINVAL, i;
+
+#if DEBUG_PKCS
+	fprintf(stdout, "offsets 0x%lx size 0x%x offset 0x%lx size 0x%x\n",
+		ptr1 - (void *)man, size1, ptr2 - (void *)man, size2);
+#endif
+
+	ret = rimage_read_key(&privkey, image);
+	if (ret < 0)
+		return ret;
+
+	/* validate RSA private key */
+	if (rimage_check_key(privkey) > 0) {
+		fprintf(stdout, " pkcs: RSA private key is valid.\n");
+	} else {
+		fprintf(stderr, "error: validating RSA private key.\n");
+		return -EINVAL;
+	}
+
+	/* calculate the digest - SHA384 on CAVS2_5+ */
+	hash_sha384_init(&digest);
+	hash_update(&digest, ptr1, size1);
+	hash_update(&digest, ptr2, size2);
+	ret = hash_finalize(&digest);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, " pkcs: digest for manifest is ");
+	hash_print(&digest);
+
+	/* sign the manifest */
+	ret = rimage_sign(privkey, V25, &digest, (unsigned char *)man->css.signature);
+	if (ret <= 0) {
+		fprintf(stderr, "error: failed to sign manifest\n");
+		goto err;
+	}
+
+	/* copy public key modulus and exponent to manifest */
+	rimage_set_modexp(privkey, mod, (unsigned char *)man->css.exponent);
+
+	/* modulus is reversed  */
+	for (i = 0; i < MAN_RSA_KEY_MODULUS_LEN_2_5; i++)
+		man->css.modulus[i] = mod[MAN_RSA_KEY_MODULUS_LEN_2_5 - (1 + i)];
+
+	/* signature is reversed, swap it */
+	bytes_swap(man->css.signature, sizeof(man->css.signature));
+
+err:
+	EVP_PKEY_free(privkey);
+	return ret;
+}
+
+int pkcs_v1_5_sign_man_ace_v1_5(struct image *image,
+				struct fw_image_manifest_ace_v1_5 *man,
+				void *ptr1, unsigned int size1, void *ptr2,
+				unsigned int size2)
+{
+	EVP_PKEY *privkey;
+	struct hash_context digest;
+	unsigned char mod[MAN_RSA_KEY_MODULUS_LEN_2_5];
+	int ret = -EINVAL, i;
+
+#if DEBUG_PKCS
+	fprintf(stdout, "offsets 0x%lx size 0x%x offset 0x%lx size 0x%x\n",
+		ptr1 - (void *)man, size1, ptr2 - (void *)man, size2);
+#endif
+
+	ret = rimage_read_key(&privkey, image);
+	if (ret < 0)
+		return ret;
+
+	/* validate RSA private key */
+	if (rimage_check_key(privkey) > 0) {
+		fprintf(stdout, " pkcs: RSA private key is valid.\n");
+	} else {
+		fprintf(stderr, "error: validating RSA private key.\n");
+		return -EINVAL;
+	}
+
+	/* calculate the digest - SHA384 on CAVS2_5+ */
+	hash_sha384_init(&digest);
+	hash_update(&digest, ptr1, size1);
+	hash_update(&digest, ptr2, size2);
+	ret = hash_finalize(&digest);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, " pkcs: digest for manifest is ");
+	hash_print(&digest);
+
+	/* sign the manifest */
+	ret = rimage_sign(privkey, VACE15, &digest, (unsigned char *)man->css.signature);
+	if (ret <= 0) {
+		fprintf(stderr, "error: failed to sign manifest\n");
+		goto err;
+	}
+
+	/* copy public key modulus and exponent to manifest */
+	rimage_set_modexp(privkey, mod, (unsigned char *)man->css.exponent);
+
+	/* modulus is reversed  */
+	for (i = 0; i < MAN_RSA_KEY_MODULUS_LEN_2_5; i++)
+		man->css.modulus[i] = mod[MAN_RSA_KEY_MODULUS_LEN_2_5 - (1 + i)];
+
+	/* signature is reversed, swap it */
+	bytes_swap(man->css.signature, sizeof(man->css.signature));
+
+err:
+	EVP_PKEY_free(privkey);
+	return ret;
+}
+
+int ri_manifest_sign_v1_5(struct image *image)
+{
+	struct fw_image_manifest_v1_5 *man = image->fw_image;
+
+	/* excluding the manifest header */
+	char *const data1 = (char *)man + sizeof(struct fw_image_manifest_v1_5);
+	unsigned const size1 = image->image_end - sizeof(*man);
+
+	return pkcs_v1_5_sign_man_v1_5(image, man, data1, size1);
+}
+
+int ri_manifest_sign_v1_8(struct image *image)
+{
+	struct fw_image_manifest_v1_8 *man = image->fw_image;
+
+	char *const data1 = (char *)man + MAN_CSS_HDR_OFFSET;
+	unsigned const size1 =
+		sizeof(struct css_header_v1_8) -
+		(MAN_RSA_KEY_MODULUS_LEN + MAN_RSA_KEY_EXPONENT_LEN +
+		 MAN_RSA_SIGNATURE_LEN);
+
+	char *const data2 = (char *)man + MAN_SIG_PKG_OFFSET_V1_8;
+	unsigned const size2 =
+		(man->css.size - man->css.header_len) * sizeof(uint32_t);
+
+	return pkcs_v1_5_sign_man_v1_8(image, man, data1, size1, data2, size2);
+}
+
+int ri_manifest_sign_v2_5(struct image *image)
+{
+	struct fw_image_manifest_v2_5 *man = image->fw_image;
+
+	char *const data1 = (char *)man + MAN_CSS_HDR_OFFSET_2_5;
+	unsigned const size1 =
+		sizeof(struct css_header_v2_5) -
+		(MAN_RSA_KEY_MODULUS_LEN_2_5 + MAN_RSA_KEY_EXPONENT_LEN +
+		 MAN_RSA_SIGNATURE_LEN_2_5);
+
+	char *const data2 = (char *)man + MAN_SIG_PKG_OFFSET_V2_5;
+	unsigned const size2 =
+			(man->css.size - man->css.header_len) * sizeof(uint32_t);
+
+	return pkcs_v1_5_sign_man_v2_5(image, man, data1, size1, data2, size2);
+}
+
+int ri_manifest_sign_ace_v1_5(struct image *image)
+{
+	struct fw_image_manifest_ace_v1_5 *man = image->fw_image;
+
+	char *const data1 = (char *)man + MAN_CSS_HDR_OFFSET_2_5;
+	unsigned const size1 =
+		sizeof(struct css_header_v2_5) -
+		(MAN_RSA_KEY_MODULUS_LEN_2_5 + MAN_RSA_KEY_EXPONENT_LEN +
+		 MAN_RSA_SIGNATURE_LEN_2_5);
+
+	char *const data2 = (char *)man + MAN_SIG_PKG_OFFSET_V2_5;
+	unsigned const size2 =
+			(man->css.size - man->css.header_len) * sizeof(uint32_t);
+
+	return pkcs_v1_5_sign_man_ace_v1_5(image, man, data1, size1, data2, size2);
+}
+
+/*
+ * RSA verify of manifest. The signature is an PKCS
+ * #1-v1_5 of the entire manifest structure, including all
+ * extensions, and excluding the last 3 fields of the
+ * manifest header (Public Key, Exponent and Signature).
+ */
+
+int pkcs_v1_5_verify_man_v1_5(struct image *image,
+			    struct fw_image_manifest_v1_5 *man,
+			    void *ptr1, unsigned int size1)
+{
+	EVP_PKEY *privkey;
+	struct hash_context digest;
+	int ret = -EINVAL;
+
+#if DEBUG_PKCS
+	fprintf(stdout, "offsets 0x%lx size 0x%x\n",
+		ptr1 - (void *)man, size1);
+#endif
+
+	ret = rimage_read_key(&privkey, image);
+	if (ret < 0)
+		return ret;
+
+	/* validate RSA private key */
+	if (rimage_check_key(privkey) > 0) {
+		fprintf(stdout, " pkcs: RSA private key is valid.\n");
+	} else {
+		fprintf(stderr, "error: validating RSA private key.\n");
+		return -EINVAL;
+	}
+
+	/* calculate the digest */
+	hash_sha256_init(&digest);
+	hash_update(&digest, ptr1, size1);
+	ret = hash_finalize(&digest);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, " pkcs: digest for manifest is ");
+	hash_print(&digest);
+
+	/* signature is reversed, swap it */
+	bytes_swap(man->css_header.signature,
+		   sizeof(man->css_header.signature));
+
+	/* verify */
+	ret = rimage_verify(privkey, V15, &digest, (unsigned char *)man->css_header.signature);
+	if (ret <= 0)
+		fprintf(stderr, "error: failed to verify manifest\n");
+	else
+		fprintf(stdout, "pkcs: signature is valid !\n");
+
+err:
+	EVP_PKEY_free(privkey);
+	return ret;
+}
+
+/*
+ * RSA verify of manifest. The signature is an PKCS
+ * #1-v1_5 of the entire manifest structure, including all
+ * extensions, and excluding the last 3 fields of the
+ * manifest header (Public Key, Exponent and Signature).
+ */
+
+int pkcs_v1_5_verify_man_v1_8(struct image *image,
+			    struct fw_image_manifest_v1_8 *man,
+			    void *ptr1, unsigned int size1, void *ptr2,
+			    unsigned int size2)
+{
+	EVP_PKEY *privkey;
+	struct hash_context digest;
+	int ret = -EINVAL;
+
+#if DEBUG_PKCS
+	fprintf(stdout, "offsets 0x%lx size 0x%x offset 0x%lx size 0x%x\n",
+		ptr1 - (void *)man, size1, ptr2 - (void *)man, size2);
+#endif
+
+	ret = rimage_read_key(&privkey, image);
+	if (ret < 0)
+		return ret;
+
+	/* validate RSA private key */
+	if (rimage_check_key(privkey) > 0) {
+		fprintf(stdout, " pkcs: RSA private key is valid.\n");
+	} else {
+		fprintf(stderr, "error: validating RSA private key.\n");
+		return -EINVAL;
+	}
+
+	/* calculate the digest */
+	hash_sha256_init(&digest);
+	hash_update(&digest, ptr1, size1);
+	hash_update(&digest, ptr2, size2);
+	ret = hash_finalize(&digest);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, " pkcs: digest for manifest is ");
+	hash_print(&digest);
+
+	/* signature is reveresd, swap it */
+	bytes_swap(man->css.signature, sizeof(man->css.signature));
+
+	/* verify */
+	ret = rimage_verify(privkey, V18, &digest, (unsigned char *)man->css.signature);
+	if (ret <= 0)
+		fprintf(stderr, "error: failed to verify manifest\n");
+	else
+		fprintf(stdout, "pkcs: signature is valid !\n");
+
+err:
+	EVP_PKEY_free(privkey);
+	return ret;
+}
+
+/*
+ * RSA signature of manifest. The signature is an RSA PSS
+ * of the entire manifest structure, including all
+ * extensions, and excluding the last 3 fields of the
+ * manifest header (Public Key, Exponent and Signature).
+ */
+
+int pkcs_v1_5_verify_man_v2_5(struct image *image,
+			    struct fw_image_manifest_v2_5 *man,
+			    void *ptr1, unsigned int size1, void *ptr2,
+			    unsigned int size2)
+{
+	EVP_PKEY *privkey;
+	struct hash_context digest;
+	int ret = -EINVAL;
+
+#if DEBUG_PKCS
+	fprintf(stdout, "offsets 0x%lx size 0x%x offset 0x%lx size 0x%x\n",
+		ptr1 - (void *)man, size1, ptr2 - (void *)man, size2);
+#endif
+
+	ret = rimage_read_key(&privkey, image);
+	if (ret < 0)
+		return ret;
+
+	/* validate RSA private key */
+	if (rimage_check_key(privkey) > 0) {
+		fprintf(stdout, " pkcs: RSA private key is valid.\n");
+	} else {
+		fprintf(stderr, "error: validating RSA private key.\n");
+		return -EINVAL;
+	}
+
+	/* calculate the digest - SHA384 on CAVS2_5+ */
+	hash_sha384_init(&digest);
+	hash_update(&digest, ptr1, size1);
+	hash_update(&digest, ptr2, size2);
+	ret = hash_finalize(&digest);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, " pkcs: digest for manifest is ");
+	hash_print(&digest);
+
+	/* signature is reversed, swap it */
+	bytes_swap(man->css.signature, sizeof(man->css.signature));
+
+	/* verify */
+	ret = rimage_verify(privkey, V25, &digest, (unsigned char *)man->css.signature);
+
+	if (ret <= 0)
+		fprintf(stderr, "error: failed to verify manifest\n");
+	else
+		fprintf(stdout, "pkcs: signature is valid !\n");
+
+err:
+	EVP_PKEY_free(privkey);
+	return ret;
+}
+
+int pkcs_v1_5_verify_man_ace_v1_5(struct image *image,
+				  struct fw_image_manifest_ace_v1_5 *man,
+				  void *ptr1, unsigned int size1, void *ptr2,
+				  unsigned int size2)
+{
+	EVP_PKEY *privkey;
+	struct hash_context digest;
+	int ret = -EINVAL;
+
+#if DEBUG_PKCS
+	fprintf(stdout, "offsets 0x%lx size 0x%x offset 0x%lx size 0x%x\n",
+		ptr1 - (void *)man, size1, ptr2 - (void *)man, size2);
+#endif
+
+	ret = rimage_read_key(&privkey, image);
+	if (ret < 0)
+		return ret;
+
+	/* validate RSA private key */
+	if (rimage_check_key(privkey) > 0) {
+		fprintf(stdout, " pkcs: RSA private key is valid.\n");
+	} else {
+		fprintf(stderr, "error: validating RSA private key.\n");
+		return -EINVAL;
+	}
+
+	/* calculate the digest - SHA384 on CAVS2_5+ */
+	hash_sha384_init(&digest);
+	hash_update(&digest, ptr1, size1);
+	hash_update(&digest, ptr2, size2);
+	ret = hash_finalize(&digest);
+	if (ret)
+		goto err;
+
+	fprintf(stdout, " pkcs: digest for manifest is ");
+	hash_print(&digest);
+
+	/* signature is reversed, swap it */
+	bytes_swap(man->css.signature, sizeof(man->css.signature));
+
+	/* verify */
+	ret = rimage_verify(privkey, VACE15, &digest, (unsigned char *)man->css.signature);
+	if (ret <= 0)
+		fprintf(stderr, "error: failed to verify manifest\n");
+	else
+		fprintf(stdout, "pkcs: signature is valid !\n");
+
+err:
+	EVP_PKEY_free(privkey);
+	return ret;
+}
+
+int ri_manifest_verify_v1_5(struct image *image)
+{
+	struct fw_image_manifest_v1_5 *man = image->fw_image;
+
+	char *const data1 = (char *)man + MAN_CSS_MAN_SIZE_V1_5;
+	unsigned const size1 = image->image_end - sizeof(*man);
+
+	return pkcs_v1_5_verify_man_v1_5(image, man, data1, size1);
+}
+
+int ri_manifest_verify_v1_8(struct image *image)
+{
+	struct fw_image_manifest_v1_8 *man = image->fw_image;
+
+	char *const data1 = (char *)man + MAN_CSS_HDR_OFFSET;
+	unsigned const size1 =
+		sizeof(struct css_header_v1_8) -
+		(MAN_RSA_KEY_MODULUS_LEN + MAN_RSA_KEY_EXPONENT_LEN +
+		 MAN_RSA_SIGNATURE_LEN);
+
+	char *const data2 = (char *)man + MAN_SIG_PKG_OFFSET_V1_8;
+	unsigned const size2 =
+		(man->css.size - man->css.header_len) * sizeof(uint32_t);
+
+	return pkcs_v1_5_verify_man_v1_8(image, man, data1, size1, data2, size2);
+}
+
+int ri_manifest_verify_v2_5(struct image *image)
+{
+	struct fw_image_manifest_v2_5 *man = image->fw_image;
+
+	char *const data1 = (char *)man + MAN_CSS_HDR_OFFSET_2_5;
+	unsigned const size1 =
+		sizeof(struct css_header_v2_5) -
+		(MAN_RSA_KEY_MODULUS_LEN_2_5 + MAN_RSA_KEY_EXPONENT_LEN +
+		 MAN_RSA_SIGNATURE_LEN_2_5);
+
+	char *const data2 = (char *)man + MAN_SIG_PKG_OFFSET_V2_5;
+	unsigned const size2 =
+			(man->css.size - man->css.header_len) * sizeof(uint32_t);
+
+	return pkcs_v1_5_verify_man_v2_5(image, man, data1, size1, data2, size2);
+}
+
+int get_key_size(struct image *image)
+{
+	EVP_PKEY *privkey;
+	int key_len;
+	int ret;
+
+	ret = rimage_read_key(&privkey, image);
+	if (ret < 0)
+		return ret;
+
+	key_len = rimage_get_key_size(privkey);
+
+	EVP_PKEY_free(privkey);
+
+	return key_len;
+}
diff --git a/tools/rimage/src/plat_auth.c b/tools/rimage/src/plat_auth.c
new file mode 100644
index 000000000000..321d1712d0e4
--- /dev/null
+++ b/tools/rimage/src/plat_auth.c
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2017 Intel Corporation. All rights reserved.
+//
+// Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+//         Keyon Jie <yang.jie@linux.intel.com>
+
+#include <rimage/rimage.h>
+#include <rimage/manifest.h>
+#include <rimage/plat_auth.h>
+
+void ri_adsp_meta_data_create_v1_8(struct image *image, int meta_start_offset,
+				   int meta_end_offset)
+{
+	struct sof_man_adsp_meta_file_ext_v1_8 *meta =
+		image->fw_image + meta_start_offset;
+
+	fprintf(stdout, " meta: completing ADSP manifest\n");
+
+	meta->comp_desc[0].limit_offset = MAN_DESC_OFFSET_V1_8 +
+		image->image_end - meta_end_offset;
+
+	fprintf(stdout, " meta: limit is 0x%x\n",
+		meta->comp_desc[0].limit_offset);
+	/* now hash the AdspFwBinaryDesc -> EOF */
+}
+
+void ri_adsp_meta_data_create_v2_5(struct image *image, int meta_start_offset,
+				   int meta_end_offset)
+{
+	struct sof_man_adsp_meta_file_ext_v2_5 *meta =
+		image->fw_image + meta_start_offset;
+
+	fprintf(stdout, " meta: completing ADSP manifest\n");
+
+	meta->comp_desc[0].limit_offset = MAN_DESC_OFFSET_V1_8 +
+		image->image_end - meta_end_offset;
+
+	fprintf(stdout, " meta: limit is 0x%x\n",
+		meta->comp_desc[0].limit_offset);
+	/* now hash the AdspFwBinaryDesc -> EOF */
+}
+
+void ri_plat_ext_data_create(struct image *image)
+{
+	struct partition_info_ext *part = image->fw_image
+		+ MAN_PART_INFO_OFFSET_V1_8;
+	struct sof_man_adsp_meta_file_ext_v1_8 *meta =
+		image->fw_image + MAN_META_EXT_OFFSET_V1_8;
+	struct sof_man_fw_desc *desc = image->fw_image + MAN_DESC_OFFSET_V1_8;
+
+	fprintf(stdout, " auth: completing authentication manifest\n");
+
+	part->length = meta->comp_desc[0].limit_offset - MAN_DESC_OFFSET_V1_8;
+	part->length += MAN_PAGE_SIZE - (part->length % MAN_PAGE_SIZE);
+
+	/* do this here atm */
+	desc->header.preload_page_count = part->length / MAN_PAGE_SIZE;
+}
+
+void ri_plat_ext_data_create_v2_5(struct image *image)
+{
+	struct sof_man_adsp_meta_file_ext_v2_5 *meta =
+		image->fw_image + MAN_META_EXT_OFFSET_V2_5;
+	struct sof_man_fw_desc *desc = image->fw_image + MAN_DESC_OFFSET_V1_8;
+	struct info_ext_0x16 *ext = image->fw_image + MAN_PART_INFO_OFFSET_V2_5;
+	uint32_t size;
+
+	fprintf(stdout, " auth: completing authentication manifest\n");
+
+	size = meta->comp_desc[0].limit_offset - MAN_DESC_OFFSET_V1_8;
+	size += MAN_PAGE_SIZE - (size % MAN_PAGE_SIZE);
+
+	/* do this here atm */
+	desc->header.preload_page_count = size / MAN_PAGE_SIZE;
+	ext->size = image->image_end;
+}
+
+void ri_plat_ext_data_create_ace_v1_5(struct image *image)
+{
+	struct sof_man_adsp_meta_file_ext_v2_5 *meta =
+		image->fw_image + MAN_META_EXT_OFFSET_ACE_V1_5;
+	struct sof_man_fw_desc *desc = image->fw_image + MAN_DESC_OFFSET_V1_8;
+	struct info_ext_0x16 *ext = image->fw_image + MAN_PART_INFO_OFFSET_ACE_V1_5;
+	uint32_t size;
+
+	fprintf(stdout, " auth: completing authentication manifest\n");
+
+	size = meta->comp_desc[0].limit_offset - MAN_DESC_OFFSET_V1_8;
+	size += MAN_PAGE_SIZE - (size % MAN_PAGE_SIZE);
+
+	desc->header.preload_page_count = size / MAN_PAGE_SIZE;
+	ext->size = image->image_end;
+}
diff --git a/tools/rimage/src/rimage.c b/tools/rimage/src/rimage.c
new file mode 100644
index 000000000000..735075c130cc
--- /dev/null
+++ b/tools/rimage/src/rimage.c
@@ -0,0 +1,284 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2015 Intel Corporation. All rights reserved.
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <stdbool.h>
+
+#include <rimage/adsp_config.h>
+#include <rimage/ext_manifest_gen.h>
+#include <rimage/rimage.h>
+#include <rimage/manifest.h>
+#include <rimage/file_utils.h>
+
+
+static void usage(char *name)
+{
+	fprintf(stdout, "%s:\t -c adsp_desc -o outfile -k [key] ELF files\n",
+		name);
+	fprintf(stdout, "%s:\t -c adsp_desc -y infile -k [key]\n",
+			name);
+	fprintf(stdout, "\t -v enable verbose output\n");
+	fprintf(stdout, "\t -r enable relocatable ELF files\n");
+	fprintf(stdout, "\t -s MEU signing offset, disables rimage signing\n");
+	fprintf(stdout, "\t -i set IMR type\n");
+	fprintf(stdout, "\t -f firmware version = major.minor.micro\n");
+	fprintf(stdout, "\t -b build version\n");
+	fprintf(stdout, "\t -e build extended manifest\n");
+	fprintf(stdout, "\t -l build loadable modules image (don't treat the first module as a bootloader)\n");
+	fprintf(stdout, "\t -y verify signed file\n");
+	fprintf(stdout, "\t -q resign binary\n");
+	fprintf(stdout, "\t -p set PV bit\n");
+}
+
+int main(int argc, char *argv[])
+{
+	struct image image;
+	struct adsp *heap_adsp;
+	const char *adsp_config = NULL;
+	int opt, ret, i, first_non_opt;
+	int use_ext_man = 0;
+	unsigned int pv_bit = 0;
+	bool imr_type_override = false;
+
+	memset(&image, 0, sizeof(image));
+
+	image.imr_type = MAN_DEFAULT_IMR_TYPE;
+
+	while ((opt = getopt(argc, argv, "ho:va:s:k:ri:f:b:ec:y:q:pl")) != -1) {
+		switch (opt) {
+		case 'o':
+			image.out_file = optarg;
+			break;
+		case 'v':
+			image.verbose = 1;
+			break;
+		case 's':
+			image.meu_offset = atoi(optarg);
+			break;
+		case 'a':
+			image.abi = atoi(optarg);
+			break;
+		case 'k':
+			image.key_name = optarg;
+			break;
+		case 'r':
+			image.reloc = 1;
+			break;
+		case 'i':
+			image.imr_type = atoi(optarg);
+			imr_type_override = true;
+			break;
+		case 'f':
+			image.fw_ver_string = optarg;
+			break;
+		case 'b':
+			image.fw_ver_build_string = optarg;
+			break;
+		case 'e':
+			use_ext_man = 1;
+			break;
+		case 'c':
+			adsp_config = optarg;
+			break;
+		case 'y':
+			image.verify_file = optarg;
+			break;
+		case 'h':
+			usage(argv[0]);
+			return 0;
+		case 'q':
+			image.in_file = optarg;
+			break;
+		case 'p':
+			pv_bit = 1;
+			break;
+		case 'l':
+			image.loadable_module = true;
+			break;
+		default:
+		 /* getopt's default error message is good enough */
+			return 1;
+		}
+	}
+
+	first_non_opt = optind;
+
+	/* we must have config */
+	if (!adsp_config) {
+		usage(argv[0]);
+		fprintf(stderr, "error: must have adsp desc\n");
+		return -EINVAL;
+	}
+
+	/* requires private key */
+	if (!image.key_name) {
+		fprintf(stderr, "error: requires private key\n");
+		return -EINVAL;
+	}
+
+	/* make sure we have an outfile if not verifying */
+	if ((!image.out_file && !image.verify_file)) {
+		usage(argv[0]);
+		return -EINVAL;
+	}
+
+	/* firmware version: major.minor.micro */
+	if (image.fw_ver_string) {
+		ret = sscanf(image.fw_ver_string, "%hu.%hu.%hu",
+			     &image.fw_ver_major,
+			     &image.fw_ver_minor,
+			     &image.fw_ver_micro);
+
+		if (ret != 3) {
+			fprintf(stderr,
+				"error: cannot parse firmware version major.minor.micro\n");
+			return -EINVAL;
+		}
+	}
+
+	/* firmware build id */
+	if (image.fw_ver_build_string) {
+		ret = sscanf(image.fw_ver_build_string, "%hu",
+			     &image.fw_ver_build);
+
+		if (ret != 1) {
+			fprintf(stderr,
+				"error: cannot parse build version\n");
+			return -EINVAL;
+		}
+	}
+	/* find machine */
+	heap_adsp = malloc(sizeof(struct adsp));
+	if (!heap_adsp) {
+		fprintf(stderr, "error: memory allocation for adsp struct failed\n");
+		return -ENOMEM;
+	}
+	image.adsp = heap_adsp;
+	memset(heap_adsp, 0, sizeof(*heap_adsp));
+	ret = adsp_parse_config(adsp_config, &image);
+	if (ret < 0)
+		goto out;
+
+	/* verify mode ? */
+	if (image.verify_file) {
+		ret = verify_image(&image);
+		goto out;
+	}
+
+	if (image.in_file) {
+		fprintf(stdout, "going to re-sign\n");
+		ret = resign_image(&image);
+		goto out;
+	}
+
+	/* set IMR Type and the PV bit in found machine definition */
+	if (image.adsp->man_v1_8) {
+		if (imr_type_override)
+			image.adsp->man_v1_8->adsp_file_ext.imr_type = image.imr_type;
+		image.adsp->man_v1_8->css.reserved0 = pv_bit;
+	}
+
+	if (image.adsp->man_v2_5) {
+		if (imr_type_override)
+			image.adsp->man_v2_5->adsp_file_ext.imr_type = image.imr_type;
+		image.adsp->man_v2_5->css.reserved0 = pv_bit;
+	}
+
+	if (image.adsp->man_ace_v1_5) {
+		if (imr_type_override)
+			image.adsp->man_ace_v1_5->adsp_file_ext.imr_type = image.imr_type;
+		image.adsp->man_ace_v1_5->css.reserved0 = pv_bit;
+	}
+
+	/* parse input ELF files */
+	image.num_modules = argc - first_non_opt;
+
+	if (image.num_modules <= 0) {
+		fprintf(stderr,
+			"error: requires at least one ELF input module\n");
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/* Some platforms dont have modules configuration in toml file */
+	if (image.adsp->modules && image.num_modules > image.adsp->modules->mod_man_count) {
+		fprintf(stderr, "error: Each ELF input module requires entry in toml file.\n");
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/* getopt reorders argv[] */
+	for (opt = first_non_opt; opt < argc; opt++) {
+		i = opt - first_non_opt;
+		fprintf(stdout, "\nModule Reading %s\n", argv[opt]);
+		ret = module_open(&image.module[i].file, argv[opt], image.verbose);
+		if (ret < 0)
+			goto out;
+
+		module_parse_sections(&image.module[i].file, &image.adsp->mem, image.verbose);
+
+		/* When there is more than one module, then first one is bootloader.
+		 * Does not apply to building a image of a loadable module. */
+		image.module[i].is_bootloader = image.num_modules > 1 && i == 0 &&
+			!image.loadable_module;
+	}
+
+	/* validate all modules */
+	ret = modules_validate(&image);
+	if (ret < 0)
+		goto out;
+
+	/* open outfile for writing */
+	unlink(image.out_file);
+	image.out_fd = fopen(image.out_file, "wb");
+	if (!image.out_fd) {
+		ret = file_error("unable to open file for writing", image.out_file);
+		goto out;
+	}
+
+	/* process and write output */
+	if (image.meu_offset) {
+		assert(image.adsp->write_firmware_meu);
+		ret = image.adsp->write_firmware_meu(&image);
+	} else {
+		assert(image.adsp->write_firmware);
+		ret = image.adsp->write_firmware(&image);
+	}
+	if (ret)
+		goto out;
+
+	/* build extended manifest */
+	if (use_ext_man) {
+		if (image.adsp->write_firmware_ext_man)
+			ret = image.adsp->write_firmware_ext_man(&image);
+		else
+			ret = ext_man_write(&image);
+
+		if (ret < 0) {
+			fprintf(stderr, "error: unable to write extended manifest, %d\n",
+				ret);
+			goto out;
+		}
+	}
+
+out:
+	/* free memory */
+	adsp_free(heap_adsp);
+
+	/* close files */
+	if (image.out_fd)
+		fclose(image.out_fd);
+
+	/* Free loaded modules */
+	for (i = 0; i < image.num_modules; i++) {
+		module_close(&image.module[i].file);
+	}
+
+	return ret;
+}
diff --git a/tools/rimage/src/toml_utils.c b/tools/rimage/src/toml_utils.c
new file mode 100644
index 000000000000..128286d7194b
--- /dev/null
+++ b/tools/rimage/src/toml_utils.c
@@ -0,0 +1,341 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2023 Intel Corporation. All rights reserved.
+ *
+ * Author: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
+ *         Marc Herbert <marc.herbert@intel.com>
+ */
+
+#include "toml.h"
+#include <rimage/toml_utils.h>
+#include <rimage/cavs/cavs_ext_manifest.h>
+
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <stdarg.h>
+
+void print_bytes(FILE *out, const uint8_t *arr, size_t len)
+{
+	for (const uint8_t *pos = arr; pos < arr + len; pos++) {
+		char c = *pos;
+
+		if (isprint(c))
+			fputc(c, out);
+		else
+			fprintf(out, "\\x%.2x", c);
+	}
+}
+
+#define DUMP_PRINTABLE_BYTES(name, var) _dump_printable_bytes(name, var, sizeof(var))
+
+void _dump_printable_bytes(const char *name, const uint8_t *arr, size_t len)
+{
+	printf(DUMP_KEY_FMT, name);
+	print_bytes(stdout, arr, len);
+	printf("\n");
+}
+
+/** private parser error trace function */
+void vlog_err(const char *msg, va_list vl)
+{
+	vfprintf(stderr, msg, vl);
+}
+
+/** parser error trace function, error code is returned to shorten client code */
+int log_err(int err_code, const char *msg, ...)
+{
+	va_list vl;
+
+	va_start(vl, msg);
+	vlog_err(msg, vl);
+	va_end(vl);
+	return err_code;
+}
+
+/** log malloc error message for given key */
+int err_malloc(const char *key)
+{
+	return log_err(-ENOMEM, "error: malloc failed during parsing key '%s'\n", key);
+}
+
+/** log key not found error */
+int err_key_not_found(const char *key)
+{
+	return log_err(-EINVAL, "error: '%s' not found\n", key);
+}
+
+/** error during parsing key value, possible detailed message */
+int err_key_parse(const char *key, const char *extra_msg, ...)
+{
+	int ret = -EINVAL;
+	va_list vl;
+
+	if (extra_msg) {
+		log_err(ret, "error: key '%s' parsing error, ", key);
+		va_start(vl, extra_msg);
+		vlog_err(extra_msg, vl);
+		va_end(vl);
+		return log_err(ret, "\n");
+	} else {
+		return log_err(ret, "error: key '%s' parsing error\n", key);
+	}
+}
+
+/** initialize parser context before parsing */
+void parse_ctx_init(struct parse_ctx *ctx)
+{
+	memset(ctx, 0, sizeof(*ctx));
+}
+
+/** check nothing left unparsed in given parsing context */
+int assert_everything_parsed(const toml_table_t *table, struct parse_ctx *ctx)
+{
+	const char *key = toml_table_key(table);
+	int ret = 0;
+
+	/* toml_table_key returns NULL for global context */
+	if (!key)
+		key = "toml";
+
+	/* from number of parsed fields subtract fields count in given table */
+	ctx->key_cnt = toml_table_nkval(table) - ctx->key_cnt;
+	ctx->array_cnt = toml_table_narr(table) - ctx->array_cnt;
+	ctx->table_cnt = toml_table_ntab(table) - ctx->table_cnt;
+
+	/* when any field left unparsed, then raise error */
+	if (ctx->key_cnt != 0)
+		ret = log_err(-EINVAL, "error: %d unparsed keys left in '%s'\n", ctx->key_cnt, key);
+	if (ctx->array_cnt != 0)
+		ret = log_err(-EINVAL, "error: %d unparsed arrays left in '%s'\n", ctx->array_cnt,
+			      key);
+	if (ctx->table_cnt != 0)
+		ret = log_err(-EINVAL, "error: %d unparsed tables left in '%s'\n", ctx->table_cnt,
+			      key);
+	return ret;
+}
+
+/**
+ * Parse hex value from key in given toml table
+ * @param table toml table where key is specified
+ * @param ctx parsing context, key counter will be incremented after successful key parse
+ * @param key field name
+ * @param def is default value or -1 when value don't have default value
+ * @param error code, 0 when success
+ * @return default, parsed, or UINT32_MAX value for error cases
+ */
+uint32_t parse_uint32_hex_key(const toml_table_t *table, struct parse_ctx *ctx,
+			      const char *key, int64_t def, int *error)
+{
+	toml_raw_t raw;
+	char *temp_s;
+	uint32_t val;
+	int ret;
+
+	/* look for key in given table, assign def value when key not found */
+	raw = toml_raw_in(table, key);
+	if (!raw) {
+		if (def < 0 || def > UINT32_MAX) {
+			*error = err_key_not_found(key);
+			return UINT32_MAX;
+		} else {
+			*error = 0;
+			return (uint32_t)def;
+		}
+	}
+	/* there is not build-in support for hex numbers in toml, so read then as string */
+	ret = toml_rtos(raw, &temp_s);
+	if (ret < 0) {
+		*error = err_key_parse(key, NULL);
+		return UINT32_MAX;
+	}
+	val = strtoul(temp_s, 0, 0);
+
+	free(temp_s);
+	/* assert parsing success and value is within uint32_t range */
+	if (errno < 0) {
+		*error = err_key_parse(key, "can't convert hex value");
+		return UINT32_MAX;
+	}
+
+	/* set success error code and increment parsed key counter */
+	*error = 0;
+	++ctx->key_cnt;
+	return (uint32_t)val;
+}
+
+/**
+ * Parse integer value from key in given toml table
+ * @param table toml table where key is specified
+ * @param ctx parsing context, key counter will be incremented after successful key parse
+ * @param key field name
+ * @param def is default value or -1 when value don't have default value
+ * @param error code, 0 when success
+ * @return default, parsed, or UINT32_MAX value for error cases
+ */
+uint32_t parse_uint32_key(const toml_table_t *table, struct parse_ctx *ctx, const char *key,
+			  int64_t def, int *error)
+{
+	toml_raw_t raw;
+	int64_t val;
+	int ret;
+
+	/* look for key in given table, assign def value when key not found */
+	raw = toml_raw_in(table, key);
+	if (!raw) {
+		if (def < 0 || def > UINT32_MAX) {
+			*error = err_key_not_found(key);
+			return UINT32_MAX;
+		} else {
+			*error = 0;
+			return (uint32_t)def;
+		}
+	}
+	/* there is build-in support for integer numbers in toml, so use lib function */
+	ret = toml_rtoi(raw, &val);
+	if (ret < 0) {
+		*error = err_key_parse(key, "can't convert to integer value");
+		return UINT32_MAX;
+	}
+	/* assert value is within uint32_t range */
+	if (val < 0 || val > UINT32_MAX) {
+		*error = log_err(-ERANGE, "key %s out of uint32_t range", key);
+		return UINT32_MAX;
+	}
+	/* set success error code and increment parsed key counter */
+	*error = 0;
+	++ctx->key_cnt;
+	return (uint32_t)val;
+}
+
+/**
+ * Parse string value from key in given toml table to uint8_t array. The
+ * destination is NOT a string because it is padded with zeros if and
+ * only if there is some capacity left. For string destinations use
+ * parse_str_key().
+ *
+ * @param table toml table where key is specified
+ * @param ctx parsing context, key counter will be incremented after successful key parse
+ * @param key field name
+ * @param dst uint8_t[] destination
+ * @param capacity dst array size
+ * @param error code, 0 when success
+ */
+void parse_printable_key(const toml_table_t *table, struct parse_ctx *ctx, const char *key,
+			 uint8_t *dst, int capacity, int *error)
+{
+	toml_raw_t raw;
+	char *temp_s;
+	int len;
+	int ret;
+
+	/* look for key in given table  */
+	raw = toml_raw_in(table, key);
+	if (!raw) {
+		*error = err_key_not_found(key);
+		return;
+	}
+	/* read string from toml, theres malloc inside toml_rtos() */
+	ret = toml_rtos(raw, &temp_s);
+	if (ret < 0) {
+		*error = err_key_parse(key, NULL);
+		return;
+	}
+
+	len = strlen(temp_s);
+	if (len > capacity) {
+		if (len > 20) {
+			static const char ellipsis[] = "...";
+			const size_t el_len = sizeof(ellipsis);
+
+			strncpy(temp_s + 20 - el_len, ellipsis, el_len);
+		}
+
+		*error = log_err(-EINVAL, "Too long input '%s' for key '%s' (%d > %d) characters\n",
+				 temp_s, key, len, capacity);
+		free(temp_s);
+		return;
+	}
+
+	/* copy string to dst, pad with zeros the space left if any */
+	strncpy((char *)dst, temp_s, capacity);
+	free(temp_s);
+	/* update parsing context */
+	++ctx->key_cnt;
+	*error = 0;
+}
+
+/**
+ * Parse string value from key in given toml table to given
+ * char[]. Destination is padded with zeros. As the only difference with
+ * parse_printable_key(), dst is guaranteed to be null-terminated when
+ * there is no error because the last destination byte is reserved for
+ * that.
+ *
+ * @param table toml table where key is specified
+ * @param ctx parsing context, key counter will be incremented after successful key parse
+ * @param key field name
+ * @param dst char[] destination
+ * @param capacity dst array size including null termination.
+ * @param error code, 0 when success
+ */
+void parse_str_key(const toml_table_t *table, struct parse_ctx *ctx, const char *key,
+		   char *dst, int capacity, int *error)
+{
+	parse_printable_key(table, ctx, key, (uint8_t *)dst, capacity - 1, error);
+	if (*error) /* return immediately to help forensics */
+		return;
+	dst[capacity - 1] = 0;
+}
+
+void parse_uuid(char *buf, uint8_t *uuid)
+{
+	struct uuid_t id;
+	uint32_t d[10];
+
+	sscanf(buf, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", &id.d0, &d[0],
+	       &d[1], &d[2], &d[3], &d[4], &d[5], &d[6], &d[7], &d[8], &d[9]);
+	id.d1 = (uint16_t)d[0];
+	id.d2 = (uint16_t)d[1];
+	id.d3 = (uint8_t)d[2];
+	id.d4 = (uint8_t)d[3];
+	id.d5 = (uint8_t)d[4];
+	id.d6 = (uint8_t)d[5];
+	id.d7 = (uint8_t)d[6];
+	id.d8 = (uint8_t)d[7];
+	id.d9 = (uint8_t)d[8];
+	id.d10 = (uint8_t)d[9];
+
+	memcpy(uuid, &id, sizeof(id));
+}
+
+/** version is stored as toml array with integer number, something like:
+ *   "version = [1, 8]"
+ */
+int parse_version(toml_table_t *toml, int64_t version[2])
+{
+	toml_array_t *arr;
+	toml_raw_t raw;
+	int ret;
+	int i;
+
+	/* check "version" key */
+	arr = toml_array_in(toml, "version");
+	if (!arr)
+		return err_key_not_found("version");
+	if (toml_array_type(arr) != 'i'  || toml_array_nelem(arr) != 2 ||
+	    toml_array_kind(arr) != 'v')
+		return err_key_parse("version", "wrong array type or length != 2");
+
+	/* parse "version" array elements */
+	for (i = 0; i < 2; ++i) {
+		raw = toml_raw_at(arr, i);
+		if (raw == 0)
+			return err_key_parse("version", NULL);
+		ret = toml_rtoi(raw, &version[i]);
+		if (ret < 0)
+			return err_key_parse("version", "can't convert element to integer");
+	}
+	return 0;
+}
diff --git a/tools/rimage/tomlc99 b/tools/rimage/tomlc99
new file mode 160000
index 000000000000..e3a03f5ec7d8
--- /dev/null
+++ b/tools/rimage/tomlc99
@@ -0,0 +1 @@
+Subproject commit e3a03f5ec7d8d33be705c5ce8a632d998ce9b4d1
diff --git a/west.yml b/west.yml
index 5046cf4c4e51..860ef793384f 100644
--- a/west.yml
+++ b/west.yml
@@ -19,7 +19,7 @@ manifest:
   # (git log 4e1d3ba61abd3 -- rimage/)
 
   # WARNING: for backwards compatibility with non-Zephyr platforms,
-  # rimage and toml99 are STILL git submodules! Every time you change
+  # toml99 is STILL a git submodule! Every time you change
   # their `revision` revision here you MUST keep their git submodules in
   # sync. This is as simple as `git add rimage` before committing (+
   # `git commit --amend` if you forgot and already committed this
@@ -33,14 +33,9 @@ manifest:
   # https://github.com/zephyrproject-rtos/zephyr/issues/58212
 
   projects:
-    - name: rimage
-      repo-path: rimage
-      path: sof/rimage
-      revision: 4fb9fe00575bc2e9f14570803d811987fb27f010
-
     - name: tomlc99
       repo-path: tomlc99
-      path: sof/rimage/tomlc99
+      path: sof/tools/rimage/tomlc99
       revision: e3a03f5ec7d8d33be705c5ce8a632d998ce9b4d1
 
     - name: zephyr