From 222ded5a38d4754aa2e4cda5cdced724a28fdd05 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 25 May 2020 16:31:26 +0200 Subject: [PATCH] digi-sc-firmware: update to v1.4.0.2 This update is a cosmetic one and removes the RAM frequency from the SCFW filenames. Reflect this change in the RAM_CONFIGS variable and in the uSD/UUU installation scripts. As a result, the imx-boot filenames will no longer have the RAM frequency either. https://jira.digi.com/browse/DEL-7096 Signed-off-by: Gabriel Valcazar --- .../conf/machine/include/ccimx8x.inc | 2 +- ...1.4.0.1.bb => digi-sc-firmware_1.4.0.2.bb} | 4 ++-- .../install_linux_fw_sd.txt | 15 +++++++-------- .../ccimx8x-sbc-pro/install_linux_fw_sd.txt | 19 +++++++++---------- .../ccimx8x-sbc-pro/install_linux_fw_uuu.sh | 12 ++++++------ 5 files changed, 25 insertions(+), 27 deletions(-) rename meta-digi-arm/recipes-bsp/digi-sc-firmware/{digi-sc-firmware_1.4.0.1.bb => digi-sc-firmware_1.4.0.2.bb} (89%) diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 7489684fa..35587f451 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -24,7 +24,7 @@ SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}" # This determines the number of different DCD files, and thus the number of # different U-Boot binaries required. # Last one is the default (the one the symlinks point at) -RAM_CONFIGS = "1.2GHz_512MB_16bit 1.2GHz_1GB_16bit 1.2GHz_1GB_32bit 1.2GHz_2GB_32bit" +RAM_CONFIGS = "512MB_16bit 1GB_16bit 1GB_32bit 2GB_32bit" # The original variable used by NXP to store the mkimage "REV" parameter, # REV_OPTION, has a format of "REV=X0". Since we are interested in building diff --git a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.1.bb b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.2.bb similarity index 89% rename from meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.1.bb rename to meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.2.bb index f988e0187..9067689da 100644 --- a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.1.bb +++ b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.2.bb @@ -11,8 +11,8 @@ inherit pkgconfig deploy SRC_URI = "${DIGI_PKG_SRC}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "c00ac914301aecca6b107f36750fca40" -SRC_URI[sha256sum] = "340e103d3a15089560140995a54df6036883e83ddf32ceb6881db1abdacd591f" +SRC_URI[md5sum] = "bcf3402c9d6a394dad8d518a73cb27ad" +SRC_URI[sha256sum] = "bd5fb8a35d9fbb0e10f93513e52a3ce3e105e4a80d82624a0be4e73eb95b1352" S = "${WORKDIR}/${PN}-${PV}" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt index feea47c06..cef4f9334 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt @@ -20,24 +20,23 @@ if test $? -eq 1; then fi # Determine U-Boot file to program basing on SOM's RAM size and SOC type (linked to bus width) -ram_freq="1.2GHz" bus_width="32bit" if test -n "${module_ram}" && test -n "${soc_type}"; then if test "${soc_type}" = "imx8dx"; then bus_width="16bit" fi - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${ram_freq}_${module_ram}_${bus_width}.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${module_ram}_${bus_width}.bin; else # Determine U-Boot file to program basing on SOM's variant if test -n "${module_variant}"; then if test "${module_variant}" = "0x01"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_1GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_32bit.bin; elif test "${module_variant}" = "0x02" || \ test "${module_variant}" = "0x03"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_2GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-2GB_32bit.bin; elif test "${module_variant}" = "0x04" || \ test "${module_variant}" = "0x05"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_1GB_16bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_16bit.bin; fi fi fi @@ -52,11 +51,11 @@ else echo ""; echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 8X variant:"; echo " - For a QuadXPlus CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_1GB_32bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_32bit.bin"; echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_2GB_32bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-2GB_32bit.bin"; echo " - For a DualX CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_1GB_16bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_16bit.bin"; echo ""; echo "2. Run the install script again."; echo ""; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt index 7de0eb26e..4f9fe3265 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt @@ -31,26 +31,25 @@ fi setenv skip-uboot-check "yes" # Determine U-Boot file to program basing on SOM's RAM size and SOC type (linked to bus width) -ram_freq="1.2GHz" bus_width="32bit" if test -n "${module_ram}" && test -n "${soc_type}"; then if test "${soc_type}" = "imx8dx"; then bus_width="16bit" fi - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-${ram_freq}_${module_ram}_${bus_width}.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-${module_ram}_${bus_width}.bin; else # Determine U-Boot file to program basing on SOM's variant if test -n "${module_variant}"; then if test "${module_variant}" = "0x01"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_1GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_32bit.bin; elif test "${module_variant}" = "0x02" || \ test "${module_variant}" = "0x03"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_2GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-2GB_32bit.bin; elif test "${module_variant}" = "0x04" || \ test "${module_variant}" = "0x05"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_1GB_16bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin; elif test "${module_variant}" = "0x06"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_512GB_16bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-512GB_16bit.bin; fi fi fi @@ -65,13 +64,13 @@ else echo ""; echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 8X variant:"; echo " - For a QuadXPlus CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_1GB_32bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_32bit.bin"; echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_2GB_32bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-2GB_32bit.bin"; echo " - For a DualX CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_1GB_16bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin"; echo " - For a DualX CPU with 512MB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_512MB_16bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-512MB_16bit.bin"; echo ""; echo "2. Run the install script again."; echo ""; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh index 5979f30c6..8f40ea9b4 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh @@ -76,10 +76,10 @@ if [ -z "${module_ram}" ]; then else module_ram="512MB" fi - INSTALL_UBOOT_FILENAME="imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_${module_ram}_${bus_width}.bin" + INSTALL_UBOOT_FILENAME="imx-boot-ccimx8x-sbc-pro-${soc_rev}-${module_ram}_${bus_width}.bin" fi else - INSTALL_UBOOT_FILENAME="imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_${module_ram}_${bus_width}.bin" + INSTALL_UBOOT_FILENAME="imx-boot-ccimx8x-sbc-pro-${soc_rev}-${module_ram}_${bus_width}.bin" fi # remove redirect @@ -94,13 +94,13 @@ else echo "" echo "1. Add U-boot file name, depending on your ConnectCore 8X variant, to script command line:" echo " - For a QuadXPlus CPU with 1GB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_1GB_32bit.bin" + echo " => ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_32bit.bin" echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_2GB_32bit.bin" + echo " => ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-${soc_rev}-2GB_32bit.bin" echo " - For a DualX CPU with 1GB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_1GB_16bit.bin" + echo " => ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin" echo " - For a DualX CPU with 512MB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-${soc_rev}-1.2GHz_512MB_16bit.bin" + echo " => ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-${soc_rev}-512MB_16bit.bin" echo "" echo "2. Run the install script again." echo ""