From 5b58232d3e7b5e66d5bdcfd11a6265b098b2f898 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Tue, 18 Aug 2020 09:59:11 +0000 Subject: u-boot-imx: upgrade to imx_v2020.04_5.4.24_2.1.0 Drop patch appplied upstream, remove additional install step which is handled by imx-boot recipe. Update u-boot dtb names in machine description files, upstream U-Boot from NXP has DTB files renamed. Upgrade u-boot-imx-tools and u-boot-imx-mfgtool to 2020.04 as well to match u-boot-imx recipe. Signed-off-by: Andrey Zhizhikin --- conf/machine/imx8mmevk.conf | 2 +- conf/machine/imx8mnevk.conf | 2 +- conf/machine/imx8mqevk.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf index 57d74d9c3..db722c723 100644 --- a/conf/machine/imx8mmevk.conf +++ b/conf/machine/imx8mmevk.conf @@ -39,7 +39,7 @@ SPL_BINARY = "spl/u-boot-spl.bin" 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" # Set u-boot DTB -UBOOT_DTB_NAME = "fsl-imx8mm-evk.dtb" +UBOOT_DTB_NAME = "imx8mm-evk.dtb" # Set imx-mkimage boot target IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" diff --git a/conf/machine/imx8mnevk.conf b/conf/machine/imx8mnevk.conf index cc92ac7cf..80d77ac8e 100644 --- a/conf/machine/imx8mnevk.conf +++ b/conf/machine/imx8mnevk.conf @@ -36,7 +36,7 @@ DDR_FIRMWARE_NAME = "ddr4_imem_1d_201810.bin \ ddr4_dmem_2d_201810.bin" # Set u-boot DTB -UBOOT_DTB_NAME = "fsl-imx8mn-ddr4-evk.dtb" +UBOOT_DTB_NAME = "imx8mn-ddr4-evk.dtb" # Set imx-mkimage boot target IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_ddr4_evk_flexspi', 'flash_ddr4_evk', d)}" diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf index 25e030935..2c9c8c293 100644 --- a/conf/machine/imx8mqevk.conf +++ b/conf/machine/imx8mqevk.conf @@ -41,7 +41,7 @@ SPL_BINARY = "spl/u-boot-spl.bin" 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" # Set u-boot DTB -UBOOT_DTB_NAME = "fsl-imx8mq-evk.dtb" +UBOOT_DTB_NAME = "imx8mq-evk.dtb" # Set imx-mkimage boot target IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" -- cgit v1.2.3-54-g00ecf