Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ccimx8x: add support for wifi and bt overlays 

Remove the old wb device trees from the ccimx8x-sbc-express and ccimx8x-sbc-pro
configuration files and add the ccimx8x wifi and bt overlays. Modify both
platforms' bootscripts to apply the overlays depending on board_id, hardware
capabilities or module variants.

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-21 13:04:22 +02:00
parent f9eaa06e19
commit 306b83eef0
4 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
View File

@ -12,9 +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}" UBOOT_CONFIG[ccimx8x_sbc_express1GB] = "ccimx8x_sbc_express1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
KERNEL_DEVICETREE ?= " \ KERNEL_DEVICETREE ?= " \
digi/ccimx8qxp-sbc-express-id129.dtb \
digi/ccimx8qxp-sbc-express-wb.dtb \
digi/ccimx8qxp-sbc-express.dtb \ digi/ccimx8qxp-sbc-express.dtb \
digi/ccimx8x_ov_bt.dtbo \
digi/ccimx8x_ov_wifi.dtbo \
" "
SERIAL_CONSOLES ?= "115200;ttyLP2" SERIAL_CONSOLES ?= "115200;ttyLP2"

5
meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
View File

@ -13,11 +13,10 @@ 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}" UBOOT_CONFIG[ccimx8x_sbc_pro512MB] = "ccimx8x_sbc_pro512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
KERNEL_DEVICETREE ?= " \ KERNEL_DEVICETREE ?= " \
digi/ccimx8dx-sbc-pro-wb.dtb \
digi/ccimx8dx-sbc-pro.dtb \ digi/ccimx8dx-sbc-pro.dtb \
digi/ccimx8qxp-sbc-pro-id135.dtb \
digi/ccimx8qxp-sbc-pro-wb.dtb \
digi/ccimx8qxp-sbc-pro.dtb \ digi/ccimx8qxp-sbc-pro.dtb \
digi/ccimx8x_ov_bt.dtbo \
digi/ccimx8x_ov_wifi.dtbo \
" "
SERIAL_CONSOLES ?= "115200;ttyLP2" SERIAL_CONSOLES ?= "115200;ttyLP2"

34
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
View File

@ -8,39 +8,39 @@ if test ! -n "${soc_type}"; then
fi fi
# #
# Set device tree filename depending on the board ID (if defined) # Set the base device tree filename
# #
if test -n "${board_id}"; then setenv fdt_file cc${soc_type}-sbc-express.dtb
setenv fdt_file cc${soc_type}-sbc-express-id${board_id}.dtb
#
# Set predetermined overlays for specific board IDs
#
if test "${board_id}" = "129"; then
setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
else else
# #
# Set device tree filename depending on the hardware capabilities # Set overlays depending on the hardware capabilities
# #
if test -n "${module_ram}"; then if test -n "${module_ram}"; then
setexpr module_has_wifi ${hwid_3} \& 1 setexpr module_has_wifi ${hwid_3} \& 1
setexpr module_has_bt ${hwid_3} \& 2 setexpr module_has_bt ${hwid_3} \& 2
setexpr module_has_bt ${module_has_bt} / 2 setexpr module_has_bt ${module_has_bt} / 2
if test "${module_has_wifi}" = "1" && if test "${module_has_bt}" = "1"; then
test "${module_has_bt}" = "1"; then setenv overlays ccimx8x_ov_bt.dtbo,${overlays}
setenv fdt_file cc${soc_type}-sbc-express-wb.dtb fi
else
setenv fdt_file cc${soc_type}-sbc-express.dtb if test "${module_has_wifi}" = "1"; then
setenv overlays ccimx8x_ov_wifi.dtbo,${overlays}
fi fi
else else
# #
# Set device tree filename depending on the hardware variant # Set overlays depending on the hardware variant
# #
if test "${module_variant}" = "0x01" || if test "${module_variant}" = "0x01" ||
test "${module_variant}" = "0x02" || test "${module_variant}" = "0x02" ||
test "${module_variant}" = "0x04"; then test "${module_variant}" = "0x04"; then
setenv fdt_file cc${soc_type}-sbc-express-wb.dtb setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
elif test "${module_variant}" = "0x03" ||
test "${module_variant}" = "0x05" ||
test "${module_variant}" = "0x06"; then
setenv fdt_file cc${soc_type}-sbc-express.dtb
else
setenv fdt_file cc${soc_type}-sbc-express-wb.dtb
fi fi
fi fi
fi fi

34
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
View File

@ -8,39 +8,39 @@ if test ! -n "${soc_type}"; then
fi fi
# #
# Set device tree filename depending on the board ID (if defined) # Set the base device tree filename
# #
if test -n "${board_id}"; then setenv fdt_file cc${soc_type}-sbc-pro.dtb
setenv fdt_file cc${soc_type}-sbc-pro-id${board_id}.dtb
#
# Set predetermined overlays for specific board IDs
#
if test "${board_id}" = "135"; then
setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
else else
# #
# Set device tree filename depending on the hardware capabilities # Set overlays depending on the hardware capabilities
# #
if test -n "${module_ram}"; then if test -n "${module_ram}"; then
setexpr module_has_wifi ${hwid_3} \& 1 setexpr module_has_wifi ${hwid_3} \& 1
setexpr module_has_bt ${hwid_3} \& 2 setexpr module_has_bt ${hwid_3} \& 2
setexpr module_has_bt ${module_has_bt} / 2 setexpr module_has_bt ${module_has_bt} / 2
if test "${module_has_wifi}" = "1" && if test "${module_has_bt}" = "1"; then
test "${module_has_bt}" = "1"; then setenv overlays ccimx8x_ov_bt.dtbo,${overlays}
setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb fi
else
setenv fdt_file cc${soc_type}-sbc-pro.dtb if test "${module_has_wifi}" = "1"; then
setenv overlays ccimx8x_ov_wifi.dtbo,${overlays}
fi fi
else else
# #
# Set device tree filename depending on the hardware variant # Set overlays depending on the hardware variant
# #
if test "${module_variant}" = "0x01" || if test "${module_variant}" = "0x01" ||
test "${module_variant}" = "0x02" || test "${module_variant}" = "0x02" ||
test "${module_variant}" = "0x04"; then test "${module_variant}" = "0x04"; then
setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
elif test "${module_variant}" = "0x03" ||
test "${module_variant}" = "0x05" ||
test "${module_variant}" = "0x06"; then
setenv fdt_file cc${soc_type}-sbc-pro.dtb
else
setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb
fi fi
fi fi
fi fi