diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 045fe8b10..d8b309a3f 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -19,6 +19,11 @@ IMAGE_BOOTLOADER = "imx-boot" BOOTLOADER_SEEK = "32" SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/imx-boot-${MACHINE}.bin" +# RAM variants +# This determines the number of different DCD files, and thus the number of +# different U-Boot binaries required. +RAM_CONFIGS = "1.2GHz_512MB_16bit 1.2GHz_1GB_16bit 1.2GHz_1GB_32bit 1.2GHz_2GB_32bit" + # Linux kernel configuration KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8x_defconfig" diff --git a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.2.2.1.bb b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.2.2.1.bb index 1a01edb06..12c71ef29 100644 --- a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.2.2.1.bb +++ b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.2.2.1.bb @@ -11,21 +11,20 @@ inherit pkgconfig deploy SRC_URI = "${DIGI_PKG_SRC}/${PN}-${PV}.tar.gz" -SRC_URI[md5sum] = "18e4d7e6175792ff30d38aacbee3889e" -SRC_URI[sha256sum] = "121014d985a781be1feee1ecc65db0f8a373925e8fba606f1a286202a1e0c266" +SRC_URI[md5sum] = "bc4ec7966821a43eaf83bf945d4264f8" +SRC_URI[sha256sum] = "7f8ddccc6ca990246584e6f27e836dea156e0ea600aaee09548c043bde1974fc" S = "${WORKDIR}/${PN}-${PV}" -SC_FIRMWARE_NAME ?= "mx8qx-${DIGI_FAMILY}-scfw-tcm.bin" +SC_FIRMWARE_NAME ?= "mx8x-${DIGI_FAMILY}-scfw-tcm.bin" symlink_name = "scfw_tcm.bin" SYSROOT_DIRS += "/boot" do_install () { install -d ${D}/boot - for type in ${UBOOT_CONFIG}; do - RAM_SIZE="$(echo ${type} | sed -e 's,.*\([0-9]\+GB\),\1,g')" - install -m 0644 ${S}/${SC_FIRMWARE_NAME}-${RAM_SIZE} ${D}/boot/ + for ramc in ${RAM_CONFIGS}; do + install -m 0644 ${S}/${SC_FIRMWARE_NAME}-${ramc} ${D}/boot/ done } @@ -33,12 +32,11 @@ BOOT_TOOLS = "imx-boot-tools" do_deploy () { install -d ${DEPLOYDIR}/${BOOT_TOOLS} - for type in ${UBOOT_CONFIG}; do - RAM_SIZE="$(echo ${type} | sed -e 's,.*\([0-9]\+GB\),\1,g')" - install -m 0644 ${S}/${SC_FIRMWARE_NAME}-${RAM_SIZE} ${DEPLOYDIR}/${BOOT_TOOLS}/ + for ramc in ${RAM_CONFIGS}; do + install -m 0644 ${S}/${SC_FIRMWARE_NAME}-${ramc} ${DEPLOYDIR}/${BOOT_TOOLS}/ cd ${DEPLOYDIR}/${BOOT_TOOLS}/ - rm -f ${symlink_name}-${RAM_SIZE} - ln -sf ${SC_FIRMWARE_NAME}-${RAM_SIZE} ${symlink_name}-${RAM_SIZE} + rm -f ${symlink_name}-${ramc} + ln -sf ${SC_FIRMWARE_NAME}-${ramc} ${symlink_name}-${ramc} cd - done }