package: uboot-qoriq: fix T4240RDB u-boot selection

Mark T4240RDB u-boot variants as device-built and avoid installing them into rootfs.

Without this buildbot crashes during package install with:

ERROR: unable to select packages:

  u-boot-fsl_T4240RDB-nor (no such package):

    required by: world[u-boot-fsl_T4240RDB-nor]

  u-boot-fsl_T4240RDB-sdboot (no such package):

    required by: world[u-boot-fsl_T4240RDB-sdboot]

Fixes: c5d3d5fe28f7 ("package: u-boot: initial support for qoriq arch")
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21514
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/package/boot/uboot-qoriq/Makefile b/package/boot/uboot-qoriq/Makefile
index f2a2f95f2107805235ee06aa4be9d803398b8af2..f90974982136b137a244e4c10b8421e368b21947 100644 (file)
--- a/package/boot/uboot-qoriq/Makefile
+++ b/package/boot/uboot-qoriq/Makefile
@@ -36,12 +36,14 @@ endef
 
 define U-Boot/fsl_T4240RDB-nor
   NAME:=NXP T4240RDB NOR Boot
+  BUILD_DEVICES:=fsl_T4240RDB
   UBOOT_CONFIG:=T4240RDB
   UBOOT_IMAGE:=u-boot-dtb.bin
 endef
 
 define U-Boot/fsl_T4240RDB-sdboot
   NAME:=NXP T4240RDB SD Card Boot
+  BUILD_DEVICES:=fsl_T4240RDB
   UBOOT_CONFIG:=T4240RDB_SDCARD
   UBOOT_IMAGE:=u-boot-with-spl-pbl.bin
 endef

diff --git a/target/linux/qoriq/image/generic.mk b/target/linux/qoriq/image/generic.mk
index 3e0cd4adc8a0d6b1fe144b247eb74020b7fe708a..d084faf70cc2652a087f1598bac1423c14adfa84 100644 (file)
--- a/target/linux/qoriq/image/generic.mk
+++ b/target/linux/qoriq/image/generic.mk
@@ -4,7 +4,7 @@ define Device/fsl_T4240RDB
   DEVICE_DTS_DIR := $(DTS_DIR)/fsl
   DEVICE_PACKAGES := \
     kmod-eeprom-at24 kmod-gpio-button-hotplug kmod-hwmon-w83793 kmod-leds-gpio \
-         kmod-ptp-qoriq kmod-rtc-ds1374 u-boot-fsl_T4240RDB-nor u-boot-fsl_T4240RDB-sdboot
+         kmod-ptp-qoriq kmod-rtc-ds1374
   FILESYSTEMS := squashfs
   KERNEL := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
   IMAGES := factory-nor.bin.gz sdcard.img.gz rcw.bin sysupgrade.bin