Skip to contentSkip to conversation

arm: mvebu: Espressobin: Fix checks against machine compatible strings

PATCH New Andre Heider 4 participants 9 messages Sep 29, 2020 – Oct 1, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: mvebu: Espressobin: Fix checks against machine compatible strings

The patches changing the compatible strings to the ones used by Linux have not been merged yet, so fix the checks to use the current in-tree ones.

---
 board/Marvell/mvebu_armada-37xx/board.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/Marvell/mvebu_armada-37xx/board.c +2 -2
index eacee15cb3..2bfc7171c4 100644
@@ -88,14 +88,14 @@ int board_late_init(void)
 	if (env_get("fdtfile"))
 		return 0;
 
-	if (!of_machine_is_compatible("globalscale,espressobin"))
+	if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
 		return 0;
 
 	/* If the memory controller has been configured for DDR4, we're running on v7 */
 	ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
 		& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
 
-	emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+	emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");
 
 	if (ddr4 && emmc)
 		env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 arm: mvebu: Espressobin: Fix checks against machine compatible strings

Quoted 17 lines · On Tuesday 29 September 2020 14:34:26 Andre Heider wrote:

The patches changing the compatible strings to the ones used by Linux have not been merged yet, so fix the checks to use the current in-tree ones.

---
 board/Marvell/mvebu_armada-37xx/board.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/Marvell/mvebu_armada-37xx/board.c +0 -0
index eacee15cb3..2bfc7171c4 100644
@@ -88,14 +88,14 @@ int board_late_init(void)
 	if (env_get("fdtfile"))
 		return 0;
 

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 98

Quoted 10 lines
board/Marvell/mvebu_armada-37xx/board.c +2 -2
-	if (!of_machine_is_compatible("globalscale,espressobin"))
+	if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
 		return 0;
 
 	/* If the memory controller has been configured for DDR4, we're running on v7 */
 	ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
 		& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
 
-	emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+	emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");

I run 'git grep marvell,armada-3720-espressobin-emmc origin/master' just for verification... but it returned me empty result.

So marvell,armada-3720-espressobin-emmc is not correct too and therefore this patch does not still fix this problem.

Quoted 6 lines
board/Marvell/mvebu_armada-37xx/board.c +0 -0
 	if (ddr4 && emmc)
 		env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
Signature · 1 line
2.28.0
#2 lore raw

PATCH 1/1 arm: mvebu: Espressobin: Fix checks against machine compatible strings

Quoted 26 lines · On Tuesday 29 September 2020 14:38:39 Pali Roh?r wrote:
Quoted 25 lines · On Tuesday 29 September 2020 14:34:26 Andre Heider wrote:

The patches changing the compatible strings to the ones used by Linux have not been merged yet, so fix the checks to use the current in-tree ones.

---
 board/Marvell/mvebu_armada-37xx/board.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/Marvell/mvebu_armada-37xx/board.c +1 -1
index eacee15cb3..2bfc7171c4 100644
@@ -88,14 +88,14 @@ int board_late_init(void)
 	if (env_get("fdtfile"))
 		return 0;
 
-	if (!of_machine_is_compatible("globalscale,espressobin"))
+	if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
 		return 0;
 
 	/* If the memory controller has been configured for DDR4, we're running on v7 */
 	ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
 		& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
 
Quoted 8 lines

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 98

Quoted 2 lines
board/Marvell/mvebu_armada-37xx/board.c +1 -1
-	emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+	emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");

I run 'git grep marvell,armada-3720-espressobin-emmc origin/master' just for verification... but it returned me empty result.

So marvell,armada-3720-espressobin-emmc is not correct too and therefore this patch does not still fix this problem.

Ok, now I see where is the problem. eMMC support for Espressobin is not in U-Boot master yet.

So for U-Boot master the best would be to revert/remove this emmc chunk of code.

Quoted 6 lines
Quoted 6 lines
board/Marvell/mvebu_armada-37xx/board.c +0 -0
 	if (ddr4 && emmc)
 		env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
Signature · 1 line
2.28.0
#3 lore raw

PATCH 1/1 arm: mvebu: Espressobin: Fix checks against machine compatible strings

In reply to Pali Rohár
Quoted 26 lines · Pali Roh?r
Quoted 25 lines · On Tuesday 29 September 2020 14:34:26 Andre Heider wrote:

The patches changing the compatible strings to the ones used by Linux have not been merged yet, so fix the checks to use the current in-tree ones.

---
  board/Marvell/mvebu_armada-37xx/board.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
board/Marvell/mvebu_armada-37xx/board.c +1 -1
index eacee15cb3..2bfc7171c4 100644
@@ -88,14 +88,14 @@ int board_late_init(void)
  	if (env_get("fdtfile"))
  		return 0;
 
-	if (!of_machine_is_compatible("globalscale,espressobin"))
+	if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
  		return 0;
 
  	/* If the memory controller has been configured for DDR4, we're running on v7 */
  	ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
  		& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
 
Quoted 8 lines

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 98

Quoted 2 lines
board/Marvell/mvebu_armada-37xx/board.c +1 -1
-	emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+	emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");

I run 'git grep marvell,armada-3720-espressobin-emmc origin/master' just for verification... but it returned me empty result.

So marvell,armada-3720-espressobin-emmc is not correct too and therefore this patch does not still fix this problem.

Right, without my set there is no support for the eMMC board in u-boot at all. We could remove the code, but I figured that'll be just unnecessary churn. The check evaluates correctly to non-emmc, so it works for the in-tree board just fine. This is the smaller fixup for the release.

Quoted 7 lines
Quoted 7 lines
board/Marvell/mvebu_armada-37xx/board.c +0 -0
  	if (ddr4 && emmc)
  		env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
Signature · 1 line
2.28.0
#4 lore raw

PATCH 1/1 arm: mvebu: Espressobin: Fix checks against machine compatible strings

Quoted 30 lines · On Tuesday 29 September 2020 14:43:25 Andre Heider wrote:
Quoted 29 lines · Pali Roh?r
Quoted 14 lines · On Tuesday 29 September 2020 14:34:26 Andre Heider wrote:

The patches changing the compatible strings to the ones used by Linux have not been merged yet, so fix the checks to use the current in-tree ones.

---
  board/Marvell/mvebu_armada-37xx/board.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
board/Marvell/mvebu_armada-37xx/board.c +0 -0
index eacee15cb3..2bfc7171c4 100644

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 95

Quoted 10 lines
board/Marvell/mvebu_armada-37xx/board.c +2 -2
@@ -88,14 +88,14 @@ int board_late_init(void)
  	if (env_get("fdtfile"))
  		return 0;
-	if (!of_machine_is_compatible("globalscale,espressobin"))
+	if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
  		return 0;
  	/* If the memory controller has been configured for DDR4, we're running on v7 */
  	ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
  		& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
-	emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+	emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");

I run 'git grep marvell,armada-3720-espressobin-emmc origin/master' just for verification... but it returned me empty result.

Quoted 7 lines
Quoted 2 lines

So marvell,armada-3720-espressobin-emmc is not correct too and therefore this patch does not still fix this problem.

Right, without my set there is no support for the eMMC board in u-boot at all. We could remove the code, but I figured that'll be just unnecessary churn. The check evaluates correctly to non-emmc, so it works for the in-tree board just fine. This is the smaller fixup for the release.

Ok, Lets include it!

Stefan, can you send this patch for U-Boot 2020.10 release?

Maybe following patch for documentation (doc/README.marvell) may be useful to:
https://patchwork.ozlabs.org/project/uboot/patch/20200925075416.16124-1-pali at kernel.org/

Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
board/Marvell/mvebu_armada-37xx/board.c +0 -0
  	if (ddr4 && emmc)
  		env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
Signature · 1 line
2.28.0
#5 lore raw

PATCH 1/1 arm: mvebu: Espressobin: Fix checks against machine compatible strings

Quoted 12 lines · Pali Roh?r
Quoted 11 lines · On Tuesday 29 September 2020 14:43:25 Andre Heider wrote:
Quoted 10 lines · Pali Roh?r
Quoted 9 lines · On Tuesday 29 September 2020 14:34:26 Andre Heider wrote:

The patches changing the compatible strings to the ones used by Linux have not been merged yet, so fix the checks to use the current in-tree ones.

---
  board/Marvell/mvebu_armada-37xx/board.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 90

Quoted 9 lines
board/Marvell/mvebu_armada-37xx/board.c +1 -1
index eacee15cb3..2bfc7171c4 100644
@@ -88,14 +88,14 @@ int board_late_init(void)
  	if (env_get("fdtfile"))
  		return 0;
-	if (!of_machine_is_compatible("globalscale,espressobin"))
+	if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))

Linux v5.9-rc6 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts:19:
compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";

This value has been in Linux since 2016.

We should be able to boot with the U-Boot internal device tree into Linux.

So fix the device tree in U-Boot and not the C code, please.

Best regards

Heinrich

Quoted 34 lines
Quoted 10 lines
Quoted 10 lines

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 98

Quoted 6 lines
board/Marvell/mvebu_armada-37xx/board.c +1 -1
  		return 0;
  	/* If the memory controller has been configured for DDR4, we're running on v7 */
  	ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
  		& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
-	emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+	emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");

I run 'git grep marvell,armada-3720-espressobin-emmc origin/master' just for verification... but it returned me empty result.

Quoted 7 lines
Quoted 2 lines

So marvell,armada-3720-espressobin-emmc is not correct too and therefore this patch does not still fix this problem.

Right, without my set there is no support for the eMMC board in u-boot at all. We could remove the code, but I figured that'll be just unnecessary churn. The check evaluates correctly to non-emmc, so it works for the in-tree board just fine. This is the smaller fixup for the release.

Ok, Lets include it!

Stefan, can you send this patch for U-Boot 2020.10 release?

Maybe following patch for documentation (doc/README.marvell) may be useful to:
https://patchwork.ozlabs.org/project/uboot/patch/20200925075416.16124-1-pali at kernel.org/

Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
board/Marvell/mvebu_armada-37xx/board.c +0 -1
  	if (ddr4 && emmc)
  		env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
--

2.28.0

#6 lore raw

PATCH 1/1 arm: mvebu: Espressobin: Fix checks against machine compatible strings

Quoted 28 lines · On Thursday 01 October 2020 12:42:21 Heinrich Schuchardt wrote:
Quoted 12 lines · Pali Roh?r
Quoted 11 lines · On Tuesday 29 September 2020 14:43:25 Andre Heider wrote:
Quoted 10 lines · Pali Roh?r
Quoted 9 lines · On Tuesday 29 September 2020 14:34:26 Andre Heider wrote:

The patches changing the compatible strings to the ones used by Linux have not been merged yet, so fix the checks to use the current in-tree ones.

---
  board/Marvell/mvebu_armada-37xx/board.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 90

Quoted 9 lines
board/Marvell/mvebu_armada-37xx/board.c +1 -1
index eacee15cb3..2bfc7171c4 100644
@@ -88,14 +88,14 @@ int board_late_init(void)
  	if (env_get("fdtfile"))
  		return 0;
-	if (!of_machine_is_compatible("globalscale,espressobin"))
+	if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))

Linux v5.9-rc6 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts:19:
compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";

Quoted 3 lines

This value has been in Linux since 2016.

We should be able to boot with the U-Boot internal device tree into Linux.

Hello Heinrich!

This is not possible yet as Linux kernel uses different comphy driver as U-Boot and device tree structure for these drivers are different.

So you cannot use U-Boot internal device tree file for booting Linux kernel.

Quoted 1 line

So fix the device tree in U-Boot and not the C code, please.

Yes, this is ongoing work, Marek is working on replacing U-Boot comphy driver one from Linux kernel and Andre is working on synchronizing DTS files from Linux kernel to U-Boot. But these works are not complete yet and we need non-broken U-Boot 2020.10 release.

Quoted 39 lines

Best regards

Heinrich

Quoted 34 lines
Quoted 10 lines
Quoted 10 lines

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 98

Quoted 6 lines
board/Marvell/mvebu_armada-37xx/board.c +1 -1
  		return 0;
  	/* If the memory controller has been configured for DDR4, we're running on v7 */
  	ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
  		& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
-	emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+	emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");

I run 'git grep marvell,armada-3720-espressobin-emmc origin/master' just for verification... but it returned me empty result.

Quoted 7 lines
Quoted 2 lines

So marvell,armada-3720-espressobin-emmc is not correct too and therefore this patch does not still fix this problem.

Right, without my set there is no support for the eMMC board in u-boot at all. We could remove the code, but I figured that'll be just unnecessary churn. The check evaluates correctly to non-emmc, so it works for the in-tree board just fine. This is the smaller fixup for the release.

Ok, Lets include it!

Stefan, can you send this patch for U-Boot 2020.10 release?

Maybe following patch for documentation (doc/README.marvell) may be useful to:
https://patchwork.ozlabs.org/project/uboot/patch/20200925075416.16124-1-pali at kernel.org/

Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
board/Marvell/mvebu_armada-37xx/board.c +0 -1
  	if (ddr4 && emmc)
  		env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
--

2.28.0

#7 lore raw

PATCH 1/1 arm: mvebu: Espressobin: Fix checks against machine compatible strings

Quoted 41 lines · Pali Roh?r
Quoted 28 lines · On Thursday 01 October 2020 12:42:21 Heinrich Schuchardt wrote:
Quoted 12 lines · Pali Roh?r
Quoted 11 lines · On Tuesday 29 September 2020 14:43:25 Andre Heider wrote:
Quoted 10 lines · Pali Roh?r
Quoted 9 lines · On Tuesday 29 September 2020 14:34:26 Andre Heider wrote:

The patches changing the compatible strings to the ones used by Linux have not been merged yet, so fix the checks to use the current in-tree ones.

---
   board/Marvell/mvebu_armada-37xx/board.c | 4 ++--
   1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 90

Quoted 9 lines
board/Marvell/mvebu_armada-37xx/board.c +1 -1
index eacee15cb3..2bfc7171c4 100644
@@ -88,14 +88,14 @@ int board_late_init(void)
   	if (env_get("fdtfile"))
   		return 0;
-	if (!of_machine_is_compatible("globalscale,espressobin"))
+	if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))

Linux v5.9-rc6 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts:19:
compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";

Quoted 3 lines

This value has been in Linux since 2016.

We should be able to boot with the U-Boot internal device tree into Linux.

Hello Heinrich!

This is not possible yet as Linux kernel uses different comphy driver as U-Boot and device tree structure for these drivers are different.

So you cannot use U-Boot internal device tree file for booting Linux kernel.

Quoted 6 lines
Quoted 1 line

So fix the device tree in U-Boot and not the C code, please.

Yes, this is ongoing work, Marek is working on replacing U-Boot comphy driver one from Linux kernel and Andre is working on synchronizing DTS files from Linux kernel to U-Boot. But these works are not complete yet and we need non-broken U-Boot 2020.10 release.

Thanks for the explanation Pali. Yes, this fix is only temporarily for the upcoming release. The DT sync will continue after the 2020.10 release.

Thanks,
Stefan

Quoted 32 lines
Quoted 32 lines

Best regards

Heinrich

Quoted 28 lines
Quoted 10 lines
Quoted 10 lines

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 98

Quoted 6 lines
board/Marvell/mvebu_armada-37xx/board.c +1 -1
   		return 0;
   	/* If the memory controller has been configured for DDR4, we're running on v7 */
   	ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
   		& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
-	emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+	emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");

I run 'git grep marvell,armada-3720-espressobin-emmc origin/master' just for verification... but it returned me empty result.

Quoted 7 lines
Quoted 2 lines

So marvell,armada-3720-espressobin-emmc is not correct too and therefore this patch does not still fix this problem.

Right, without my set there is no support for the eMMC board in u-boot at all. We could remove the code, but I figured that'll be just unnecessary churn. The check evaluates correctly to non-emmc, so it works for the in-tree board just fine. This is the smaller fixup for the release.

Ok, Lets include it!

Stefan, can you send this patch for U-Boot 2020.10 release?

Maybe following patch for documentation (doc/README.marvell) may be useful to:
https://patchwork.ozlabs.org/project/uboot/patch/20200925075416.16124-1-pali at kernel.org/

Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
board/Marvell/mvebu_armada-37xx/board.c +0 -1
   	if (ddr4 && emmc)
   		env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
--

2.28.0

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#8 lore raw

PATCH 1/1 arm: mvebu: Espressobin: Fix checks against machine compatible strings

In reply to Andre Heider
Quoted 5 lines · Andre Heider

The patches changing the compatible strings to the ones used by Linux have not been merged yet, so fix the checks to use the current in-tree ones.

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 16 lines
---
  board/Marvell/mvebu_armada-37xx/board.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
board/Marvell/mvebu_armada-37xx/board.c +1 -1
index eacee15cb3..2bfc7171c4 100644
@@ -88,14 +88,14 @@ int board_late_init(void)
  	if (env_get("fdtfile"))
  		return 0;
 
-	if (!of_machine_is_compatible("globalscale,espressobin"))
+	if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
  		return 0;

board/Marvell/mvebu_armada-37xx/board.c int board_late_init(void) · line 101

Quoted 10 lines
board/Marvell/mvebu_armada-37xx/board.c +1 -1
 
  	/* If the memory controller has been configured for DDR4, we're running on v7 */
  	ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
  		& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
 
-	emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+	emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");
 
  	if (ddr4 && emmc)
  		env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de