Message ID | 20200901070359.507034-1-a.heider@gmail.com |
---|---|
State | Superseded |
Delegated to: | Stefan Roese |
Headers | show |
Series | None | expand |
On Tuesday 01 September 2020 09:03:59 Andre Heider wrote: > From: Konstantin Porotchkin <kostap@marvell.com> > > Add support for additional EspressoBIN board with installed > eMMC device (U11). > EspressoBIN boards with eMMC installed should use the DTS named > armada-3720-espressobin-emmc. > Update build documentation accordingly. > > Change-Id: Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18 > Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> > Reviewed-on: http://vgitil04.il.marvell.com:8080/61290 > Tested-by: iSoC Platform CI <ykjenk@marvell.com> > [a.heider: adapt to mainline] > Signed-off-by: Andre Heider <a.heider@gmail.com> > --- > v2: base upon downstream patch > v3: keep CONFIG_DEFAULT_DEVICE_TREE for non-emmc boards Now it looks good for me! The only missing part is test these changes. > arch/arm/dts/Makefile | 1 + > arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++ > doc/README.marvell | 7 +++++-- > 3 files changed, 25 insertions(+), 2 deletions(-) > create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 5e34192be6..8f1958b5a7 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ > dtb-$(CONFIG_ARCH_MVEBU) += \ > armada-3720-db.dtb \ > armada-3720-espressobin.dtb \ > + armada-3720-espressobin-emmc.dtb \ > armada-3720-turris-mox.dtb \ > armada-3720-uDPU.dtb \ > armada-375-db.dtb \ > diff --git a/arch/arm/dts/armada-3720-espressobin-emmc.dts b/arch/arm/dts/armada-3720-espressobin-emmc.dts > new file mode 100644 > index 0000000000..0dd59af9c0 > --- /dev/null > +++ b/arch/arm/dts/armada-3720-espressobin-emmc.dts > @@ -0,0 +1,19 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2018 Marvell International Ltd. > + */ > + > +#include "armada-3720-espressobin.dts" > + > +/ { > + model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)"; > + compatible = "marvell,armada-3720-espressobin", > + "marvell,armada-3720-espressobin-emmc", > + "marvell,armada3720", "marvell,armada3710"; > + > +}; > + > +/* U11 */ > +&sdhci1 { > + status = "okay"; > +}; > diff --git a/doc/README.marvell b/doc/README.marvell > index 5416bc3035..be07f31f8c 100644 > --- a/doc/README.marvell > +++ b/doc/README.marvell > @@ -43,8 +43,11 @@ Build Procedure > In order to prevent this, the required device-tree MUST be set during compilation. > All device-tree files are located in ./arch/arm/dts/ folder. > > - For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with > - just default device-tree from defconfig using: > + For the EspressoBin board with populated eMMC device use > + # make DEVICE_TREE=armada-3720-espressobin-emmc > + > + For other DB boards (MacchiatoBin, EspressoBin without soldered eMMC and 3700 DB board) > + compile u-boot with just default device-tree from defconfig using: > > # make > > -- > 2.28.0 >
On 01.09.20 09:03, Andre Heider wrote: > From: Konstantin Porotchkin <kostap@marvell.com> > > Add support for additional EspressoBIN board with installed > eMMC device (U11). > EspressoBIN boards with eMMC installed should use the DTS named > armada-3720-espressobin-emmc. > Update build documentation accordingly. > > Change-Id: Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18 > Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> > Reviewed-on: http://vgitil04.il.marvell.com:8080/61290 > Tested-by: iSoC Platform CI <ykjenk@marvell.com> > [a.heider: adapt to mainline] > Signed-off-by: Andre Heider <a.heider@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > v2: base upon downstream patch > v3: keep CONFIG_DEFAULT_DEVICE_TREE for non-emmc boards > > arch/arm/dts/Makefile | 1 + > arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++ > doc/README.marvell | 7 +++++-- > 3 files changed, 25 insertions(+), 2 deletions(-) > create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 5e34192be6..8f1958b5a7 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ > dtb-$(CONFIG_ARCH_MVEBU) += \ > armada-3720-db.dtb \ > armada-3720-espressobin.dtb \ > + armada-3720-espressobin-emmc.dtb \ > armada-3720-turris-mox.dtb \ > armada-3720-uDPU.dtb \ > armada-375-db.dtb \ > diff --git a/arch/arm/dts/armada-3720-espressobin-emmc.dts b/arch/arm/dts/armada-3720-espressobin-emmc.dts > new file mode 100644 > index 0000000000..0dd59af9c0 > --- /dev/null > +++ b/arch/arm/dts/armada-3720-espressobin-emmc.dts > @@ -0,0 +1,19 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2018 Marvell International Ltd. > + */ > + > +#include "armada-3720-espressobin.dts" > + > +/ { > + model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)"; > + compatible = "marvell,armada-3720-espressobin", > + "marvell,armada-3720-espressobin-emmc", > + "marvell,armada3720", "marvell,armada3710"; > + > +}; > + > +/* U11 */ > +&sdhci1 { > + status = "okay"; > +}; > diff --git a/doc/README.marvell b/doc/README.marvell > index 5416bc3035..be07f31f8c 100644 > --- a/doc/README.marvell > +++ b/doc/README.marvell > @@ -43,8 +43,11 @@ Build Procedure > In order to prevent this, the required device-tree MUST be set during compilation. > All device-tree files are located in ./arch/arm/dts/ folder. > > - For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with > - just default device-tree from defconfig using: > + For the EspressoBin board with populated eMMC device use > + # make DEVICE_TREE=armada-3720-espressobin-emmc > + > + For other DB boards (MacchiatoBin, EspressoBin without soldered eMMC and 3700 DB board) > + compile u-boot with just default device-tree from defconfig using: > > # make > > Viele Grüße, Stefan
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 5e34192be6..8f1958b5a7 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-3720-db.dtb \ armada-3720-espressobin.dtb \ + armada-3720-espressobin-emmc.dtb \ armada-3720-turris-mox.dtb \ armada-3720-uDPU.dtb \ armada-375-db.dtb \ diff --git a/arch/arm/dts/armada-3720-espressobin-emmc.dts b/arch/arm/dts/armada-3720-espressobin-emmc.dts new file mode 100644 index 0000000000..0dd59af9c0 --- /dev/null +++ b/arch/arm/dts/armada-3720-espressobin-emmc.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Marvell International Ltd. + */ + +#include "armada-3720-espressobin.dts" + +/ { + model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)"; + compatible = "marvell,armada-3720-espressobin", + "marvell,armada-3720-espressobin-emmc", + "marvell,armada3720", "marvell,armada3710"; + +}; + +/* U11 */ +&sdhci1 { + status = "okay"; +}; diff --git a/doc/README.marvell b/doc/README.marvell index 5416bc3035..be07f31f8c 100644 --- a/doc/README.marvell +++ b/doc/README.marvell @@ -43,8 +43,11 @@ Build Procedure In order to prevent this, the required device-tree MUST be set during compilation. All device-tree files are located in ./arch/arm/dts/ folder. - For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with - just default device-tree from defconfig using: + For the EspressoBin board with populated eMMC device use + # make DEVICE_TREE=armada-3720-espressobin-emmc + + For other DB boards (MacchiatoBin, EspressoBin without soldered eMMC and 3700 DB board) + compile u-boot with just default device-tree from defconfig using: # make