From 6555f46413e091157da63b2fb9f2ab2b017bcb0e Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Tue, 17 Oct 2023 14:22:49 -0300 Subject: machine: colibri-imx7/6ull: Update u-boot make target This commit updates the U-Boot make target to 'u-boot-nand.imx.' This change is necessary due to commit 0cdb7f9e in 'meta-toradex-bsp-common,' which deprecated the 'nand_padding' function in favor of a new U-Boot target ('u-boot-nand.imx') added to 'mach-imx.' This target now automatically handles NAND padding. Signed-off-by: Hiago De Franco (cherry picked from commit 78b1e2921f1d6670fb5783bc5199f7bb3c05e65d) --- conf/machine/include/colibri-imx6ull.inc | 2 +- conf/machine/include/colibri-imx7.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 670a882..f1c0fc0 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -43,5 +43,5 @@ MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx- UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x88200000" UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x88300000" UBOOT_ENTRYPOINT:colibri-imx6ull = "0x84200000" -UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx" +UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot-nand.imx" UBOOT_RD_LOADADDRESS:colibri-imx6ull = "0x8A400000" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 7528416..fa59fa8 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -39,5 +39,5 @@ MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx- UBOOT_DTB_LOADADDRESS:colibri-imx7 = "0x88200000" UBOOT_DTBO_LOADADDRESS:colibri-imx7 = "0x88300000" UBOOT_ENTRYPOINT:colibri-imx7 = "0x84200000" -UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot.imx" +UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot-nand.imx" UBOOT_RD_LOADADDRESS:colibri-imx7 = "0x88400000" -- cgit v1.2.3