Re: [PATCH] Add fdtfile for Marvell Armada 37xx default environment

[Andre Heider]

On 25/11/2020 10:14, Matwey V. Kornilov wrote:

Signed-off-by: Matwey V. Kornilov <matwey.korni...@gmail.com>
---
  configs/mvebu_db-88f3720_defconfig          | 1 +
  configs/mvebu_espressobin-88f3720_defconfig | 1 +
  include/configs/mvebu_armada-37xx.h         | 1 +
  3 files changed, 3 insertions(+)

diff --git a/configs/mvebu_db-88f3720_defconfig 
b/configs/mvebu_db-88f3720_defconfig
index a6bbe1a7af..1a3a267890 100644
--- a/configs/mvebu_db-88f3720_defconfig
+++ b/configs/mvebu_db-88f3720_defconfig
@@ -12,6 +12,7 @@ CONFIG_DM_GPIO=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=25804800
  CONFIG_DEFAULT_DEVICE_TREE="armada-3720-db"
+CONFIG_DEFAULT_FDT_FILE="marvell/armada-3720-db.dtb"
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
diff --git a/configs/mvebu_espressobin-88f3720_defconfig 
b/configs/mvebu_espressobin-88f3720_defconfig
index 8a859cba2e..56ec482794 100644
--- a/configs/mvebu_espressobin-88f3720_defconfig
+++ b/configs/mvebu_espressobin-88f3720_defconfig
@@ -12,6 +12,7 @@ CONFIG_DM_GPIO=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=25804800
  CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
+CONFIG_DEFAULT_FDT_FILE="marvell/armada-3720-espressobin.dtb"

No, that doesn't work for this board, see
68e32e344 "arm: mvebu: Espressobin: Set environment variable fdtfile"

  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
diff --git a/include/configs/mvebu_armada-37xx.h 
b/include/configs/mvebu_armada-37xx.h
index 0d585606a7..377ac60def 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -96,6 +96,7 @@
        "kernel_addr=0x7000000\0"     \
        "kernel_addr_r=0x7000000\0"   \
        "ramdisk_addr_r=0xa000000\0"  \
+       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        BOOTENV

#endif /* _CONFIG_MVEBU_ARMADA_37XX_H */