diff mbox series

[meta-arago,master,RFC,1/2] meta-arago-distro: Remove TI SDK branding from Arago images

Message ID 20250918150736.1193684-1-afd@ti.com
State New
Headers show
Series [meta-arago,master,RFC,1/2] meta-arago-distro: Remove TI SDK branding from Arago images | expand

Commit Message

Andrew Davis Sept. 18, 2025, 3:07 p.m. UTC 
Arago is a reference distribution for TI hardware and a foundation for
application/product specific Linux SDKs. While Arago can produce an SDK
for TI products on its own this is not *the* "TI SDK" shipped today, which
is generated by a layer called "meta-tisdk". This "meta-tisdk" produces
images with the tisdk branding such as "tisdk-default-image" but as Arago
provides images of the same name this is done by appending to the Arago
version. This means the content of "tisdk-default-image" changes depending
on what layers you have included. Instead there should be different names
for images containing different content, the solution here is:

 meta-arago -> arago-*-image
 meta-tisdk -> tisdk-*-image

The tisdk images can still be based on the arago images, but this way
it is clear what you are getting based on the image names.

Rename the images here in meta-arago to be prefixed with "arago", and
remove some of the legacy "TI SDK" branding.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 check_yocto_rules.json                           |  4 ++--
 meta-arago-distro/README                         |  2 +-
 meta-arago-distro/classes/tisdk-bundle.bbclass   |  2 +-
 meta-arago-distro/conf/distro/arago.conf         |  2 +-
 .../conf/distro/include/branding-bleeding.inc    |  4 ++--
 ...age.bbappend => arago-default-image.bbappend} |  0
 ...age.bbappend => arago-default-image.bbappend} |  0
 .../bootstrap-initrd/bootstrap-initrd_1.0.bb     |  2 +-
 .../{tisdk-base-image.bb => arago-base-image.bb} |  4 ++--
 ...se-image.bb => arago-bootstrap-base-image.bb} |  4 ++--
 ...otstrap-image.bb => arago-bootstrap-image.bb} |  4 ++--
 ...tisdk-core-bundle.bb => arago-core-bundle.bb} |  8 ++++----
 ...sdk-core-bundle.inc => arago-core-bundle.inc} |  4 ++--
 ...k-default-image.bb => arago-default-image.bb} |  6 +++---
 .../recipes-core/images/arago-jailhouse-image.bb | 14 ++++++++++++++
 .../images/arago-jailhouse-inmate.bb             | 16 ++++++++++++++++
 ...inlinux-image.bb => arago-thinlinux-image.bb} |  4 ++--
 .../{tisdk-tiny-image.bb => arago-tiny-image.bb} |  6 +++---
 ...tiny-initramfs.bb => arago-tiny-initramfs.bb} |  4 ++--
 .../recipes-core/images/tisdk-jailhouse-image.bb | 14 --------------
 .../images/tisdk-jailhouse-inmate.bb             | 16 ----------------
 meta-arago-extras/README                         |  2 +-
 .../recipes-core/packagegroups/ti-test.bb        |  2 +-
 23 files changed, 62 insertions(+), 62 deletions(-)
 rename meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/{tisdk-default-image.bbappend => arago-default-image.bbappend} (100%)
 rename meta-arago-distro/dynamic-layers/selinux/recipes-core/images/{tisdk-default-image.bbappend => arago-default-image.bbappend} (100%)
 rename meta-arago-distro/recipes-core/images/{tisdk-base-image.bb => arago-base-image.bb} (77%)
 rename meta-arago-distro/recipes-core/images/{tisdk-bootstrap-base-image.bb => arago-bootstrap-base-image.bb} (83%)
 rename meta-arago-distro/recipes-core/images/{tisdk-bootstrap-image.bb => arago-bootstrap-image.bb} (81%)
 rename meta-arago-distro/recipes-core/images/{tisdk-core-bundle.bb => arago-core-bundle.bb} (78%)
 rename meta-arago-distro/recipes-core/images/{tisdk-core-bundle.inc => arago-core-bundle.inc} (84%)
 rename meta-arago-distro/recipes-core/images/{tisdk-default-image.bb => arago-default-image.bb} (87%)
 create mode 100644 meta-arago-distro/recipes-core/images/arago-jailhouse-image.bb
 create mode 100644 meta-arago-distro/recipes-core/images/arago-jailhouse-inmate.bb
 rename meta-arago-distro/recipes-core/images/{tisdk-thinlinux-image.bb => arago-thinlinux-image.bb} (87%)
 rename meta-arago-distro/recipes-core/images/{tisdk-tiny-image.bb => arago-tiny-image.bb} (75%)
 rename meta-arago-distro/recipes-core/images/{tisdk-tiny-initramfs.bb => arago-tiny-initramfs.bb} (88%)
 delete mode 100644 meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb
 delete mode 100644 meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb
diff mbox series

Patch

diff --git a/check_yocto_rules.json b/check_yocto_rules.json
index 9cf776df..e82929e5 100644
--- a/check_yocto_rules.json
+++ b/check_yocto_rules.json
@@ -12,8 +12,8 @@ 
     },
     "GUARD-1" : {
         "skip_files" : [
-            "meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/tisdk-default-image.bbappend",
-            "meta-arago-distro/dynamic-layers/selinux/recipes-core/images/tisdk-default-image.bbappend",
+            "meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/arago-default-image.bbappend",
+            "meta-arago-distro/dynamic-layers/selinux/recipes-core/images/arago-default-image.bbappend",
             "meta-arago-distro/dynamic-layers/selinux/recipes-kernel/linux/linux-ti-staging_%.bbappend",
             "meta-arago-extras/recipes-extended/sysrepo/libyang_%.bbappend",
             "meta-arago-test/dynamic-layers/qt6-layer/recipes-core/packagegroups/ti-test.bbappend",
diff --git a/meta-arago-distro/README b/meta-arago-distro/README
index d4ff2dd2..d5ec23af 100644
--- a/meta-arago-distro/README
+++ b/meta-arago-distro/README
@@ -1,4 +1,4 @@ 
-meta-arago-distro provides Arago distribution configuration for TI SDK products
+meta-arago-distro provides Arago distribution configuration for TI products
 
 This layer works with the latest Yocto Project release (currently 2.2+) and tracks
 the stable/maintenance branches (currently "master") of the corresponding layers:
diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass
index fb2073ef..cc5d1481 100644
--- a/meta-arago-distro/classes/tisdk-bundle.bbclass
+++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
@@ -31,7 +31,7 @@  PACKAGE_ARCH = "${MACHINE_ARCH}"
 # List of target side images to be built and packaged.  By default take
 # the base image but this can be modified if desired to package
 # additional images.
-TARGET_IMAGES ?= "tisdk-base-image"
+TARGET_IMAGES ?= "arago-base-image"
 
 # path to install the meta-toolchain package in the SDK
 TISDK_TOOLCHAIN_PATH ?= "linux-devkit"
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 1ad4b4ce..d9727088 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -121,7 +121,7 @@  RDEPENDS:pulseaudio-server:remove = "alsa-plugins-pulseaudio-conf"
 PACKAGECONFIG:append:pn-kmscube = " gstreamer"
 
 # Configure RAMFS for jailhouse linux-demo
-JH_RAMFS_IMAGE = "tisdk-jailhouse-inmate"
+JH_RAMFS_IMAGE = "arago-jailhouse-inmate"
 
 # Enable UI and scripting for perf
 PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
diff --git a/meta-arago-distro/conf/distro/include/branding-bleeding.inc b/meta-arago-distro/conf/distro/include/branding-bleeding.inc
index 4efbb225..9d470c16 100644
--- a/meta-arago-distro/conf/distro/include/branding-bleeding.inc
+++ b/meta-arago-distro/conf/distro/include/branding-bleeding.inc
@@ -35,5 +35,5 @@  DATEH := "${@time.strftime('%Y%m%d%H',time.gmtime())}"
 CORESDK_RTOS_FILE_PREFIX = "${DATEH}-"
 CORESDK_RTOS_FILE_SUFFIX = ";downloadfilename=${CORESDK_RTOS_FILE_PREFIX}${DEFAULT_FIRMWARE_FILE}"
 
-# Build and assemble TI-SDK, but don't package it
-IMAGE_FSTYPES:pn-tisdk-core-bundle = ""
+# Build and assemble Arago SDK, but don't package it
+IMAGE_FSTYPES:pn-arago-core-bundle = ""
diff --git a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/tisdk-default-image.bbappend b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/arago-default-image.bbappend
similarity index 100%
rename from meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/tisdk-default-image.bbappend
rename to meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-core/images/arago-default-image.bbappend
diff --git a/meta-arago-distro/dynamic-layers/selinux/recipes-core/images/tisdk-default-image.bbappend b/meta-arago-distro/dynamic-layers/selinux/recipes-core/images/arago-default-image.bbappend
similarity index 100%
rename from meta-arago-distro/dynamic-layers/selinux/recipes-core/images/tisdk-default-image.bbappend
rename to meta-arago-distro/dynamic-layers/selinux/recipes-core/images/arago-default-image.bbappend
diff --git a/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb b/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb
index 57070459..c64f0303 100644
--- a/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb
+++ b/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb
@@ -8,7 +8,7 @@  CLEANBROKEN = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-BOOSTRAP_IMAGE = "tisdk-bootstrap-base-image"
+BOOSTRAP_IMAGE = "arago-bootstrap-base-image"
 
 TARGET = "bootstrap-rootfs-${MACHINE}.cpio"
 
diff --git a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb b/meta-arago-distro/recipes-core/images/arago-base-image.bb
similarity index 77%
rename from meta-arago-distro/recipes-core/images/tisdk-base-image.bb
rename to meta-arago-distro/recipes-core/images/arago-base-image.bb
index f5d5f29b..bffc4a31 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-base-image.bb
@@ -1,4 +1,4 @@ 
-SUMMARY = "Arago TI SDK base image with test tools"
+SUMMARY = "Arago base image with test tools"
 
 DESCRIPTION = "Arago SDK base image suitable for initramfs containing\
  comprehensive test tools."
@@ -16,4 +16,4 @@  IMAGE_INSTALL += "\
     ${ARAGO_BASE_IMAGE_EXTRA_INSTALL} \
 "
 
-export IMAGE_BASENAME = "tisdk-base-image${ARAGO_IMAGE_SUFFIX}"
+export IMAGE_BASENAME = "arago-base-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb b/meta-arago-distro/recipes-core/images/arago-bootstrap-base-image.bb
similarity index 83%
rename from meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb
rename to meta-arago-distro/recipes-core/images/arago-bootstrap-base-image.bb
index ce3b008e..b588ddc3 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-bootstrap-base-image.bb
@@ -1,4 +1,4 @@ 
-SUMMARY = "Arago TI SDK bootstrap base image for initramfs"
+SUMMARY = "Arago bootstrap base image for initramfs"
 
 DESCRIPTION = "Image meant for basic system verification of linux kernel.\
  Intended as basic test system, this image does not package the kernel\
@@ -19,4 +19,4 @@  IMAGE_INSTALL += " \
 	${ARAGO_BOOTSTRAP_IMAGE_EXTRA_INSTALL} \
 "
 
-export IMAGE_BASENAME = "tisdk-bootstrap-base-image${ARAGO_IMAGE_SUFFIX}"
+export IMAGE_BASENAME = "arago-bootstrap-base-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb b/meta-arago-distro/recipes-core/images/arago-bootstrap-image.bb
similarity index 81%
rename from meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb
rename to meta-arago-distro/recipes-core/images/arago-bootstrap-image.bb
index 5fe0463d..18b89788 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-bootstrap-image.bb
@@ -1,4 +1,4 @@ 
-SUMMARY = "Arago TI SDK bootstrap image usable for board bringup"
+SUMMARY = "Arago bootstrap image usable for board bringup"
 
 DESCRIPTION = "This image is a complete package containing a rootfs\
  and an initrd with platform test utilities that can be used for new\
@@ -19,4 +19,4 @@  IMAGE_INSTALL += " \
 	${ARAGO_BOOTSTRAP_IMAGE_EXTRA_INSTALL} \
 "
 
-export IMAGE_BASENAME = "tisdk-bootstrap-image${ARAGO_IMAGE_SUFFIX}"
+export IMAGE_BASENAME = "arago-bootstrap-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb b/meta-arago-distro/recipes-core/images/arago-core-bundle.bb
similarity index 78%
rename from meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
rename to meta-arago-distro/recipes-core/images/arago-core-bundle.bb
index 6c2afb9d..0eb3ef16 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
+++ b/meta-arago-distro/recipes-core/images/arago-core-bundle.bb
@@ -1,11 +1,11 @@ 
-SUMMARY = "Installer package for TI SDK - NOT for direct use on target"
+SUMMARY = "Installer package for Arago SDK - NOT for direct use on target"
 
 DESCRIPTION = "This creates an installer including all the default images\
  recommended including source, binaries, filesystems, etc.\
- for TI SDK. This is meant to be used on the host system.\
+ for Arago SDK. This is meant to be used on the host system.\
 "
 
-require tisdk-core-bundle.inc
+require arago-core-bundle.inc
 
 DEPLOY_SPL_NAME:omapl138 = ""
 DEPLOY_SPL_NAME:k3 = "tispl.bin tiboot3.bin"
@@ -19,5 +19,5 @@  DEPLOY_IMAGES_NAME:append:am65xx-hs-evm = " sysfw-am65x_sr2-hs-evm.itb"
 DEPLOY_IMAGES_NAME:append:ti33x = " extlinux.conf"
 DEPLOY_IMAGES_NAME:append:ti43x = " extlinux.conf"
 
-ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle"
+ARAGO_TISDK_IMAGE ?= "arago-core-bundle"
 export IMAGE_BASENAME = "${ARAGO_TISDK_IMAGE}${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/arago-core-bundle.inc
similarity index 84%
rename from meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
rename to meta-arago-distro/recipes-core/images/arago-core-bundle.inc
index 5f72e7b0..bb9ac59d 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
+++ b/meta-arago-distro/recipes-core/images/arago-core-bundle.inc
@@ -1,4 +1,4 @@ 
-# This include is for the common setting used to build TISDK images.  These images
+# This include is for the common setting used to build Arago SDK images.  These images
 # include both host and target side content. 
 LICENSE = "MIT"
 
@@ -29,7 +29,7 @@  DTB_FILTER:j7200 = "j7200"
 DTB_FILTER:j721s2 = "j721s2"
 
 # List of target side images to build for the SDK
-TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisdk-bootstrap-image"
+TARGET_IMAGES = "arago-base-image arago-default-image arago-thinlinux-image arago-bootstrap-image"
 
 TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk"
 TOOLCHAIN_SUFFIX = "-tisdk"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/arago-default-image.bb
similarity index 87%
rename from meta-arago-distro/recipes-core/images/tisdk-default-image.bb
rename to meta-arago-distro/recipes-core/images/arago-default-image.bb
index bc067857..a171ab13 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-default-image.bb
@@ -1,6 +1,6 @@ 
-SUMMARY = "Arago TI SDK full filesystem image"
+SUMMARY = "Arago full filesystem image"
 
-DESCRIPTION = "Complete Arago TI SDK filesystem image containing complete\
+DESCRIPTION = "Complete Arago filesystem image containing complete\
  applications and packages to entitle the SoC."
 
 require arago-image.inc
@@ -28,7 +28,7 @@  IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-sysrepo \
 "
 
-export IMAGE_BASENAME = "tisdk-default-image${ARAGO_IMAGE_SUFFIX}"
+export IMAGE_BASENAME = "arago-default-image${ARAGO_IMAGE_SUFFIX}"
 
 DEVTOOLS = " \
     linux-libc-headers-dev \
diff --git a/meta-arago-distro/recipes-core/images/arago-jailhouse-image.bb b/meta-arago-distro/recipes-core/images/arago-jailhouse-image.bb
new file mode 100644
index 00000000..3cbd16d9
--- /dev/null
+++ b/meta-arago-distro/recipes-core/images/arago-jailhouse-image.bb
@@ -0,0 +1,14 @@ 
+SUMMARY = "Arago image for Jailhouse Hypervisor"
+
+DESCRIPTION = "Arago image meant for running Jailhouse, a partitioning \
+Hypervisor based on Linux. This image is derived from arago-default-image and \
+contains additional firmware and management tools for Jailhouse.\
+"
+
+require recipes-core/images/arago-default-image.bb
+
+COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
+
+IMAGE_INSTALL += " jailhouse"
+
+export IMAGE_BASENAME = "arago-jailhouse-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/arago-jailhouse-inmate.bb b/meta-arago-distro/recipes-core/images/arago-jailhouse-inmate.bb
new file mode 100644
index 00000000..934e8b02
--- /dev/null
+++ b/meta-arago-distro/recipes-core/images/arago-jailhouse-inmate.bb
@@ -0,0 +1,16 @@ 
+SUMMARY = "Arago super minimal base image for jailhouse linux demo"
+
+DESCRIPTION = "Image meant for basic boot of linux inmate for jailhouse\
+This image is derived from arago-tiny-initramfs and contains additional\
+packages for OOB demo.\
+"
+
+require recipes-core/images/arago-tiny-initramfs.bb
+
+COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
+
+IMAGE_FSTYPES += "cpio"
+
+PACKAGE_INSTALL += "jailhouse-inmate"
+
+export IMAGE_BASENAME = "arago-jailhouse-inmate${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb b/meta-arago-distro/recipes-core/images/arago-thinlinux-image.bb
similarity index 87%
rename from meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb
rename to meta-arago-distro/recipes-core/images/arago-thinlinux-image.bb
index 5d1c26d8..18d3ced2 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-thinlinux-image.bb
@@ -1,4 +1,4 @@ 
-SUMMARY = "Arago TI SDK Thin Linux image"
+SUMMARY = "Arago Thin Linux image"
 
 DESCRIPTION = "Minimal bootable image with container to start the next\
  complex system up."
@@ -21,4 +21,4 @@  IMAGE_INSTALL += "\
     ${ARAGO_THIN_IMAGE_EXTRA_INSTALL} \
 "
 
-export IMAGE_BASENAME = "tisdk-thinlinux-image${ARAGO_IMAGE_SUFFIX}"
+export IMAGE_BASENAME = "arago-thinlinux-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb b/meta-arago-distro/recipes-core/images/arago-tiny-image.bb
similarity index 75%
rename from meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb
rename to meta-arago-distro/recipes-core/images/arago-tiny-image.bb
index 0bb6b798..27077aca 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-tiny-image.bb
@@ -1,4 +1,4 @@ 
-SUMMARY = "Arago TI SDK super minimal base image for initramfs"
+SUMMARY = "Arago super minimal base image for initramfs"
 
 DESCRIPTION = "Image meant for basic boot of linux kernel. Intended as\
  bare system, this image does not package the kernel in the\
@@ -18,6 +18,6 @@  IMAGE_INSTALL += " \
 	${ARAGO_TINY_IMAGE_EXTRA_INSTALL} \
 "
 
-DEPENDS += " tisdk-tiny-initramfs"
+DEPENDS += " arago-tiny-initramfs"
 
-export IMAGE_BASENAME = "tisdk-tiny-image${ARAGO_IMAGE_SUFFIX}"
+export IMAGE_BASENAME = "arago-tiny-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb b/meta-arago-distro/recipes-core/images/arago-tiny-initramfs.bb
similarity index 88%
rename from meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb
rename to meta-arago-distro/recipes-core/images/arago-tiny-initramfs.bb
index 37b777f6..cf50529d 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb
+++ b/meta-arago-distro/recipes-core/images/arago-tiny-initramfs.bb
@@ -1,4 +1,4 @@ 
-SUMMARY = "Arago TI SDK super minimal base image for initramfs"
+SUMMARY = "Arago super minimal base image for initramfs"
 
 DESCRIPTION = "Image meant for basic boot of linux kernel. Intended as\
  bare system, this image does not package the kernel in the\
@@ -23,7 +23,7 @@  IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 
 PACKAGE_INSTALL = "packagegroup-arago-initramfs"
 
-export IMAGE_BASENAME = "tisdk-tiny-initramfs${ARAGO_IMAGE_SUFFIX}"
+export IMAGE_BASENAME = "arago-tiny-initramfs${ARAGO_IMAGE_SUFFIX}"
 
 # To further reduce the size of the rootfs, remove the /boot directory from
 # the final image this is usually done by adding RDEPENDS_kernel-base = ""
diff --git a/meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb b/meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb
deleted file mode 100644
index 1f96781a..00000000
--- a/meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb
+++ /dev/null
@@ -1,14 +0,0 @@ 
-SUMMARY = "Arago TI SDK image for Jailhouse Hypervisor"
-
-DESCRIPTION = "Arago TI SDK image meant for running Jailhouse, a partitioning \
-Hypervisor based on Linux. This image is derived from tisdk-default-image and \
-contains additional firmware and management tools for Jailhouse.\
-"
-
-require recipes-core/images/tisdk-default-image.bb
-
-COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
-
-IMAGE_INSTALL += " jailhouse"
-
-export IMAGE_BASENAME = "tisdk-jailhouse-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb b/meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb
deleted file mode 100644
index 1a051161..00000000
--- a/meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb
+++ /dev/null
@@ -1,16 +0,0 @@ 
-SUMMARY = "Arago TI SDK super minimal base image for jailhouse linux demo"
-
-DESCRIPTION = "Image meant for basic boot of linux inmate for jailhouse\
-This image is derived from tisdk-tiny-initramfs and contains additional\
-packages for OOB demo.\
-"
-
-require recipes-core/images/tisdk-tiny-initramfs.bb
-
-COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
-
-IMAGE_FSTYPES += "cpio"
-
-PACKAGE_INSTALL += "jailhouse-inmate"
-
-export IMAGE_BASENAME = "tisdk-jailhouse-inmate${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-extras/README b/meta-arago-extras/README
index fc04e6af..9a4c5b25 100644
--- a/meta-arago-extras/README
+++ b/meta-arago-extras/README
@@ -1,4 +1,4 @@ 
-meta-arago-extras provides additional TI SDK applications that are distro-agnostic
+meta-arago-extras provides additional TI applications that are distro-agnostic
 
 This layer works with the latest Yocto Project release (currently 2.2+) and tracks
 the stable/maintenance branches (currently "master") of the corresponding layers:
diff --git a/meta-arago-test/recipes-core/packagegroups/ti-test.bb b/meta-arago-test/recipes-core/packagegroups/ti-test.bb
index cc194a45..4c16aece 100644
--- a/meta-arago-test/recipes-core/packagegroups/ti-test.bb
+++ b/meta-arago-test/recipes-core/packagegroups/ti-test.bb
@@ -160,7 +160,7 @@  RDEPENDS:${PN} = "\
     ${TI_TEST_TI_TOOLS} \
 "
 
-# Package group for things that should only be present in tisdk-default-image
+# Package group for things that should only be present in arago-default-image
 PACKAGES += " ${PN}-extras"
 RDEPENDS:${PN}-extras = "\
     ${TI_TEST_EXTRAS} \