diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index ea450aeeb..6c925e98c 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -10,8 +10,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # # Platform Linux U-Boot # ------------------------------------------------- -# ccimx6 6.6 2017.03 -# ccimx6qp 6.6 2017.03 +# ccimx6 6.6 2024.04 +# ccimx6qp 6.6 2024.04 # ccimx6ul 6.6 2024.04 # ccimx8x 6.6 2024.04 (packaged in imx-boot) # ccimx8mn 6.6 2024.04 (packaged in imx-boot) diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index d1db11511..a6ecbd75b 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -332,8 +332,4 @@ MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen screen" # IMX specific udev extra rules added when device manager is systemd/udev UDEV_EXTRA_RULES:append = " udev-rules-imx" -# U-Boot 2017.X requires a specific dtc version. -PREFERRED_VERSION_dtc-native:ccimx6 ?= "1.4.5" -PREFERRED_VERSION_nativesdk-dtc:ccimx6 ?= "1.4.5" - DEY_SOC_VENDOR = "NXP" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb deleted file mode 100644 index 2eb261940..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (C) 2018-2023, Digi International Inc. - -require u-boot-dey.inc - -SRCBRANCH = "v2017.03/master" -SRCREV = "${AUTOREV}" - -# Disable support to initial environment for U-Boot -UBOOT_INITIAL_ENV = "" - -COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb index b53bb8890..cfbed2c55 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb @@ -9,4 +9,4 @@ DEPENDS += "flex-native bison-native" SRCBRANCH = "v2024.04/master" SRCREV = "${AUTOREV}" -COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x|ccimx9)" +COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx9)"