From c04eaad12a28e8d1ae9af41ea8193f6dd5c1cab6 Mon Sep 17 00:00:00 2001
From: Robert Marko <robimarko@gmail.com>
Date: Fri, 11 Apr 2025 21:06:18 +0200
Subject: [PATCH] layerscape: armv8_64b: drop skipped packages

Now that all packages that relied on the skip mechanism are selected
via BUILD_DEVICES or by defaulting for the subtarget drop them from
individual DEVICE_PACKAGES so that Image Builder works again for armv8_64b.

Fixes: #18412
Link: https://github.com/openwrt/openwrt/pull/18462
Signed-off-by: Robert Marko <robimarko@gmail.com>
---
 target/linux/layerscape/image/armv8_64b.mk | 42 ++--------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk
index c048a81bc4..6c486e73fa 100644
--- a/target/linux/layerscape/image/armv8_64b.mk
+++ b/target/linux/layerscape/image/armv8_64b.mk
@@ -30,7 +30,6 @@ define Device/fsl_ls1012a-frdm
   DEVICE_MODEL := FRDM-LS1012A
   DEVICE_PACKAGES += \
     layerscape-ppfe \
-    ~trusted-firmware-a-ls1012a-frdm \
     kmod-ppfe
   BLOCKSIZE := 256KiB
   IMAGE/firmware.bin := \
@@ -56,7 +55,6 @@ define Device/fsl_ls1012a-rdb
   DEVICE_MODEL := LS1012A-RDB
   DEVICE_PACKAGES += \
     layerscape-ppfe \
-    ~trusted-firmware-a-ls1012a-rdb \
     kmod-hwmon-ina2xx \
     kmod-iio-fxas21002c-i2c \
     kmod-iio-fxos8700-i2c \
@@ -80,7 +78,6 @@ define Device/fsl_ls1012a-frwy-sdboot
   DEVICE_MODEL := FRWY-LS1012A
   DEVICE_PACKAGES += \
     layerscape-ppfe \
-    ~trusted-firmware-a-ls1012a-frwy-sdboot \
     kmod-ppfe
   DEVICE_DTS := fsl-ls1012a-frwy
   IMAGES += firmware.bin
@@ -105,7 +102,6 @@ define Device/fsl_ls1028a-rdb
   DEVICE_VARIANT := Default
   KERNEL = kernel-bin | gzip | fit gzip $$(DEVICE_DTS_DIR)/$$(DEVICE_DTS).dtb
   DEVICE_PACKAGES += \
-    ~trusted-firmware-a-ls1028a-rdb \
     kmod-hwmon-ina2xx \
     kmod-hwmon-lm90 \
     kmod-rtc-pcf2127
@@ -130,7 +126,6 @@ define Device/fsl_ls1028a-rdb-sdboot
   DEVICE_VARIANT := SD Card Boot
   DEVICE_DTS := fsl-ls1028a-rdb
   DEVICE_PACKAGES += \
-    ~trusted-firmware-a-ls1028a-rdb-sdboot \
     kmod-hwmon-ina2xx \
     kmod-hwmon-lm90 \
     kmod-rtc-pcf2127
@@ -151,8 +146,6 @@ define Device/fsl_ls1043a-rdb
   DEVICE_MODEL := LS1043A-RDB
   DEVICE_VARIANT := Default
   DEVICE_PACKAGES += \
-    ~layerscape-fman \
-    ~trusted-firmware-a-ls1043a-rdb \
     kmod-ahci-qoriq \
     kmod-hwmon-ina2xx \
     kmod-hwmon-lm90
@@ -175,8 +168,6 @@ define Device/fsl_ls1043a-rdb-sdboot
   DEVICE_MODEL := LS1043A-RDB
   DEVICE_VARIANT := SD Card Boot
   DEVICE_PACKAGES += \
-    ~layerscape-fman \
-    ~trusted-firmware-a-ls1043a-rdb-sdboot \
     kmod-ahci-qoriq \
     kmod-hwmon-ina2xx \
     kmod-hwmon-lm90
@@ -197,9 +188,6 @@ define Device/fsl_ls1046a-frwy
   DEVICE_VENDOR := NXP
   DEVICE_MODEL := FRWY-LS1046A
   DEVICE_VARIANT := Default
-  DEVICE_PACKAGES += \
-    ~layerscape-fman \
-    ~trusted-firmware-a-ls1046a-frwy
   IMAGE/firmware.bin := \
     ls-clean | \
     ls-append $(1)-bl2.pbl | pad-to 1M | \
@@ -217,9 +205,6 @@ define Device/fsl_ls1046a-frwy-sdboot
   DEVICE_VENDOR := NXP
   DEVICE_MODEL := FRWY-LS1046A
   DEVICE_VARIANT := SD Card Boot
-  DEVICE_PACKAGES += \
-    ~layerscape-fman \
-    ~trusted-firmware-a-ls1046a-frwy-sdboot
   DEVICE_DTS := fsl-ls1046a-frwy
   IMAGE/sdcard.img.gz := \
     ls-clean | \
@@ -239,8 +224,6 @@ define Device/fsl_ls1046a-rdb
   DEVICE_MODEL := LS1046A-RDB
   DEVICE_VARIANT := Default
   DEVICE_PACKAGES += \
-    ~layerscape-fman \
-    ~trusted-firmware-a-ls1046a-rdb \
     kmod-ahci-qoriq \
     kmod-hwmon-ina2xx \
     kmod-hwmon-lm90
@@ -263,8 +246,6 @@ define Device/fsl_ls1046a-rdb-sdboot
   DEVICE_MODEL := LS1046A-RDB
   DEVICE_VARIANT := SD Card Boot
   DEVICE_PACKAGES += \
-    ~layerscape-fman \
-    ~trusted-firmware-a-ls1046a-rdb-sdboot \
     kmod-ahci-qoriq \
     kmod-hwmon-ina2xx \
     kmod-hwmon-lm90
@@ -287,9 +268,6 @@ define Device/fsl_ls1088a-rdb
   DEVICE_MODEL := LS1088A-RDB
   DEVICE_VARIANT := Default
   DEVICE_PACKAGES += \
-    ~layerscape-mc \
-    ~layerscape-dpl \
-    ~trusted-firmware-a-ls1088a-rdb \
     restool \
     kmod-ahci-qoriq \
     kmod-hwmon-ina2xx \
@@ -315,9 +293,6 @@ define Device/fsl_ls1088a-rdb-sdboot
   DEVICE_MODEL := LS1088A-RDB
   DEVICE_VARIANT := SD Card Boot
   DEVICE_PACKAGES += \
-    ~layerscape-mc \
-    ~layerscape-dpl \
-    ~trusted-firmware-a-ls1088a-rdb-sdboot \
     restool \
     kmod-ahci-qoriq \
     kmod-hwmon-ina2xx \
@@ -342,9 +317,6 @@ define Device/fsl_ls2088a-rdb
   DEVICE_VENDOR := NXP
   DEVICE_MODEL := LS2088ARDB
   DEVICE_PACKAGES += \
-    ~layerscape-mc \
-    ~layerscape-dpl \
-    ~trusted-firmware-a-ls2088a-rdb \
     restool \
     kmod-ahci-qoriq
   IMAGE/firmware.bin := \
@@ -365,12 +337,7 @@ define Device/fsl_lx2160a-rdb
   DEVICE_VENDOR := NXP
   DEVICE_MODEL := LX2160A-RDB
   DEVICE_VARIANT := Rev2.0 silicon
-  DEVICE_PACKAGES += \
-    ~layerscape-mc \
-    ~layerscape-dpl \
-    ~layerscape-ddr-phy \
-    ~trusted-firmware-a-lx2160a-rdb \
-    restool
+  DEVICE_PACKAGES += restool
   IMAGE/firmware.bin := \
     ls-clean | \
     ls-append $(1)-bl2.pbl | pad-to 1M | \
@@ -391,12 +358,7 @@ define Device/fsl_lx2160a-rdb-sdboot
   DEVICE_VENDOR := NXP
   DEVICE_MODEL := LX2160A-RDB
   DEVICE_VARIANT := Rev2.0 silicon SD Card Boot
-  DEVICE_PACKAGES += \
-    ~layerscape-mc \
-    ~layerscape-dpl \
-    ~layerscape-ddr-phy \
-    ~trusted-firmware-a-lx2160a-rdb-sdboot \
-    restool
+  DEVICE_PACKAGES += restool
   DEVICE_DTS := fsl-lx2160a-rdb
   IMAGE/sdcard.img.gz := \
     ls-clean | \
-- 
2.30.2