[PATCH] arch/powerpc: Drop CONFIG_FIRMWARE_EDID from defconfig files

[Christophe Leroy (CS GROUP)]

Le 01/04/2026 à 10:30, Thomas Zimmermann a écrit :
> CONFIG_FIRMWARE_EDID=y depends on X86 or EFI_GENERIC_STUB. Neither is
> true here, so drop the lines from the defconfig files.

Seems like dependency on X86 was added by commit 7e35fc7ab433 ("video: 
Make CONFIG_FIRMWARE_EDID generally available")

Before that commit it was dependent on CONFIG_FB which is available on 
powerpc. Maybe it is worth explaining that in the commit message.


Reviewed-by: Christophe Leroy (CS GROUP) <chleroy at kernel.org>



> 
> Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
> ---
>   arch/powerpc/configs/amigaone_defconfig | 1 -
>   arch/powerpc/configs/chrp32_defconfig   | 1 -
>   arch/powerpc/configs/g5_defconfig       | 1 -
>   arch/powerpc/configs/pasemi_defconfig   | 1 -
>   arch/powerpc/configs/powernv_defconfig  | 1 -
>   arch/powerpc/configs/ppc64_defconfig    | 1 -
>   arch/powerpc/configs/ppc64e_defconfig   | 1 -
>   arch/powerpc/configs/skiroot_defconfig  | 1 -
>   8 files changed, 8 deletions(-)
> 
> diff --git a/arch/powerpc/configs/amigaone_defconfig b/arch/powerpc/configs/amigaone_defconfig
> index 69ef3dc31c4b..7a515390646b 100644
> --- a/arch/powerpc/configs/amigaone_defconfig
> +++ b/arch/powerpc/configs/amigaone_defconfig
> @@ -76,7 +76,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
>   # CONFIG_HW_RANDOM is not set
>   # CONFIG_HWMON is not set
>   CONFIG_FB=y
> -CONFIG_FIRMWARE_EDID=y
>   CONFIG_FB_TILEBLITTING=y
>   CONFIG_FB_RADEON=y
>   CONFIG_FB_3DFX=y
> diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
> index b799c95480ae..66eae5b7e16c 100644
> --- a/arch/powerpc/configs/chrp32_defconfig
> +++ b/arch/powerpc/configs/chrp32_defconfig
> @@ -76,7 +76,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
>   CONFIG_NVRAM=y
>   # CONFIG_HWMON is not set
>   CONFIG_FB=y
> -CONFIG_FIRMWARE_EDID=y
>   CONFIG_FB_OF=y
>   CONFIG_FB_MATROX=y
>   CONFIG_FB_MATROX_MILLENIUM=y
> diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
> index 428f17b45513..ed051fbc7b69 100644
> --- a/arch/powerpc/configs/g5_defconfig
> +++ b/arch/powerpc/configs/g5_defconfig
> @@ -123,7 +123,6 @@ CONFIG_I2C_CHARDEV=y
>   CONFIG_AGP=m
>   CONFIG_AGP_UNINORTH=m
>   CONFIG_FB=y
> -CONFIG_FIRMWARE_EDID=y
>   CONFIG_FB_TILEBLITTING=y
>   CONFIG_FB_OF=y
>   CONFIG_FB_NVIDIA=y
> diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
> index 8bbf51b38480..89bcbeb05067 100644
> --- a/arch/powerpc/configs/pasemi_defconfig
> +++ b/arch/powerpc/configs/pasemi_defconfig
> @@ -98,7 +98,6 @@ CONFIG_SENSORS_LM85=y
>   CONFIG_SENSORS_LM90=y
>   CONFIG_DRM=y
>   CONFIG_DRM_RADEON=y
> -CONFIG_FIRMWARE_EDID=y
>   CONFIG_FB_TILEBLITTING=y
>   CONFIG_FB_VGA16=y
>   CONFIG_FB_NVIDIA=y
> diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig
> index 9ac746cfb4be..fea71d647375 100644
> --- a/arch/powerpc/configs/powernv_defconfig
> +++ b/arch/powerpc/configs/powernv_defconfig
> @@ -198,7 +198,6 @@ CONFIG_I2C_CHARDEV=y
>   # CONFIG_PTP_1588_CLOCK is not set
>   CONFIG_DRM=y
>   CONFIG_DRM_AST=y
> -CONFIG_FIRMWARE_EDID=y
>   CONFIG_FB_OF=y
>   CONFIG_FB_MATROX=m
>   CONFIG_FB_MATROX_MILLENIUM=y
> diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
> index 2b0720f2753b..2b358c242123 100644
> --- a/arch/powerpc/configs/ppc64_defconfig
> +++ b/arch/powerpc/configs/ppc64_defconfig
> @@ -251,7 +251,6 @@ CONFIG_I2C_CHARDEV=y
>   CONFIG_I2C_AMD8111=y
>   CONFIG_I2C_PASEMI=y
>   CONFIG_FB=y
> -CONFIG_FIRMWARE_EDID=y
>   CONFIG_FB_OF=y
>   CONFIG_FB_MATROX=y
>   CONFIG_FB_MATROX_MILLENIUM=y
> diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig
> index 90247b2a0ab0..80606a5e6475 100644
> --- a/arch/powerpc/configs/ppc64e_defconfig
> +++ b/arch/powerpc/configs/ppc64e_defconfig
> @@ -120,7 +120,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
>   CONFIG_I2C_CHARDEV=y
>   CONFIG_I2C_AMD8111=y
>   CONFIG_FB=y
> -CONFIG_FIRMWARE_EDID=y
>   CONFIG_FB_OF=y
>   CONFIG_FB_MATROX=y
>   CONFIG_FB_MATROX_MILLENIUM=y
> diff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig
> index 86c74146824a..879e57629af7 100644
> --- a/arch/powerpc/configs/skiroot_defconfig
> +++ b/arch/powerpc/configs/skiroot_defconfig
> @@ -216,7 +216,6 @@ CONFIG_SENSORS_IBMPOWERNV=m
>   CONFIG_DRM=m
>   CONFIG_DRM_AST=m
>   CONFIG_FB=y
> -CONFIG_FIRMWARE_EDID=y
>   # CONFIG_VGA_CONSOLE is not set
>   CONFIG_FRAMEBUFFER_CONSOLE=y
>   CONFIG_LOGO=y