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

This reverts commit b8072ae848b73e89a73ba5b535324e4dc2793f37.

Signed-off-by: Stefano Babic <[email protected]>
Reported-by: Marcel Ziswiler <[email protected]>
Acked-by: Marcel Ziswiler <[email protected]>

diff --git a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
index 8fd0e33d2b6a950d4d2eb4de1010f5693fed5261..956d7249798972c838cb01a6862192cd736df683 100644 (file)
--- 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 91bd888308ff9bc03c8fb4d553cb179a4e06e11f..37d12d18958668aece38c8c0d488dc48ae26704a 100644 (file)
--- 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 d0e24785ae20d23331e81260b2d6f8c08e6009b8..6226d50c8ace35685a4aad7cda01af2692d221f5 100644 (file)
--- 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