From 9da5aac0633b6e2b48e100b79969e405248873dc Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 27 Dec 2019 11:45:30 +0100 Subject: [PATCH] firmware-imx: remove custom do_deploy support to use upstream version For the i.MX8M processors, the do_deploy support is provided by the upstream recipe firmware-imx-8m. https://jira.digi.com/browse/DEL-6911 Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/include/ccimx8mn.inc | 3 +++ .../recipes-bsp/firmware-imx/firmware-imx_8.4.bb | 11 +---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx8mn.inc b/meta-digi-arm/conf/machine/include/ccimx8mn.inc index 4f947eb48..dc58b519f 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8mn.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8mn.inc @@ -19,6 +19,9 @@ BOOTLOADER_SEEK = "32" BOOTABLE_FILENAME = "${UBOOT_PREFIX}-${MACHINE}.bin" SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}" +# Set LPDDR4 FIRMWARE +DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin" + # Linux kernel configuration KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8_defconfig" diff --git a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_8.4.bb b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_8.4.bb index 24bf14a09..34bafa842 100644 --- a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_8.4.bb +++ b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_8.4.bb @@ -61,16 +61,7 @@ inherit deploy addtask deploy before do_build after do_install do_deploy () { # Deploy i.MX8 related firmware files - if [ "${IS_MX8}" = "8m" ]; then - # Deploy ddr/synopsys - for ddr_firmware in ${DDR_FIRMWARE_NAME}; do - install -m 0644 ${S}/firmware/ddr/synopsys/${ddr_firmware} ${DEPLOYDIR} - done - - # Deploy hdmi/cadence - install -m 0644 ${S}/firmware/hdmi/cadence/signed_dp_imx8m.bin ${DEPLOYDIR} - install -m 0644 ${S}/firmware/hdmi/cadence/signed_hdmi_imx8m.bin ${DEPLOYDIR} - elif [ "${IS_MX8}" = "8qm" ]; then + if [ "${IS_MX8}" = "8qm" ]; then # Deploy hdmi/cadence install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${DEPLOYDIR} install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${DEPLOYDIR}