aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2024-04-02 12:21:52 +0200
committerGeert Uytterhoeven <geert+renesas@glider.be>2024-04-08 11:14:11 +0200
commitec78ed2e157ea6d4b66869c8a3dbe4dbac0593c6 (patch)
tree38e3f38e105fcfdb78be3045688fdee11bb3eacc
parent27e51e83891bb4b9c806bae1ffb17c44fd8ea459 (diff)
downloadrenesas-devel-ec78ed2e157ea6d4b66869c8a3dbe4dbac0593c6.tar.gz
ARM: shmobile: defconfig: Refresh for v6.9-rc1renesas-arm-defconfig-for-v6.10-tag1renesas-arm-defconfig-for-v6.10
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> Link: https://lore.kernel.org/r/b2e6306a58e18136c05668dbbe9e839efdbe463e.1712053238.git.geert+renesas@glider.be
-rw-r--r--arch/arm/configs/shmobile_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 091e1840933cf2..56925adfe84229 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