diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-23 13:29:13 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-30 09:39:09 +0200 |
commit | e3c37c8e4b63eeddc4a00b69e4aedb6f4fe4bad2 (patch) | |
tree | 205ae87e9a53c6e8bc4a953c912d877eff3f0de1 /conf | |
parent | 66d1c4fc6e224ad7a749c1dd72dc5eb978691b6c (diff) |
colibri-imx6ull: drop upstreamed machine and deploy additional device trees
Drop the upstreamed machine configuration file and move all differences
into conf/machine/include/colibri-imx6ull.inc.
Deploy additional device trees.
Related-to: ELB-2593
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit f2f7e066e25c02da2f6448a015b38449c77b0b21)
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/colibri-imx6ull.conf | 39 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx6ull.inc | 10 |
2 files changed, 10 insertions, 39 deletions
diff --git a/conf/machine/colibri-imx6ull.conf b/conf/machine/colibri-imx6ull.conf deleted file mode 100644 index bff48be..0000000 --- a/conf/machine/colibri-imx6ull.conf +++ /dev/null @@ -1,39 +0,0 @@ -#@TYPE: Machine -#@NAME: Toradex Colibri iMX6ULL -#@SOC: i.MX6ULL -#@DESCRIPTION: Machine configuration for Toradex Colibri iMX6 ULL SOM -#@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com> - -MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:" - -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa7.inc - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex" -PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-toradex-mainline" -KERNEL_DEVICETREE += " \ - imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb \ - imx6ull-colibri-aster.dtb imx6ull-colibri-wifi-aster.dtb \ -" -KERNEL_DEVICETREE_use-mainline-bsp = "imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb" -KERNEL_IMAGETYPE = "zImage" -# The kernel lives in its own ubi volume. -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" - -PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex" -PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" -UBOOT_BINARY = "u-boot-nand.imx" -UBOOT_MAKE_TARGET = "u-boot.imx" -UBOOT_MACHINE ?= "colibri-imx6ull_defconfig" - -IMAGE_FSTYPES += "wic.gz tar.xz" -# wic support -WKS_FILE = "sdimage-bootpart.wks" -WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" - -SERIAL_CONSOLES = "115200;ttymxc0" - -MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" -MACHINE_FIRMWARE_append = " linux-firmware-sd8997" -MACHINE_FIRMWARE_remove = "firmware-imx-epdc" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index feccfa1..538bf48 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -7,6 +7,9 @@ TORADEX_PRODUCT_IDS[0044] = "imx6ull-colibri-eval-v3.dtb" TORADEX_PRODUCT_IDS[0045] = "imx6ull-colibri-wifi-eval-v3.dtb" TORADEX_FLASH_TYPE = "rawnand" +IMAGE_FSTYPES += "wic.gz" +WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" + MACHINE_NAME = "Colibri-iMX6ULL" MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" @@ -16,7 +19,14 @@ IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}" WKS_FILE_DEPENDS_append = " u-boot-distro-boot" UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000" +UBOOT_MAKE_TARGET_colibri-imx6ull = "u-boot.imx" +KERNEL_DEVICETREE += " \ + imx6ull-colibri-aster.dtb imx6ull-colibri-wifi-aster.dtb \ + imx6ull-colibri-iris.dtb imx6ull-colibri-wifi-iris.dtb \ + imx6ull-colibri-iris-v2.dtb imx6ull-colibri-wifi-iris-v2.dtb \ +" +KERNEL_DEVICETREE_use-mainline-bsp = "imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" PREFERRED_PROVIDER_virtual/kernel_upstream = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt = "linux-toradex-mainline-rt" |