diff options
Diffstat (limited to 'bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6.conf')
-rw-r--r-- | bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6.conf | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6.conf b/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6.conf index 0c6d7ccf..45f4d9b2 100644 --- a/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6.conf +++ b/bsp/meta-freescale-3rdparty/conf/machine/colibri-imx6.conf @@ -9,11 +9,10 @@ MACHINEOVERRIDES =. "mx6:mx6dl:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc -PREFERRED_PROVIDER_virtual/kernel ??= "linux-toradex" -PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc" +PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb \ imx6dl-colibri-aster.dtb" -KERNEL_DEVICETREE_use-mainline-bsp += "imx6dl-colibri-eval-v3.dtb" +KERNEL_DEVICETREE_use-mainline-bsp = "imx6dl-colibri-eval-v3.dtb" KERNEL_IMAGETYPE = "zImage" # The kernel lives in a seperate FAT partition, don't deploy it in /boot/ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" @@ -22,6 +21,7 @@ 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" PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils" +PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex" SPL_BINARY = "SPL" UBOOT_CONFIG ??= "spl" @@ -31,6 +31,8 @@ UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000" IMAGE_FSTYPES += "tar.xz" # wic support +IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" +WKS_FILE_DEPENDS_append = " u-boot-default-script" WKS_FILE = "sdimage-bootpart.wks" MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" |