| Message ID | 20221115104940.89564-1-sbabic@denx.de |
|---|---|
| State | Accepted |
| Commit | 8fc220d0a6c616ac5174c48a07bbc39efc5c0837 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | Revert "imx: imx8: apalis: switch to binman" | expand |
On Tue, 2022-11-15 at 11:49 +0100, Stefano Babic wrote: > This reverts commit b8072ae848b73e89a73ba5b535324e4dc2793f37. Thanks Stefano. This way at least no completely defunct flash.bin gets generated. As I do have further doubts about the whole topic I will continue on the discussion where the discussion is/was happening... > Signed-off-by: Stefano Babic <sbabic@denx.de> > Reported-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- > arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 2 -- > arch/arm/mach-imx/imx8/Kconfig | 1 - > configs/apalis-imx8_defconfig | 1 - > 3 files changed, 4 deletions(-) > > 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" > -Marcel Ziswiler <marcel.ziswiler@toradex.com> > &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
On 16.11.22 09:25, Marcel Ziswiler wrote: > On Tue, 2022-11-15 at 11:49 +0100, Stefano Babic wrote: >> This reverts commit b8072ae848b73e89a73ba5b535324e4dc2793f37. > > Thanks Stefano. This way at least no completely defunct flash.bin gets generated. > Sorry for that - patch slip in, I was aware it should not be merged. I merge at least in u-boot-imx, maybe it takes a while before sending PR to Tom. > As I do have further doubts about the whole topic I will continue on the discussion where the discussion is/was > happening... :-) Regards, Stefano > >> Signed-off-by: Stefano Babic <sbabic@denx.de> >> Reported-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > >> --- >> arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 2 -- >> arch/arm/mach-imx/imx8/Kconfig | 1 - >> configs/apalis-imx8_defconfig | 1 - >> 3 files changed, 4 deletions(-) >> >> 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" >> -Marcel Ziswiler <marcel.ziswiler@toradex.com> >> &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
On Tue, Nov 15, 2022 at 11:49:40AM +0100, Stefano Babic wrote: > 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> I saw you had mentioned putting this in to the -imx tree, but given that I'm doing a -rc today I didn't want this to be missed, so I'm picking up up directly now. Applied to u-boot/master, thanks!
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
This reverts commit b8072ae848b73e89a73ba5b535324e4dc2793f37. Signed-off-by: Stefano Babic <sbabic@denx.de> Reported-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 2 -- arch/arm/mach-imx/imx8/Kconfig | 1 - configs/apalis-imx8_defconfig | 1 - 3 files changed, 4 deletions(-)