From b8072ae848b73e89a73ba5b535324e4dc2793f37 Mon Sep 17 00:00:00 2001
From: Oliver Graute <oliver.graute@kococonnector.com>
Date: Fri, 4 Nov 2022 16:03:44 +0100
Subject: [PATCH] imx: imx8: apalis: switch to binman
Switch to use binman to pack images
Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
---
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 2 ++
arch/arm/dts/imx8qm-u-boot.dtsi | 2 ++
arch/arm/mach-imx/imx8/Kconfig | 1 +
configs/apalis-imx8_defconfig | 1 +
4 files changed, 6 insertions(+)
diff --git a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
index 956d724979..8fd0e33d2b 100644
--- a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
@@ -3,6 +3,8 @@
* Copyright 2019 Toradex AG
*/
+#include "imx8qm-u-boot.dtsi"
+
&mu {
u-boot,dm-pre-proper;
};
diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi
index f3fc90c9bb..3507489a81 100644
--- a/arch/arm/dts/imx8qm-u-boot.dtsi
+++ b/arch/arm/dts/imx8qm-u-boot.dtsi
@@ -10,6 +10,7 @@
};
&binman {
+#ifdef CONFIG_SPL
u-boot-spl-ddr {
align = <4>;
align-size = <4>;
@@ -33,6 +34,7 @@
};
};
};
+#endif
itb {
filename = "u-boot.itb";
diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig
index 37d12d1895..91bd888308 100644
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -46,6 +46,7 @@ choice
config TARGET_APALIS_IMX8
bool "Support Apalis iMX8 module"
+ select BINMAN
select BOARD_LATE_INIT
select IMX8QM
diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig
index 6226d50c8a..d0e24785ae 100644
--- a/configs/apalis-imx8_defconfig
+++ b/configs/apalis-imx8_defconfig
@@ -17,6 +17,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
CONFIG_REMAKE_ELF=y
CONFIG_FIT=y
+CONFIG_FIT_EXTERNAL_OFFSET=0x3000
CONFIG_FIT_VERBOSE=y
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_LOG=y
--
2.39.5