diff options
| author | Ming Liu <ming.liu@toradex.com> | 2020-04-22 14:30:13 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-18 16:56:01 +0200 |
| commit | 0327feb8d688dd4fcf6c831785b70d6af64eee20 (patch) | |
| tree | 2495259000e34c116f68f32eeb0e2abbc7017876 /conf | |
| parent | 984f7ec2f224c63cb5577854c0200d6cad2f6de1 (diff) | |
colibri-imx6ull.conf: drop machine conf
Use the one in meta-freescale-3rdparty layer, and append toradex
specific definitions to conf/machine/include/colibri-imx6ull.inc.
Signed-off-by: Ming Liu <ming.liu@toradex.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/colibri-imx6ull.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 3f62d9d..f401305 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -17,8 +17,7 @@ UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000" MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" -MACHINE_BOOT_FILES = "boot.scr" -IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}" +IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" WKS_FILE_DEPENDS_append = " u-boot-distro-boot" UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000" @@ -29,6 +28,7 @@ KERNEL_DEVICETREE_append_use_nxp_bsp = " \ imx6ull-colibri-iris.dtb imx6ull-colibri-wifi-iris.dtb \ imx6ull-colibri-iris-v2.dtb imx6ull-colibri-wifi-iris-v2.dtb \ " +PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline" |