diff options
| -rw-r--r-- | Documentation/boards/imx/nxp-imx8mq-evk.rst | 4 | ||||
| -rw-r--r-- | arch/arm/boards/nxp-imx8mq-evk/ddr.h | 8 | ||||
| -rw-r--r-- | arch/arm/boards/nxp-imx8mq-evk/lowlevel.c | 2 | ||||
| -rw-r--r-- | firmware/Makefile | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/Documentation/boards/imx/nxp-imx8mq-evk.rst b/Documentation/boards/imx/nxp-imx8mq-evk.rst index 250e517438..8bad9455a5 100644 --- a/Documentation/boards/imx/nxp-imx8mq-evk.rst +++ b/Documentation/boards/imx/nxp-imx8mq-evk.rst @@ -37,7 +37,7 @@ As a last step of this process those files need to be placed in lpddr4_pmu_train_2d_imem.bin; \ do \ cp firmware-imx-8.0/firmware/ddr/synopsys/${f} \ - firmware/imx/${f}; \ + firmware/${f}; \ done You will also need to copy the HDMITX controller firmware in order to @@ -47,7 +47,7 @@ use the HDMI and/or eDP display output:: signed_hdmi_imx8m.bin; \ do \ cp firmware-imx-8.0/firmware/hdmi/cadence/${f} \ - firmware/imx/${f}; \ + firmware/${f}; \ done DDR Configuration Code diff --git a/arch/arm/boards/nxp-imx8mq-evk/ddr.h b/arch/arm/boards/nxp-imx8mq-evk/ddr.h index 8f494ae7a2..65115dba1e 100644 --- a/arch/arm/boards/nxp-imx8mq-evk/ddr.h +++ b/arch/arm/boards/nxp-imx8mq-evk/ddr.h @@ -21,9 +21,9 @@ void nxp_imx8mq_evk_ddr_init(void); void nxp_imx8mq_evk_ddr_cfg_phy(void); -#define FW_1D_IMAGE imx_lpddr4_pmu_train_1d_imem_bin, \ - imx_lpddr4_pmu_train_1d_dmem_bin -#define FW_2D_IMAGE imx_lpddr4_pmu_train_2d_imem_bin, \ - imx_lpddr4_pmu_train_2d_dmem_bin +#define FW_1D_IMAGE lpddr4_pmu_train_1d_imem_bin, \ + lpddr4_pmu_train_1d_dmem_bin +#define FW_2D_IMAGE lpddr4_pmu_train_2d_imem_bin, \ + lpddr4_pmu_train_2d_dmem_bin diff --git a/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c index 1dff4b4d31..ffbe14836f 100644 --- a/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c +++ b/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c @@ -115,7 +115,7 @@ ENTRY_FUNCTION(start_nxp_imx8mq_evk, r0, r1, r2) const u8 *bl31; size_t bl31_size; - get_builtin_firmware(imx_imx8m_bl31_bin, &bl31, &bl31_size); + get_builtin_firmware(imx8mq_bl31_bin, &bl31, &bl31_size); imx8mq_atf_load_bl31(bl31, bl31_size); } diff --git a/firmware/Makefile b/firmware/Makefile index 7f4dc49326..f238ce2538 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -4,12 +4,12 @@ # firmware-$(CONFIG_FIRMWARE_IMX_LPDDR4_PMU_TRAIN) += \ - imx/lpddr4_pmu_train_1d_dmem.bin \ - imx/lpddr4_pmu_train_1d_imem.bin \ - imx/lpddr4_pmu_train_2d_dmem.bin \ - imx/lpddr4_pmu_train_2d_imem.bin + lpddr4_pmu_train_1d_dmem.bin \ + lpddr4_pmu_train_1d_imem.bin \ + lpddr4_pmu_train_2d_dmem.bin \ + lpddr4_pmu_train_2d_imem.bin -firmware-$(CONFIG_FIRMWARE_IMX8MQ_ATF) += imx/imx8m-bl31.bin +firmware-$(CONFIG_FIRMWARE_IMX8MQ_ATF) += imx8mq-bl31.bin # Create $(fwabs) from $(CONFIG_EXTRA_FIRMWARE_DIR) -- if it doesn't have a # leading /, it's relative to $(srctree). |