Add fdtfile for Marvell Armada 37xx default environment
PATCH 1/1 Add fdtfile for Marvell Armada 37xx default environment
--- configs/mvebu_db-88f3720_defconfig | 1 + configs/mvebu_espressobin-88f3720_defconfig | 1 + include/configs/mvebu_armada-37xx.h | 1 + 3 files changed, 3 insertions(+)
configs/mvebu_db-88f3720_defconfig +1 -0
@@ -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
configs/mvebu_espressobin-88f3720_defconfig +1 -0
@@ -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
include/configs/mvebu_armada-37xx.h +1 -0
@@ -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 */
Signature · 1 line
2.26.2
PATCH 1/1 Add fdtfile for Marvell Armada 37xx default environment
Quoted 1 line · Matwey V. Kornilov
Signed-off-by Matwey V. Kornilov <[email protected]>
Nitpicking:
An empty commit message is frowned upon. Please add a small sentence in the commit text as well.
Thanks,
Stefan
Quoted 36 lines
--- configs/mvebu_db-88f3720_defconfig | 1 + configs/mvebu_espressobin-88f3720_defconfig | 1 + include/configs/mvebu_armada-37xx.h | 1 + 3 files changed, 3 insertions(+)configs/mvebu_db-88f3720_defconfig +1
-0@@ -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=yconfigs/mvebu_espressobin-88f3720_defconfig +1
-0@@ -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=yinclude/configs/mvebu_armada-37xx.h +0
-0
include/configs/mvebu_armada-37xx.h line 102
Quoted 7 lines
include/configs/mvebu_armada-37xx.h +1
-0@@ -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
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
PATCH 1/1 Add fdtfile for Marvell Armada 37xx default environment
In reply to Matwey V. KornilovQuoted 24 lines · Matwey V. Kornilov
Signed-off-by Matwey V. Kornilov <[email protected]>--- configs/mvebu_db-88f3720_defconfig | 1 + configs/mvebu_espressobin-88f3720_defconfig | 1 + include/configs/mvebu_armada-37xx.h | 1 + 3 files changed, 3 insertions(+)configs/mvebu_db-88f3720_defconfig +1
-0@@ -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=yconfigs/mvebu_espressobin-88f3720_defconfig +0
-0
configs/mvebu_espressobin-88f3720_defconfig CONFIG_DM_GPIO=y · line 15
Quoted 4 lines
configs/mvebu_espressobin-88f3720_defconfig +1
-0@@ -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, see68e32e344 "arm: mvebu: Espressobin: Set environment variable fdtfile"
Quoted 16 lines
configs/mvebu_espressobin-88f3720_defconfig +0
-0CONFIG_DEBUG_UART=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=yinclude/configs/mvebu_armada-37xx.h +1
-0@@ -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 */
PATCH 1/1 Add fdtfile for Marvell Armada 37xx default environment
??, 26 ????. 2020 ?. ? 06:45, Andre Heider <[email protected]>:
Quoted 23 lines · Matwey V. Kornilov
Review
Quoted 8 lines
Signed-off-by Matwey V. Kornilov <[email protected]>--- configs/mvebu_db-88f3720_defconfig | 1 + configs/mvebu_espressobin-88f3720_defconfig | 1 + include/configs/mvebu_armada-37xx.h | 1 + 3 files changed, 3 insertions(+)(quoted diff) +0
-0b/configs/mvebu_db-88f3720_defconfig
Review
Quoted 12 lines
index
a6bbe1a7af..1a3a267890100644configs/mvebu_db-88f3720_defconfig +1
-0@@ -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(quoted diff) +0
-0b/configs/mvebu_espressobin-88f3720_defconfig
Quoted 13 lines
configs/mvebu_espressobin-88f3720_defconfig CONFIG_DM_GPIO=y · line 15
Quoted 8 lines
index
8a859cba2e..56ec482794100644configs/mvebu_espressobin-88f3720_defconfig +1
-0@@ -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"
Good point.
But why does this autodetection not work for me?
Quoted 19 lines
Review
Quoted 4 lines
configs/mvebu_espressobin-88f3720_defconfig +0
-0CONFIG_DEBUG_UART=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y(quoted diff) +0
-0
b/include/configs/mvebu_armada-37xx.hQuoted 12 lines
index
0d585606a7..377ac60def100644include/configs/mvebu_armada-37xx.h +1
-0@@ -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 */
Signature · 2 lines
With best regards, Matwey V. Kornilov
PATCH 1/1 Add fdtfile for Marvell Armada 37xx default environment
Quoted 42 lines · Matwey V. Kornilov
??, 26 ????. 2020 ?. ? 06:45, Andre Heider <[email protected] <mailto:[email protected]>>:
On 25/11/2020 10:14, Matwey V. Kornilov wrote: > Signed-off-by: Matwey V. Kornilov <[email protected] <mailto:[email protected]>> > --- >? ?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"
Quoted 2 lines
Good point.
But why does this autodetection not work for me?
I guess that can only happen if:
- the commit isn't part of you tree
- you disabled CONFIG_BOARD_LATE_INIT or didn't refresh from the defconfig
- you already have the envvar set/saved
Quoted 24 lines
>? ?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 */ >Signature · 2 lines
With best regards, Matwey V. Kornilov
PATCH 1/1 Add fdtfile for Marvell Armada 37xx default environment
??, 26 ????. 2020 ?. ? 12:40, Andre Heider <[email protected]>:
Quoted 43 lines · Matwey V. Kornilov
Quoted 42 lines
??, 26 ????. 2020 ?. ? 06:45, Andre Heider <[email protected] <mailto:[email protected]>>:
On 25/11/2020 10:14, Matwey V. Kornilov wrote: > Signed-off-by: Matwey V. Kornilov <[email protected] <mailto:[email protected]>> > --- > 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"
Quoted 9 lines
Quoted 2 lines
Good point.
But why does this autodetection not work for me?I guess that can only happen if:
- the commit isn't part of you tree
- you disabledCONFIG_BOARD_LATE_INITor didn't refresh from the defconfig
- you already have the envvar set/saved
Hi,
I've double checked, and you are right.
It seems that I did "env default" and fdtfile disappeared until the next reset.
What do you think? If the patch still needed for 3720-DB?
Quoted 26 lines
Quoted 24 lines
> 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 */ >--
With best regards,
Matwey V. Kornilov
Signature · 2 lines
With best regards, Matwey V. Kornilov
PATCH 1/1 Add fdtfile for Marvell Armada 37xx default environment
Quoted 62 lines · Matwey V. Kornilov
??, 26 ????. 2020 ?. ? 12:40, Andre Heider <[email protected] <mailto:[email protected]>>:
On 26/11/2020 10:04, Matwey V. Kornilov wrote: > > > ??, 26 ????. 2020 ?. ? 06:45, Andre Heider <[email protected] <mailto:[email protected]> > <mailto:a.heider at gmail.com <mailto:[email protected]>>>: > >? ? ?On 25/11/2020 10:14, Matwey V. Kornilov wrote: >? ? ? > Signed-off-by: Matwey V. Kornilov <matwey.kornilov at gmail.com <mailto:[email protected]> >? ? ?<mailto:[email protected] <mailto:[email protected]>>> >? ? ? > --- >? ? ? >? ?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" > > > Good point. > But why does this autodetection not work for me? I guess that can only happen if: - the commit isn't part of you tree - you disabled CONFIG_BOARD_LATE_INIT or didn't refresh from the defconfig - you already have the envvar set/saved
Quoted 7 lines
Hi,
I've double checked, and you are right.
It seems that I did "env default" and fdtfile disappeared until the next reset.What do you think? If the patch still needed for 3720-DB?
I'm not so sure anybody cares about that board anymore, but it's not up to me ;)
You would need to wrap setting fdtfile for the default env with "#ifdef CONFIG_DEFAULT_FDT_FILE" then though.
Quoted 31 lines
> >? ? ? >? ?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 */ >? ? ? > > > > > -- > With best regards, > Matwey V. KornilovSignature · 2 lines
With best regards, Matwey V. Kornilov