diff mbox series

configs/freescale_imx8mpevk_defconfig: bump to version lf-6.1.22-2.0.0

Message ID 20230927144237.66777-1-romain.naour@smile.fr
State Accepted
Headers show
Series configs/freescale_imx8mpevk_defconfig: bump to version lf-6.1.22-2.0.0 | expand

Commit Message

Romain Naour Sept. 27, 2023, 2:42 p.m. UTC 
Update the linux-imx kernel to be aligned with the NXP BSP
LF6.1.22_2.0.0 (same release used in meta-freescale [1]).

Add BR2_TARGET_UBOOT_NEEDS_GNUTLS=y and BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y
since they are new dependencies for building mkeficapsule u-boot tool.

The uboot-imx doesn't use the default imx8mp-evk devicetree anymore due
to commit [2]:

"Change to use imx8mp-evk-revb4.dtb and imx8mp-ddr4-evk-revb4.dtb
 as default kernel DTB for iMX8MP re-design EVK board. Old EVK
 board is EOL, to boot old EVK, user can switch to old DTB manually."

Since the freescale_imx8mpevk_defconfig only install imx8mp-evk.dtb in
the final image, the boot stop with:

  Booting from mmc ...
  Failed to load 'imx8mp-evk-revb4.dtb'
  WARN: Cannot load the DT

Add a u-boot defconfig fragment to revert this change [2] and use the
imx8mp-evk.dtb by default.

Runtime tested on i.MX 8M Plus EVK REV B2.

[1] https://github.com/Freescale/meta-freescale/commit/e6b1b6725cd1d44550ba473ff6a80c1b80663965
[2] https://github.com/nxp-imx/uboot-imx/commit/a60e787a6e35b9c14c391e03d41468e4ad63d598

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
 board/freescale/imx8mpevk/uboot-fragment.config |  3 +++
 configs/freescale_imx8mpevk_defconfig           | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 board/freescale/imx8mpevk/uboot-fragment.config

Comments

Thomas Petazzoni Sept. 30, 2023, 4 p.m. UTC | #1 
On Wed, 27 Sep 2023 16:42:37 +0200
Romain Naour <romain.naour@smile.fr> wrote:

> Update the linux-imx kernel to be aligned with the NXP BSP
> LF6.1.22_2.0.0 (same release used in meta-freescale [1]).
> 
> Add BR2_TARGET_UBOOT_NEEDS_GNUTLS=y and BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y
> since they are new dependencies for building mkeficapsule u-boot tool.
> 
> The uboot-imx doesn't use the default imx8mp-evk devicetree anymore due
> to commit [2]:
> 
> "Change to use imx8mp-evk-revb4.dtb and imx8mp-ddr4-evk-revb4.dtb
>  as default kernel DTB for iMX8MP re-design EVK board. Old EVK
>  board is EOL, to boot old EVK, user can switch to old DTB manually."
> 
> Since the freescale_imx8mpevk_defconfig only install imx8mp-evk.dtb in
> the final image, the boot stop with:
> 
>   Booting from mmc ...
>   Failed to load 'imx8mp-evk-revb4.dtb'
>   WARN: Cannot load the DT
> 
> Add a u-boot defconfig fragment to revert this change [2] and use the
> imx8mp-evk.dtb by default.
> 
> Runtime tested on i.MX 8M Plus EVK REV B2.
> 
> [1] https://github.com/Freescale/meta-freescale/commit/e6b1b6725cd1d44550ba473ff6a80c1b80663965
> [2] https://github.com/nxp-imx/uboot-imx/commit/a60e787a6e35b9c14c391e03d41468e4ad63d598
> 
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
>  board/freescale/imx8mpevk/uboot-fragment.config |  3 +++
>  configs/freescale_imx8mpevk_defconfig           | 11 +++++++----
>  2 files changed, 10 insertions(+), 4 deletions(-)
>  create mode 100644 board/freescale/imx8mpevk/uboot-fragment.config

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/board/freescale/imx8mpevk/uboot-fragment.config b/board/freescale/imx8mpevk/uboot-fragment.config
new file mode 100644
index 0000000000..b4683be9ef
--- /dev/null
+++ b/board/freescale/imx8mpevk/uboot-fragment.config
@@ -0,0 +1,3 @@ 
+# Use the upstream devicetree name for EVK board
+# Revert https://github.com/nxp-imx/uboot-imx/commit/a60e787a6e35b9c14c391e03d41468e4ad63d598
+CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig
index 5a72406b67..82ed68c5a9 100644
--- a/configs/freescale_imx8mpevk_defconfig
+++ b/configs/freescale_imx8mpevk_defconfig
@@ -1,12 +1,12 @@ 
 BR2_aarch64=y
 BR2_ARM_FPU_VFPV3=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mp-evk.dtb"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.1.22-2.0.0)/linux-imx-lf-6.1.22-2.0.0.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-evk"
@@ -19,15 +19,18 @@  BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.1.22-2.0.0)/imx-atf-lf-6.1.22-2.0.0.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1.22-2.0.0)/uboot-imx-lf-6.1.22-2.0.0.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_evk"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imx8mpevk/uboot-fragment.config"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y
+BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
 BR2_TARGET_UBOOT_SPL=y