| Message ID | 20230104161729.2730235-1-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Hi On Wed, Jan 4, 2023 at 5:17 PM Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote: > > In case the CONFIG_IMX8M_LPDDR4 and CONFIG_IMX8M_DDR4 options are both > disabled (i. e. BSH boards), binmain fails because DD4 bin files are DD4 DDR4 > missing. > > Fixes: 93c4c0e4dd1e75 ("arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi") > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > > arch/arm/dts/imx8mn-u-boot.dtsi | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi > index 95f45ad2522d..ec53390afb30 100644 > --- a/arch/arm/dts/imx8mn-u-boot.dtsi > +++ b/arch/arm/dts/imx8mn-u-boot.dtsi > @@ -105,10 +105,11 @@ > align-end = <4>; > }; > > +#if defined(CONFIG_IMX8M_LPDDR4) || defined(CONFIG_IMX8M_DDR4) > ddr-2d-imem-fw { > #ifdef CONFIG_IMX8M_LPDDR4 > filename = "lpddr4_pmu_train_2d_imem.bin"; > -#elif CONFIG_IMX8M_DDR4 > +#else > filename = "ddr4_imem_2d.bin"; > #endif > type = "blob-ext"; > @@ -118,12 +119,13 @@ > ddr-2d-dmem-fw { > #ifdef CONFIG_IMX8M_LPDDR4 > filename = "lpddr4_pmu_train_2d_dmem.bin"; > -#elif CONFIG_IMX8M_DDR4 > +#else > filename = "ddr4_dmem_2d.bin"; > #endif > type = "blob-ext"; > align-end = <4>; > }; > +#endif > }; > > spl { > -- > 2.32.0 > Reviewed-By: Michael Trimarchi <michael@amarulasolutions.com> >
diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index 95f45ad2522d..ec53390afb30 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -105,10 +105,11 @@ align-end = <4>; }; +#if defined(CONFIG_IMX8M_LPDDR4) || defined(CONFIG_IMX8M_DDR4) ddr-2d-imem-fw { #ifdef CONFIG_IMX8M_LPDDR4 filename = "lpddr4_pmu_train_2d_imem.bin"; -#elif CONFIG_IMX8M_DDR4 +#else filename = "ddr4_imem_2d.bin"; #endif type = "blob-ext"; @@ -118,12 +119,13 @@ ddr-2d-dmem-fw { #ifdef CONFIG_IMX8M_LPDDR4 filename = "lpddr4_pmu_train_2d_dmem.bin"; -#elif CONFIG_IMX8M_DDR4 +#else filename = "ddr4_dmem_2d.bin"; #endif type = "blob-ext"; align-end = <4>; }; +#endif }; spl {
In case the CONFIG_IMX8M_LPDDR4 and CONFIG_IMX8M_DDR4 options are both disabled (i. e. BSH boards), binmain fails because DD4 bin files are missing. Fixes: 93c4c0e4dd1e75 ("arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi") Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- arch/arm/dts/imx8mn-u-boot.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)