| Message ID | 20240808145259.2155425-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm-bsp/linux-yocto: update for linux 6.10 | expand |
diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-drm.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-drm.cfg index 77133a9d..0a6e3f67 100644 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-drm.cfg +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-drm.cfg @@ -2,4 +2,3 @@ CONFIG_DRM=y CONFIG_DRM_PL111=y CONFIG_FB=y -CONFIG_FB_ARMCLCD=y diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-drm.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-drm.cfg index 12162979..7b225083 100644 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-drm.cfg +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-drm.cfg @@ -1,5 +1,5 @@ CONFIG_DRM=y CONFIG_DRM_HDLCD=y +CONFIG_DRM_PL111=y CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_FB=y -CONFIG_FB_ARMCLCD=y diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-fb.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-fb.cfg index 59499fa6..ba143a0a 100644 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-fb.cfg +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-fb.cfg @@ -1,4 +1,3 @@ CONFIG_FB=y -CONFIG_FB_ARMCLCD=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_VGA_CONSOLE is not set diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg index f4d220e0..a5b0e69b 100644 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg @@ -5,4 +5,3 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_CPU_THERMAL=y -CONFIG_THERMAL_WRITABLE_TRIPS=y
CONFIG_FB_ARMCLCD is long obsolete, has been replaced with a DRM driver enabled by CONFIG_DRM_PL111, and was removed in 6.8. CONFIG_THERMAL_WRITABLE_TRIPS was removed in 6.9. Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-drm.cfg | 1 - .../arm-platforms-kmeta/bsp/arm-platforms/juno/juno-drm.cfg | 2 +- .../arm-platforms-kmeta/bsp/arm-platforms/juno/juno-fb.cfg | 1 - .../arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg | 1 - 4 files changed, 1 insertion(+), 4 deletions(-)