From: Stefano Babic <sbabic@denx.de>
Date: Tue, 15 Nov 2022 10:49:40 +0000 (+0100)
Subject: Revert "imx: imx8: apalis: switch to binman"
X-Git-Tag: v2025.01-rc5-pxa1908~1209^2~3
X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-logo.png?a=commitdiff_plain;h=8fc220d0a6c616ac5174c48a07bbc39efc5c0837;p=u-boot.git

Revert "imx: imx8: apalis: switch to binman"

This reverts commit b8072ae848b73e89a73ba5b535324e4dc2793f37.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Reported-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

diff --git a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
index 8fd0e33d2b..956d724979 100644
--- a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
@@ -3,8 +3,6 @@
  * Copyright 2019 Toradex AG
  */
 
-#include "imx8qm-u-boot.dtsi"
-
 &mu {
 	u-boot,dm-pre-proper;
 };
diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig
index 91bd888308..37d12d1895 100644
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -46,7 +46,6 @@ 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 d0e24785ae..6226d50c8a 100644
--- a/configs/apalis-imx8_defconfig
+++ b/configs/apalis-imx8_defconfig
@@ -17,7 +17,6 @@ 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