[PATCH 2/2] ARM: zynq: drop the board-specific environment

[Gwenhael Goavec-Merou]

Hi,

Le 14/07/2025 à 9:12 AM, Ahmad Fatoum a écrit :
> The Linux device tree hardcodes per DT alias (since 2015) the
> stdout-path to uart1, not uart0 and thus the Linux TTY device is called
> ttyPS0 and not ttyPS1.
> 
> With previous changes to the serial driver to fix up the console device,
> hardcoding this option is no longer needed, so drop it along with its
> environment overlay that's now empty.
> 
> Reported-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou at trabucayre.com>
> Signed-off-by: Ahmad Fatoum <a.fatoum at barebox.org>
> ---
>   arch/arm/boards/avnet-zedboard/env/nv/linux.bootargs.console | 1 -
>   arch/arm/configs/zynq_defconfig                              | 2 +-
>   2 files changed, 1 insertion(+), 2 deletions(-)
>   delete mode 100644 arch/arm/boards/avnet-zedboard/env/nv/linux.bootargs.console
> 
> diff --git a/arch/arm/boards/avnet-zedboard/env/nv/linux.bootargs.console b/arch/arm/boards/avnet-zedboard/env/nv/linux.bootargs.console
> deleted file mode 100644
> index 6c9f9dabcf1b..000000000000
> --- a/arch/arm/boards/avnet-zedboard/env/nv/linux.bootargs.console
> +++ /dev/null
> @@ -1 +0,0 @@
> -console=ttyPS1,115200
> diff --git a/arch/arm/configs/zynq_defconfig b/arch/arm/configs/zynq_defconfig
> index 1a1378d3e079..752068f69196 100644
> --- a/arch/arm/configs/zynq_defconfig
> +++ b/arch/arm/configs/zynq_defconfig
> @@ -17,7 +17,7 @@ CONFIG_BOOTM_VERBOSE=y
>   CONFIG_BOOTM_INITRD=y
>   CONFIG_BOOTM_OFTREE=y
>   CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
> -CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/avnet-zedboard/env"
> +CONFIG_DEFAULT_ENVIRONMENT_PATH=""
>   CONFIG_DEBUG_LL=y
>   CONFIG_LONGHELP=y
>   CONFIG_CMD_MEMINFO=y
Tested-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou at trabucayre.com>

Thanks

Gwen