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-23 17:40:58 +0100 |
| commit | f2f7e066e25c02da2f6448a015b38449c77b0b21 (patch) | |
| tree | 664784b8f10300174c2aa57716a1f2081bfaa031 | |
| parent | 29126c67d573f446f837b11a5d911cd0b00a13ea (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>
| -rw-r--r-- | conf/machine/colibri-imx6ull.conf | 38 | ||||
| -rw-r--r-- | conf/machine/include/colibri-imx6ull.inc | 11 |
2 files changed, 11 insertions, 38 deletions
diff --git a/conf/machine/colibri-imx6ull.conf b/conf/machine/colibri-imx6ull.conf deleted file mode 100644 index 33e240f..0000000 --- a/conf/machine/colibri-imx6ull.conf +++ /dev/null @@ -1,38 +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_remove = "firmware-imx-epdc" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index c028702..f505178 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" MACHINE_BOOT_FILES = "boot.scr" @@ -14,5 +17,13 @@ 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_use-mainline-bsp ??= "linux-toradex-mainline" |