diff mbox series

meta: Remove imx6-sabrelite target

Message ID 20260220092814.377396-1-wzh@ilbers.de
State Under Review
Headers show
Series meta: Remove imx6-sabrelite target | expand

Commit Message

Zhihang Wei Feb. 20, 2026, 9:28 a.m. UTC 
The imx6-sabrelite target and the associated custom ubi-ubifs-img.bbclass
were marked as depracted since 8900dd133a. Now remove them.

Signed-off-by: Zhihang Wei <wzh@ilbers.de>
---
 kas/machine/Kconfig                           |  8 --------
 kas/machine/imx6-sabrelite.yaml               |  7 -------
 .../classes-recipe/ubi-ubifs-img.bbclass      | 20 -------------------
 meta-isar/conf/machine/imx6-sabrelite.conf    | 18 -----------------
 meta-isar/conf/mc.conf                        |  2 --
 .../multiconfig/imx6-sabrelite-bullseye.conf  |  5 -----
 .../multiconfig/imx6-sabrelite-buster.conf    |  7 -------
 meta/classes-global/base.bbclass              |  6 ------
 scripts/contrib/convert-overrides.py          |  2 +-
 testsuite/citest.py                           |  1 -
 testsuite/data/targets.yml                    |  4 ----
 11 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 kas/machine/imx6-sabrelite.yaml
 delete mode 100644 meta-isar/classes-recipe/ubi-ubifs-img.bbclass
 delete mode 100644 meta-isar/conf/machine/imx6-sabrelite.conf
 delete mode 100644 meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf
 delete mode 100644 meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf
diff mbox series

Patch

diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig
index e09304c0..462af8e6 100644
--- a/kas/machine/Kconfig
+++ b/kas/machine/Kconfig
@@ -67,13 +67,6 @@  config MACHINE_HIKEY
 	select CODENAME_BOOKWORM
 	select ARCH_ARM64
 
-config MACHINE_IMX6_SABRELITE
-	bool "imx6-sabrelite"
-	select DISTRO_DEBIAN
-	select CODENAME_BUSTER
-	select CODENAME_BULLSEYE
-	select ARCH_ARMHF
-
 config MACHINE_NANOPI_NEO
 	bool "nanopi-neo"
 	select DISTRO_DEBIAN
@@ -258,7 +251,6 @@  config KAS_INCLUDE_MACHINE
 	default "kas/machine/container-amd64.yaml" if MACHINE_CONTAINER_AMD64
 	default "kas/machine/de0-nano-soc.yaml" if MACHINE_DE0_NANO_SOC
 	default "kas/machine/hikey.yaml" if MACHINE_HIKEY
-	default "kas/machine/imx6-sabrelite.yaml" if MACHINE_IMX6_SABRELITE
 	default "kas/machine/nanopi-neo.yaml" if MACHINE_NANOPI_NEO
 	default "kas/machine/nanopi-neo-efi.yaml" if MACHINE_NANOPI_NEO_EFI
 	default "kas/machine/phyboard-mira.yaml" if MACHINE_PHYBOARD_MIRA
diff --git a/kas/machine/imx6-sabrelite.yaml b/kas/machine/imx6-sabrelite.yaml
deleted file mode 100644
index 466649d5..00000000
--- a/kas/machine/imx6-sabrelite.yaml
+++ /dev/null
@@ -1,7 +0,0 @@ 
-# This software is a part of ISAR.
-# Copyright (C) 2023 ilbers GmbH
-
-header:
-  version: 14
-
-machine: imx6-sabrelite
diff --git a/meta-isar/classes-recipe/ubi-ubifs-img.bbclass b/meta-isar/classes-recipe/ubi-ubifs-img.bbclass
deleted file mode 100644
index 7e286e79..00000000
--- a/meta-isar/classes-recipe/ubi-ubifs-img.bbclass
+++ /dev/null
@@ -1,20 +0,0 @@ 
-# UBI with UBIFS image recipe
-#
-# This software is a part of ISAR.
-# Copyright (C) Siemens AG, 2019
-#
-# SPDX-License-Identifier: MIT
-
-IMAGE_TYPEDEP:ubi_ubifs = "ubi"
-IMAGE_TYPEDEP:ubi += "ubifs fit"
-
-IMAGE_CMD:ubi_ubifs() {
-    # we need to produce output (with extension .ubi-ubifs),
-    # so just create a symlink
-    ln -sf ${IMAGE_FULLNAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ubi-ubifs
-
-    bbwarn "ubi-ubifs-img image type is deprecated, please use built-in image"\
-           "classes instead:\n"\
-           "IMAGE_TYPEDEP:ubi += \"ubifs fit\"\n"\
-           "IMAGE_FSTYPES ?= \"ubi ubifs\""
-}
diff --git a/meta-isar/conf/machine/imx6-sabrelite.conf b/meta-isar/conf/machine/imx6-sabrelite.conf
deleted file mode 100644
index e48823d6..00000000
--- a/meta-isar/conf/machine/imx6-sabrelite.conf
+++ /dev/null
@@ -1,18 +0,0 @@ 
-# This software is a part of ISAR.
-# Copyright (C) Siemens AG, 2019
-#
-# SPDX-License-Identifier: MIT
-
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "armmp"
-
-MACHINE_SERIAL ?= "ttymxc0"
-BAUDRATE_TTY ?= "115200"
-
-IMAGE_CLASSES += "ubi-ubifs-img"
-MKUBIFS_ARGS := "-m 0x1000 -e 0x3e000 -c 1500"
-UBINIZE_ARGS = "-vv -m 0x1000 -p 0x40000"
-IMAGE_FSTYPES ?= "ubi-ubifs"
-
-DTB_FILES = "imx6q-sabrelite.dtb"
diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
index 493d5ae2..1bd926f6 100644
--- a/meta-isar/conf/mc.conf
+++ b/meta-isar/conf/mc.conf
@@ -41,8 +41,6 @@  BBMULTICONFIG = " \
     de0-nano-soc-bookworm \
     hikey-bullseye \
     hikey-bookworm \
-    imx6-sabrelite-buster \
-    imx6-sabrelite-bullseye \
     phyboard-mira-bullseye \
     phyboard-mira-bookworm \
     nanopi-neo-buster \
diff --git a/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf b/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf
deleted file mode 100644
index 9df2cd10..00000000
--- a/meta-isar/conf/multiconfig/imx6-sabrelite-bullseye.conf
+++ /dev/null
@@ -1,5 +0,0 @@ 
-# This software is a part of ISAR.
-# Copyright (C) 2022 ilbers GmbH
-
-MACHINE ?= "imx6-sabrelite"
-DISTRO ?= "debian-bullseye"
diff --git a/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf b/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf
deleted file mode 100644
index 262a6615..00000000
--- a/meta-isar/conf/multiconfig/imx6-sabrelite-buster.conf
+++ /dev/null
@@ -1,7 +0,0 @@ 
-# This software is a part of ISAR.
-# Copyright (C) Siemens AG, 2019
-#
-# SPDX-License-Identifier: MIT
-
-MACHINE ?= "imx6-sabrelite"
-DISTRO ?= "debian-buster"
diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass
index 6c788adb..c7d60dcb 100644
--- a/meta/classes-global/base.bbclass
+++ b/meta/classes-global/base.bbclass
@@ -376,11 +376,5 @@  def deb_list_beautify(d, varname):
             var_list.append(stripped)
     return ', '.join(var_list)
 
-# Deprecation checking
-python deprecation_checking() {
-    if d.getVar('MACHINE') == 'imx6-sabrelite':
-        bb.warn("Target imx6-sabrelite is deprecated and will be removed soon")
-}
-
 deprecation_checking[vardepsexclude] += "MACHINE"
 do_unpack[prefuncs] += "deprecation_checking"
diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py
index 57f166ca..d10fde11 100755
--- a/scripts/contrib/convert-overrides.py
+++ b/scripts/contrib/convert-overrides.py
@@ -31,7 +31,7 @@  if len(sys.argv) < 2:
 vars = ["append", "prepend", "remove"]
 vars = vars + ["qemuamd64", "qemuarm", "qemuarm64", "qemui386", "qemumipsel", "qemuriscv64"]
 vars = vars + ["container-amd64", "virtualbox", "vmware"]
-vars = vars + ["bananapi", "de0-nano-soc", "hikey", "imx6-sabrelite", "nanopi-neo", "phyboard-mira", "sifive-fu540", "stm32mp15x"]
+vars = vars + ["bananapi", "de0-nano-soc", "hikey", "nanopi-neo", "phyboard-mira", "sifive-fu540", "stm32mp15x"]
 vars = vars + ["rpi-arm-v7", "rpi-arm-v7l", "rpi-arm", "rpi-arm64-v8", "rpi"]
 vars = vars + ["amd64", "armhf", "arm64", "i386", "mipsel", "riscv64"]
 vars = vars + ["debian-stretch", "debian-buster", "debian-bullseye", "debian-bookworm", "debian-sid", "debian-sid-ports"]
diff --git a/testsuite/citest.py b/testsuite/citest.py
index f11cd5af..aef2585a 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -696,7 +696,6 @@  class NoCrossTest(CIBaseTest):
             'mc:qemuamd64-buster:isar-image-ci',
             'mc:qemuamd64-bullseye:isar-initramfs',
             'mc:qemumipsel-bullseye:isar-image-base',
-            'mc:imx6-sabrelite-bullseye:isar-image-base',
             'mc:phyboard-mira-bullseye:isar-image-base',
             'mc:hikey-bullseye:isar-image-base',
             'mc:virtualbox-bullseye:isar-image-base',
diff --git a/testsuite/data/targets.yml b/testsuite/data/targets.yml
index 5c9b5196..c95e97af 100644
--- a/testsuite/data/targets.yml
+++ b/testsuite/data/targets.yml
@@ -65,10 +65,6 @@  a: !mux
     name: hikey-bullseye
   hikey-bookworm:
     name: hikey-bookworm
-  imx6-sabrelite-buster:
-    name: imx6-sabrelite-buster
-  imx6-sabrelite-bullseye:
-    name: imx6-sabrelite-bullseye
   phyboard-mira-bullseye:
     name: phyboard-mira-bullseye
   phyboard-mira-bookworm: