| Message ID | 20201125091445.17099-1-matwey.kornilov@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | Add fdtfile for Marvell Armada 37xx default environment | expand |
On 25.11.20 10:14, Matwey V. Kornilov wrote: > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Nitpicking: An empty commit message is frowned upon. Please add a small sentence in the commit text as well. 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
On 25/11/2020 10:14, Matwey V. Kornilov wrote: > 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(+) > > 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 */ >
чт, 26 нояб. 2020 г. в 06:45, Andre Heider <a.heider@gmail.com>: > On 25/11/2020 10:14, Matwey V. Kornilov wrote: > > 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(+) > > > > 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? > > 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 */ > > > >
On 26/11/2020 10:04, Matwey V. Kornilov wrote: > > > чт, 26 нояб. 2020 г. в 06:45, Andre Heider <a.heider@gmail.com > <mailto:a.heider@gmail.com>>: > > On 25/11/2020 10:14, Matwey V. Kornilov wrote: > > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com > <mailto: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(+) > > > > 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 > > > 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
чт, 26 нояб. 2020 г. в 12:40, Andre Heider <a.heider@gmail.com>: > On 26/11/2020 10:04, Matwey V. Kornilov wrote: > > > > > > чт, 26 нояб. 2020 г. в 06:45, Andre Heider <a.heider@gmail.com > > <mailto:a.heider@gmail.com>>: > > > > On 25/11/2020 10:14, Matwey V. Kornilov wrote: > > > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com > > <mailto: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(+) > > > > > > 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 > > 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? > > > > > 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 > >
On 29/11/2020 09:32, Matwey V. Kornilov wrote: > > > чт, 26 нояб. 2020 г. в 12:40, Andre Heider <a.heider@gmail.com > <mailto:a.heider@gmail.com>>: > > On 26/11/2020 10:04, Matwey V. Kornilov wrote: > > > > > > чт, 26 нояб. 2020 г. в 06:45, Andre Heider <a.heider@gmail.com > <mailto:a.heider@gmail.com> > > <mailto:a.heider@gmail.com <mailto:a.heider@gmail.com>>>: > > > > On 25/11/2020 10:14, Matwey V. Kornilov wrote: > > > Signed-off-by: Matwey V. Kornilov > <matwey.kornilov@gmail.com <mailto:matwey.kornilov@gmail.com> > > <mailto:matwey.kornilov@gmail.com > <mailto: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(+) > > > > > > 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 > > > 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. > > > > > > 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 > > > > -- > With best regards, > Matwey V. Kornilov
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 */
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(+)