MIRRORS/meta-freescale-3rdparty
1
0
Fork 0
mirror of https://github.com/Freescale/meta-freescale-3rdparty.git synced 2025-07-19 12:09:01 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

colibri-imx7: Fix mainline and NXP BXP support

Browse Source 
We need to support both mainline and NXP BSP support, to allow that we
need:

 - split generic and NXP BSP specific device trees
 - avoid setting the default Linux kernel if we use mainline BSP

This was applied for:

 - colibri-imx7-emmc
 - colibri-imx7-nand

Fixes: #78
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador 2020-05-29 10:14:17 -03:00
parent 77495390f6
commit a1500b3e8a
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/machine/colibri-imx7-emmc.conf
View File

@ -9,8 +9,10 @@ MACHINEOVERRIDES =. "mx7:mx7d:"
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa7.inc
PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
KERNEL_DEVICETREE += "imx7d-colibri-emmc-eval-v3.dtb imx7d-colibri-emmc-aster.dtb"
PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex"
KERNEL_DEVICETREE = "imx7d-colibri-emmc-eval-v3.dtb"
KERNEL_DEVICETREE_append_use-nxp-bsp = " imx7d-colibri-emmc-aster.dtb"
# The kernel lives in a seperate FAT partition, don't deploy it in /boot/
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""

15
conf/machine/colibri-imx7-nand.conf
View File

@ -9,10 +9,19 @@ MACHINEOVERRIDES =. "mx7:mx7d:colibri-imx7:"
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-nxp-bsp ??= "linux-toradex"
KERNEL_IMAGETYPE = "zImage"
KERNEL_DEVICETREE += "imx7d-colibri-eval-v3.dtb imx7s-colibri-eval-v3.dtb \
imx7d-colibri-aster.dtb imx7s-colibri-aster.dtb"
KERNEL_DEVICETREE = " \
imx7d-colibri-eval-v3.dtb \
imx7s-colibri-eval-v3.dtb \
"
KERNEL_DEVICETREE_append_use-nxp-bsp = " \
imx7d-colibri-aster.dtb \
imx7s-colibri-aster.dtb \
"
# U-Boot of our newer release read the Kernel and device tree from static UBI
# volumes, hence no need to deploy the kernel binary in the image itself