From 8eedf4407e29274ae419bbd1865c0e4df39ea38f Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Thu, 9 Jul 2020 12:34:37 +0200 Subject: [PATCH] meta-digi-arm: Add new CC6UL variants Signed-off-by: Mike Engel https://jira.digi.com/browse/DEL-7169 --- README.md | 4 ++++ meta-digi-arm/conf/machine/ccimx6ulsbc.conf | 3 ++- meta-digi-arm/conf/machine/ccimx6ulstarter.conf | 3 ++- .../u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt | 8 ++++++-- .../u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt | 8 ++++++-- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b0c8d6bc5..00ec34e54 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,10 @@ Software for the following hardware platforms is in production support: * [CC-WMX-JN58-NE](https://www.digi.com/products/models/cc-wmx-jn58-ne) * [CC-MX-JN58-Z1](https://www.digi.com/products/models/cc-mx-jn58-z1) * CC-WMX-JN7A-NE + * [CC-WMX-JN7A-CBX](https://www.digi.com/products/models/cc-wmx-jn7a-cbx) + * [CC-WMX-JN68-NN](https://www.digi.com/products/models/cc-wmx-jn68-nn) + * [CC-WMX-JN69-NN](https://www.digi.com/products/models/cc-wmx-jn69-nn) + * [CC-MX-JN69-ZN](hhtps://www.digi.com/products/models/cc-mx-jn69-zn) * ConnectCore 6UL SBC Express * [CC-WMX6UL-START](https://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/3.0/cc6ul/yocto-gs_index)) * [CC-SBE-WMX-JN58](https://www.digi.com/products/models/cc-sbe-wmx-jn58) diff --git a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf index f633e8cd8..f11849f3c 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf @@ -7,8 +7,9 @@ include conf/machine/include/ccimx6ul.inc # U-Boot configurations # Last one is the default (the one the symlinks point at) -UBOOT_CONFIG ??= "ccimx6ulsbc1GB ccimx6ulsbc" +UBOOT_CONFIG ??= "ccimx6ulsbc1GB ccimx6ulsbc512MB ccimx6ulsbc" UBOOT_CONFIG[ccimx6ulsbc1GB] = "ccimx6ulsbc1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" +UBOOT_CONFIG[ccimx6ulsbc512MB] = "ccimx6ulsbc512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" UBOOT_CONFIG[ccimx6ulsbc] = "ccimx6ulsbc_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" # U-Boot environment offset (within partition) diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf index cef942ef0..cee022c08 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf @@ -7,8 +7,9 @@ include conf/machine/include/ccimx6ul.inc # U-Boot configurations # Last one is the default (the one the symlinks point at) -UBOOT_CONFIG ??= "ccimx6ulstarter1GB ccimx6ulstarter" +UBOOT_CONFIG ??= "ccimx6ulstarter1GB ccimx6ulstarter512MB ccimx6ulstarter" UBOOT_CONFIG[ccimx6ulstarter1GB] = "ccimx6ulstarter1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" +UBOOT_CONFIG[ccimx6ulstarter512MB] = "ccimx6ulstarter512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" UBOOT_CONFIG[ccimx6ulstarter] = "ccimx6ulstarter_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" # U-Boot environment offset (within partition) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt index 3ecb9ed69..29a729932 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt @@ -21,10 +21,12 @@ fi # Determine U-Boot file to program basing on module variant if test -n "${module_variant}"; then - if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06"; then + if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x0a"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulsbc.imx; - elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05"; then + elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulsbc1GB.imx; + elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x09"; then + setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulsbc512MB.imx fi fi # Use 'test -n ...' because 'test -z ...' does not work well on old versions of @@ -38,6 +40,8 @@ else echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6UL variant:"; echo " - For a SOM with 1GB DDR3, run:"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulsbc1GB.imx"; + echo " - For a SOM with 512MB DDR3, run:"; + echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulsbc512MB.imx"; echo " - For a SOM with 256MB DDR3, run:"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulsbc.imx"; echo ""; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt index 1788b9904..7c009c37d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt @@ -21,10 +21,12 @@ fi # Determine U-Boot file to program basing on module variant if test -n "${module_variant}"; then - if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06"; then + if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x0a; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter.imx; - elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05"; then + elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter1GB.imx; + elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x09"; then + setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter512MB.imx fi fi # Use 'test -n ...' because 'test -z ...' does not work well on old versions of @@ -38,6 +40,8 @@ else echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6UL variant:"; echo " - For a SOM with 1GB DDR3, run:"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter1GB.imx"; + echo " - For a SOM with 512MB DDR3, run:"; + echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter512MB.imx"; echo " - For a SOM with 256MB DDR3, run:"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter.imx"; echo "";