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 <[email protected]>

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
 

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"

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 <[email protected]>
-#
-# 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"