aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrejs Cainikovs <andrejs.cainikovs@gmail.com>2023-03-03 14:26:41 +0100
committerStefano Babic <sbabic@denx.de>2023-03-30 10:55:10 +0200
commit161be93a4608eb3d872c513ffe85f77bad8898f7 (patch)
tree6b5220226fbd0d26118ec8e257adb263858b500b
parent1624868cbd7eba19b7f40819ede9fead7026ee87 (diff)
downloadu-boot-161be93a4608eb3d872c513ffe85f77bad8898f7.zip
u-boot-161be93a4608eb3d872c513ffe85f77bad8898f7.tar.gz
u-boot-161be93a4608eb3d872c513ffe85f77bad8898f7.tar.bz2
Revert "imx: imx8x: colibri: switch to binman"
This reverts commit bdadc140a127b14a666d2007eddc3f65c8de7d5a. We do not want this, see [1]. [1] https://lore.kernel.org/all/56cf058164f331ce99ce75b0751b825ee2e07fc0.camel@toradex.com/ Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
-rw-r--r--arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi2
-rw-r--r--arch/arm/mach-imx/imx8/Kconfig1
-rw-r--r--configs/colibri-imx8x_defconfig1
3 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
index de014c8..a6af4e5 100644
--- a/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
@@ -3,8 +3,6 @@
* Copyright 2019 Toradex AG
*/
-#include "imx8qxp-u-boot.dtsi"
-
&{/imx8qx-pm} {
bootph-some-ram;
diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig
index 37d12d1..018b87b 100644
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -51,7 +51,6 @@ config TARGET_APALIS_IMX8
config TARGET_COLIBRI_IMX8X
bool "Support Colibri iMX8X module"
- select BINMAN
select BOARD_LATE_INIT
select IMX8QXP
diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig
index c2ed550..8716021 100644
--- a/configs/colibri-imx8x_defconfig
+++ b/configs/colibri-imx8x_defconfig
@@ -19,7 +19,6 @@ CONFIG_SYS_MEMTEST_START=0x88000000
CONFIG_SYS_MEMTEST_END=0x89000000
CONFIG_REMAKE_ELF=y
CONFIG_FIT=y
-CONFIG_FIT_EXTERNAL_OFFSET=0x3000
CONFIG_FIT_VERBOSE=y
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_BOOTDELAY=1