From 5ae2fc68345f7e93faf2336130ba899e58972947 Mon Sep 17 00:00:00 2001 From: Alexandru Costache Date: Fri, 26 Jan 2024 12:38:09 +0000 Subject: [PATCH] conf/machine: Cleanup machine includes We unset ROOTFS_SIZE from the balena-image in PR #435 so we can cleanup the machine includes now. imx8mm-var-dart.inc brought in in this commit is imx8mm-var-dart.conf from meta-variscite-bsp at 72250affb5f300e0891c4170e38a1071a6e6181b Changelog-entry: conf/machine: Remove machine includes Signed-off-by: Alexandru Costache --- .../conf/machine/imx8m-var-dart.conf | 2 +- .../conf/machine/imx8mm-var-dart.conf | 2 + .../conf/machine/imx8mm-var-dart.inc | 14 +-- .../conf/machine/imx8mq-var-dart.inc | 86 ------------------- .../conf/machine/variscite.inc | 81 ----------------- .../conf/machine/variscite_bcm43xx.inc | 11 --- 6 files changed, 6 insertions(+), 190 deletions(-) delete mode 100644 layers/meta-balena-imx8m-var-dart/conf/machine/imx8mq-var-dart.inc delete mode 100644 layers/meta-balena-imx8m-var-dart/conf/machine/variscite.inc delete mode 100644 layers/meta-balena-imx8m-var-dart/conf/machine/variscite_bcm43xx.inc diff --git a/layers/meta-balena-imx8m-var-dart/conf/machine/imx8m-var-dart.conf b/layers/meta-balena-imx8m-var-dart/conf/machine/imx8m-var-dart.conf index 8fdc52f5..6242c760 100644 --- a/layers/meta-balena-imx8m-var-dart/conf/machine/imx8m-var-dart.conf +++ b/layers/meta-balena-imx8m-var-dart/conf/machine/imx8m-var-dart.conf @@ -10,5 +10,5 @@ MACHINEOVERRIDES = "imx8mq-var-dart:${MACHINE}" -include conf/machine/imx8mq-var-dart.inc +include conf/machine/imx8mq-var-dart.conf diff --git a/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mm-var-dart.conf b/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mm-var-dart.conf index c6e1b581..b93819e7 100644 --- a/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mm-var-dart.conf +++ b/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mm-var-dart.conf @@ -3,3 +3,5 @@ ##@DESCRIPTION: Machine configuration for the imx8mm-var-dart-nrt include conf/machine/imx8mm-var-dart.inc + +SERIAL_CONSOLES = "115200;ttymxc0" diff --git a/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mm-var-dart.inc b/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mm-var-dart.inc index d63511ef..7fa32dd1 100644 --- a/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mm-var-dart.inc +++ b/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mm-var-dart.inc @@ -1,17 +1,9 @@ -#@TYPE: Machine -#@NAME: Variscite DART-MX8M-MINI -#@SOC: i.MX8MM -#@DESCRIPTION: Machine configuration for Variscite DART-MX8M-MINI and VAR-SOM-MX8M-MINI -#@MAINTAINER: Nate Drude -# -# http://www.variscite.com - MACHINEOVERRIDES =. "mx8mm:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc -require variscite.inc -require variscite_bcm43xx.inc +require conf/machine/variscite.inc +require conf/machine/variscite_bcm43xx.inc # Variscite BSP default providers PREFERRED_PROVIDER_virtual/kernel:imx8mm-var-dart ?= "linux-variscite" @@ -60,7 +52,7 @@ IMX_BOOT_SOC_TARGET = "iMX8MM" # Extra firmware package name, that is required to build boot container for fslc bsp IMX_EXTRA_FIRMWARE = "firmware-imx-8m" -SERIAL_CONSOLES = "115200;ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0 " IMAGE_BOOTLOADER = "imx-boot" diff --git a/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mq-var-dart.inc b/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mq-var-dart.inc deleted file mode 100644 index 88f622eb..00000000 --- a/layers/meta-balena-imx8m-var-dart/conf/machine/imx8mq-var-dart.inc +++ /dev/null @@ -1,86 +0,0 @@ -#@TYPE: Machine -#@NAME: Variscite DART-MX8M -#@SOC: i.MX8MQ -#@DESCRIPTION: Machine configuration for Variscite DART-MX8M -#@MAINTAINER: Nate Drude -# -# http://www.variscite.com - -MACHINEOVERRIDES =. "mx8mq:" -require conf/machine/include/imx-base.inc -require conf/machine/include/arm/armv8a/tune-cortexa53.inc - -require variscite.inc -require variscite_bcm43xx.inc - -# Variscite BSP default providers -PREFERRED_PROVIDER_virtual/kernel:imx8mq-var-dart ?= "linux-variscite" -PREFERRED_PROVIDER_u-boot:imx8mq-var-dart ?= "u-boot-variscite" -PREFERRED_PROVIDER_u-boot-fw-utils:imx8mq-var-dart ?= "u-boot-fw-utils" -PREFERRED_PROVIDER_virtual/bootloader:imx8mq-var-dart ?= "u-boot-variscite" - -KERNEL_DEVICETREE = " \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-m4-sd-dp.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-m4-sd-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-m4-sd-lvds-dp.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-m4-sd-lvds.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-m4-sd-lvds-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-m4-wifi-dp.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-m4-wifi-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-m4-wifi-lvds-dp.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-m4-wifi-lvds.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-m4-wifi-lvds-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-sd-dp.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-sd-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-sd-lvds-dp.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-sd-lvds.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-sd-lvds-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-wifi-dp.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-wifi-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-wifi-lvds-dp.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-wifi-lvds.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-legacy-wifi-lvds-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-m4-sd-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-m4-sd-lvds.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-m4-sd-lvds-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-m4-wifi-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-m4-wifi-lvds.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-m4-wifi-lvds-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-sd-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-sd-lvds.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-sd-lvds-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-wifi-hdmi.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-wifi-lvds.dtb \ - freescale/imx8mq-var-dart-dt8mcustomboard-wifi-lvds-hdmi.dtb \ -" - -MACHINE_EXTRA_RRECOMMENDS:remove = " imx-m4-demos" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8mq_var_dart_config,sdcard" -SPL_BINARY = "spl/u-boot-spl.bin" - -ATF_PLATFORM = "imx8mq" - -# Set DDR FIRMWARE -DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin" - -# Set U-Boot DTB -UBOOT_DTB_NAME = "imx8mq-var-dart-dt8mcustomboard.dtb" - -# Set imx-mkimage boot target -IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" -IMX_BOOT_SOC_TARGET = "iMX8M" - -SERIAL_CONSOLES = "115200;ttymxc0" - -IMAGE_BOOTLOADER = "imx-boot" - -LOADADDR = "" -UBOOT_SUFFIX = "bin" -UBOOT_MAKE_TARGET = "" -IMX_BOOT_SEEK = "33" - -# If you change TEE_LOAD_ADDR, make sure to align patch for soc.mak -TEE_LOAD_ADDR ?= "0x56000000" -TEE_CFG_DDR_SIZE ?= "0x100000000" diff --git a/layers/meta-balena-imx8m-var-dart/conf/machine/variscite.inc b/layers/meta-balena-imx8m-var-dart/conf/machine/variscite.inc deleted file mode 100644 index b460f04e..00000000 --- a/layers/meta-balena-imx8m-var-dart/conf/machine/variscite.inc +++ /dev/null @@ -1,81 +0,0 @@ -## Brough in from Kirkstone branch of meta-variscite-bsp github repository -## See https://variwiki.com/index.php?title=DART-MX8M-MINI_Release_Notes&release=mx8mm-yocto-kirkstone-5.15-2.0.x-v1.3 -## for release details -INHERIT += "image-buildinfo" - -MACHINE_FEATURES += " pci bluetooth wifi screen" - -IMX_DEFAULT_BSP = "nxp" - -USE_VT = "0" - -KERNEL_IMAGETYPE:mx8-nxp-bsp = "Image.gz" - -WKS_FILE:mx8-nxp-bsp = "imx-imx-boot-singlepart.wks.in" - -# Set a more generic tuning for code reuse across parts -DEFAULTTUNE:mx8-nxp-bsp:fslc ?= "armv8a-crc-crypto" -DEFAULTTUNE:mx8m-nxp-bsp:fslc ?= "armv8a-crc-crypto" -DEFAULTTUNE:mx8qxp-nxp-bsp:fslc ?= "armv8a-crc-crypto" -DEFAULTTUNE:mx8x-nxp-bsp:fslc ?= "armv8a-crc-crypto" - -# Variscite BSP default providers -PREFERRED_RPROVIDER_u-boot-default-env ?= "u-boot-variscite" - -# Use i.MX Gstreamer Version -MACHINE_GSTREAMER_1_0_PLUGIN:mx8-nxp-bsp = "imx-gst1.0-plugin" -PREFERRED_VERSION_imx-gst1.0-plugin:mx8-nxp-bsp ?= "4.7.0" -PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ?= "1.20.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ?= "1.20.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ?= "1.20.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ?= "1.20.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ?= "1.20.0" -PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ?= "1.20.0" -PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ?= "1.20.0" - -# Add VPU and Cortex M4/M7 firmware -MACHINE_FIRMWARE:append:mx8-nxp-bsp = " \ - firmware-imx-vpu-imx8 \ - freertos-variscite \ - " - -# Add VPU and Cortex M4/M7 firmware -MACHINE_FIRMWARE:append:mx8-nxp-bsp = " \ - freertos-variscite \ - " -MACHINE_EXTRA_RDEPENDS += " \ - gptfdisk \ - hostapd \ - hdparm \ - imx-kobs \ - iw \ - kernel-modules \ - kmod \ - ${@bb.utils.contains('DISTRO', 'b2qt', '', \ - bb.utils.contains('DISTRO_FEATURES', 'wayland', 'networkmanager networkmanager-nmcli', \ - '', d), d)} \ - packagegroup-tools-bluetooth \ - bluealsa \ - pm-utils \ - rng-tools \ - wpa-supplicant \ - wireless-regdb-static \ - u-boot-fw-utils \ - u-boot-splash \ -" - -# Packages added to all images (including core-image-minimal) -IMAGE_INSTALL:append:mx8-nxp-bsp = " \ - kernel-image \ - kernel-devicetree \ -" - -IMAGE_FSTYPES = "tar.gz wic.gz" - -# Wayland based distros add systemd to DISTRO_FEATURES -# Remove sysvinit or systemd based on DISTRO_FEATURES to avoid conflicts -DISTRO_FEATURES_BACKFILL_CONSIDERED:append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' sysvinit', '', d)}" -DISTRO_FEATURES_BACKFILL_CONSIDERED:append = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', ' systemd', '', d)}" - -# Use bluez-alsa instead of pulseaudio -DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " pulseaudio" diff --git a/layers/meta-balena-imx8m-var-dart/conf/machine/variscite_bcm43xx.inc b/layers/meta-balena-imx8m-var-dart/conf/machine/variscite_bcm43xx.inc deleted file mode 100644 index aad66993..00000000 --- a/layers/meta-balena-imx8m-var-dart/conf/machine/variscite_bcm43xx.inc +++ /dev/null @@ -1,11 +0,0 @@ -## Brough in from Kirkstone branch of meta-variscite-bsp github repository -## See https://variwiki.com/index.php?title=DART-MX8M-MINI_Release_Notes&release=mx8mm-yocto-kirkstone-5.15-2.0.x-v1.3 -## for release details - -MACHINE_EXTRA_RDEPENDS += " \ - bcm43xx-utils \ - brcm-patchram-plus \ - linux-firmware-bcm4339 \ - linux-firmware-bcm43430 \ -" -