| Message ID | 20201125100529.21553-1-matwey.kornilov@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [v2] Add fdtfile for Marvell Armada 37xx default environment | expand |
On 25.11.20 11:05, Matwey V. Kornilov wrote: > mvebu_armada-37xx.h relies on config_distro_bootcmd.h but lefts ${fdtfile} > environment variable empty. Here we preset the variable with default values. > > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > 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" > 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 */ > Viele Grüße, Stefan
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" 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 */
mvebu_armada-37xx.h relies on config_distro_bootcmd.h but lefts ${fdtfile} environment variable empty. Here we preset the variable with default values. Signed-off-by: Matwey V. Kornilov <matwey.kornilov@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(+)