ccimx8x: add support for QXP overlay

Each platform now has only one base device tree, meant for the i.MX8DX variants
of the ccimx8x boards. Apply the QXP overlay in the bootscript if the SOC is
identified as an i.MX8QXP.

Since we want to give this overlay a higher priority than the SOM overlays
(wifi and bluetooth), prepend it to the overlay list after appending the SOM
overlays.

https://jira.digi.com/browse/DEL-7100

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2020-05-25 13:54:54 +02:00
parent 219cee7b9c
commit bc7320f203
4 changed files with 16 additions and 5 deletions

View File

@ -12,8 +12,9 @@ UBOOT_CONFIG[ccimx8x_sbc_express2GB] = "ccimx8x_sbc_express2GB_defconfig,,u-boot
UBOOT_CONFIG[ccimx8x_sbc_express1GB] = "ccimx8x_sbc_express1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
KERNEL_DEVICETREE ?= " \
digi/ccimx8qxp-sbc-express.dtb \
digi/ccimx8x-sbc-express.dtb \
digi/ccimx8x_ov_bt.dtbo \
digi/ccimx8x_ov_qxp.dtbo \
digi/ccimx8x_ov_wifi.dtbo \
"

View File

@ -13,9 +13,9 @@ UBOOT_CONFIG[ccimx8x_sbc_pro1GB] = "ccimx8x_sbc_pro1GB_defconfig,,u-boot-dtb.${U
UBOOT_CONFIG[ccimx8x_sbc_pro512MB] = "ccimx8x_sbc_pro512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
KERNEL_DEVICETREE ?= " \
digi/ccimx8dx-sbc-pro.dtb \
digi/ccimx8qxp-sbc-pro.dtb \
digi/ccimx8x-sbc-pro.dtb \
digi/ccimx8x_ov_bt.dtbo \
digi/ccimx8x_ov_qxp.dtbo \
digi/ccimx8x_ov_wifi.dtbo \
digi/ccimx8x-sbc-pro_ov_flexcan1.dtbo \
digi/ccimx8x-sbc-pro_ov_lpuart3.dtbo \

View File

@ -10,7 +10,7 @@ fi
#
# Set the base device tree filename
#
setenv fdt_file cc${soc_type}-sbc-express.dtb
setenv fdt_file ccimx8x-sbc-express.dtb
#
# Set predetermined overlays for specific board IDs
@ -45,6 +45,11 @@ else
fi
fi
# Apply QXP overlay if the SOC type is "imx8qxp"
if test "${soc_type}" = "imx8qxp""; then
setenv overlays ccimx8x_ov_qxp.dtbo,${overlays}
fi
# Get the UUID of the configured boot partition.
part uuid mmc ${mmcbootdev}:${mmcpart} bootpart
# Check the boot source.

View File

@ -10,7 +10,7 @@ fi
#
# Set the base device tree filename
#
setenv fdt_file cc${soc_type}-sbc-pro.dtb
setenv fdt_file ccimx8x-sbc-pro.dtb
#
# Set predetermined overlays for specific board IDs
@ -45,6 +45,11 @@ else
fi
fi
# Apply QXP overlay if the SOC type is "imx8qxp"
if test "${soc_type}" = "imx8qxp""; then
setenv overlays ccimx8x_ov_qxp.dtbo,${overlays}
fi
# Get the UUID of the configured boot partition.
part uuid mmc ${mmcbootdev}:${mmcpart} bootpart
# Check the boot source.