From e330fb4ec727c3a060ad6b1fb6e8c21a4afe7357 Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Wed, 4 Oct 2023 18:05:23 -0700
Subject: [PATCH] Delete old rimage submodule and old rimage west module

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
 .gitmodules | 22 ----------------------
 rimage      |  1 -
 west.yml    | 11 -----------
 3 files changed, 34 deletions(-)
 delete mode 160000 rimage

diff --git a/.gitmodules b/.gitmodules
index 62ccbac18..99bed093e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,25 +1,3 @@
-
-# Old, independent rimage submodule. To be removed.
-[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
-
 # This is required for non-Zephyr ("XTOS") configurations. Zephyr
 # configs also get it from sof/west.yml which adds the burden of keeping
 # both tomlc99 SHA1s synchronized but in practice this barely ever moves.
diff --git a/rimage b/rimage
deleted file mode 160000
index ac487e09c..000000000
--- a/rimage
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ac487e09ca5bb34a2eebd2f3d1cfeb9e792c501a
diff --git a/west.yml b/west.yml
index edc522eab..876ae1b41 100644
--- a/west.yml
+++ b/west.yml
@@ -33,17 +33,6 @@ manifest:
   # https://github.com/zephyrproject-rtos/zephyr/issues/58212
 
   projects:
-    - name: rimage
-      repo-path: rimage
-      path: sof/rimage
-      revision: ac487e09ca5bb34a2eebd2f3d1cfeb9e792c501a
-
-    # To be removed in the next commits
-    - name: tomlc99-old-location
-      repo-path: tomlc99
-      path: sof/rimage/tomlc99
-      revision: e3a03f5ec7d8d33be705c5ce8a632d998ce9b4d1
-
     # West convenience for Zephyr people who forgot --recursive when
     # cloning sof.git.  This adds the burden of keeping both tomlc99
     # SHA1s synchronized but in practice it barely ever moves.