diff mbox series

ARM: shmobile: defconfig: Refresh for v6.9-rc1

Message ID b2e6306a58e18136c05668dbbe9e839efdbe463e.1712053238.git.geert+renesas@glider.be (mailing list archive)
State New, archived
Headers show
Series ARM: shmobile: defconfig: Refresh for v6.9-rc1 | expand

Commit Message

Geert Uytterhoeven April 2, 2024, 10:21 a.m. UTC
Refresh the defconfig for Renesas ARM systems:
  - Move CONFIG_DRM_PANEL_SIMPLE (moved in commit aaf7f80996834ae5
    ("drm/panel: re-alphabetize the menu list")),
  - Enable warn on W+X mappings at boot (recommended, renamed in commit
    a90f0a02f139a13d ("arm: ptdump: rename CONFIG_DEBUG_WX to
    CONFIG_ARM_DEBUG_WX")).

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
To be queued in renesas-devel for v6.10.

 arch/arm/configs/shmobile_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 091e1840933cf2c6..56925adfe8422921 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -139,8 +139,8 @@  CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_RCAR_DU=y
 # CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
 CONFIG_DRM_SHMOBILE=y
-CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_PANEL_EDP=y
+CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_DISPLAY_CONNECTOR=y
 CONFIG_DRM_LVDS_CODEC=y
 CONFIG_DRM_SII902X=y
@@ -235,3 +235,4 @@  CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_FS=y
+CONFIG_ARM_DEBUG_WX=y