diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-08-04 18:50:27 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-08-20 14:44:11 +0200 |
commit | d3da0283a9a7e8acd49fc6e9ef5b1fd703c7e2af (patch) | |
tree | cd3c7864cd15e3ce8b7ef50d6e14d47f97765870 | |
parent | 649da1c35dec52b96a317a14e71559c15e3dda34 (diff) |
u-boot-toradex: update to nxp 2020.04
Related-to: ELB-2758
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r-- | conf/machine/apalis-imx8.conf | 6 | ||||
-rw-r--r-- | conf/machine/apalis-imx8x.conf | 6 | ||||
-rw-r--r-- | conf/machine/colibri-imx8x.conf | 6 | ||||
-rw-r--r-- | conf/machine/verdin-imx8mm.conf | 8 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc (renamed from recipes-bsp/u-boot/u-boot-toradex-common_2018.03.inc) | 5 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-toradex_2020.04.bb (renamed from recipes-bsp/u-boot/u-boot-toradex_2018.03.bb) | 1 |
6 files changed, 16 insertions, 16 deletions
diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index adf5edf..6397398 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -52,9 +52,9 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" -# Currently we use the nxp 2018.03 downstream for mx8 as some features are -# not yet available in 2019.03. -PREFERRED_VERSION_u-boot-toradex = "2018.03" +# Currently we use the nxp 2020.04 downstream for mx8 as some features are +# not yet available in 2020.07. +PREFERRED_VERSION_u-boot-toradex = "2020.04" MACHINE_FIRMWARE_append = " linux-firmware-pcie8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf index e923fe4..96905fd 100644 --- a/conf/machine/apalis-imx8x.conf +++ b/conf/machine/apalis-imx8x.conf @@ -47,9 +47,9 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" -# Currently we use the nxp 2018.03 downstream for mx8 as some features are -# not yet available in 2019.03. -PREFERRED_VERSION_u-boot-toradex = "2018.03" +# Currently we use the nxp 2020.04 downstream for mx8 as some features are +# not yet available in 2020.07. +PREFERRED_VERSION_u-boot-toradex = "2020.04" MACHINE_FIRMWARE_append = " linux-firmware-usb8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index 464ea24..2b1c82e 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -54,9 +54,9 @@ PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-m PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" -# Currently we use the nxp 2018.03 downstream for mx8 as some features are -# not yet available in 2019.03. -PREFERRED_VERSION_u-boot-toradex = "2018.03" +# Currently we use the nxp 2020.04 downstream for mx8 as some features are +# not yet available in 2020.07. +PREFERRED_VERSION_u-boot-toradex = "2020.04" MACHINE_FIRMWARE_append = " linux-firmware-pcie8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index a1c4182..5b6b628 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -36,7 +36,7 @@ UBOOT_RD_LOADADDRESS = "0xA0000000" 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-verdin.dtb" +UBOOT_DTB_NAME = "imx8mm-verdin.dtb" BOOT_SPACE = "65536" IMAGE_BOOTLOADER = "imx-boot" @@ -64,9 +64,9 @@ MACHINE_FIRMWARE_append = " linux-firmware-ath10k linux-firmware-imx-sdma-imx7d" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" -# Currently we use the nxp 2018.03 downstream for mx8 as some features are -# not yet available in 2019.03. -PREFERRED_VERSION_u-boot-toradex = "2018.03" +# Currently we use the nxp 2020.04 downstream for mx8 as some features are +# not yet available in 2020.07. +PREFERRED_VERSION_u-boot-toradex = "2020.04" MACHINE_FIRMWARE_append = " linux-firmware-sd8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" diff --git a/recipes-bsp/u-boot/u-boot-toradex-common_2018.03.inc b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc index 999ed4f..6142373 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-common_2018.03.inc +++ b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc @@ -1,5 +1,6 @@ HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" SECTION = "bootloaders" +DEPENDS += "flex-native bison-native" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" @@ -9,9 +10,9 @@ SRC_URI = " \ file://fw_env.config \ " -SRCREV = "548a7dcc242452d447634beef792447515c324f8" +SRCREV = "111b5f6dd839f4f164ad327e08792bff8a733ab3" SRCREV_use-head-next = "${AUTOREV}" -SRCBRANCH = "toradex_imx_v2018.03_4.14.98_2.3.0_bringup" +SRCBRANCH = "toradex_imx_v2020.04_5.4.24_2.1.0" S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-toradex_2018.03.bb b/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb index 6279286..364395d 100644 --- a/recipes-bsp/u-boot/u-boot-toradex_2018.03.bb +++ b/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb @@ -8,7 +8,6 @@ B = "${WORKDIR}/build" PROVIDES += "u-boot" DEPENDS_append = " dtc-native" -SRC_URI_append_apalis-imx8a0 = " file://0001-Revert-apalis-imx8-fused-modules-boot-from-emmc.patch" SRC_URI_append_use-mainline-bsp_colibri-imx8x = " file://0001-colibri-imx8x-modify-device-tree-name-for-mainline-u.patch" BOOT_TOOLS = "imx-boot-tools" |