From patchwork Mon Sep 11 13:17:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13379329 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 784C3EE57DF for ; Mon, 11 Sep 2023 13:18:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=orXSZucrShvJEI5dHY6mo/cOUb63jZsRqBFXKLmib1Y=; b=DGrMh5CKPff9x4 9plHPRbeiqhbeKtlHy28QrfMn8xhPEzee4mZDdMc0lImzQGvPuJEwLyJWgnDbNral0haBV1Vt/S43 nTgQqlwtH8FzJS0zMj7DyZ4Vi/USFJSL3E1h7a1wh7rgkmS3TXp8iYzGru/2XXlNEt4NOWduNJQTb ehLsYwkUXkC0bGpGpOpC+dbWhIcU/MNSFJ9ASeJp7HLtXcMFjXxXnAVFc20lgGWw/xcgUWEKnpK5o qSNWhgZGe+6KNI3UgX17ihCAE1ok4uRGw28CXuVB+XnLqPNyrIdDMk/K1RFn9MIDS1Q5fY+TX5m5U RoiS9mZRUcdQrUwKlSYA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qfgnY-000adA-28; Mon, 11 Sep 2023 13:17:52 +0000 Received: from laurent.telenet-ops.be ([2a02:1800:110:4::f00:19]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qfgnU-000acR-1n for linux-arm-kernel@lists.infradead.org; Mon, 11 Sep 2023 13:17:51 +0000 Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:a989:d413:f41f:af52]) by laurent.telenet-ops.be with bizsmtp id kdHh2A00C43UkUk01dHhaq; Mon, 11 Sep 2023 15:17:42 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qfgn6-002zwB-WD; Mon, 11 Sep 2023 15:17:41 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qfgnN-007ruf-70; Mon, 11 Sep 2023 15:17:41 +0200 From: Geert Uytterhoeven To: Magnus Damm Cc: linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven Subject: [PATCH] ARM: shmobile: defconfig: Refresh for v6.6-rc1 Date: Mon, 11 Sep 2023 15:17:40 +0200 Message-Id: <1b8aee0cfcb2fa8c6e73c67f1c85c4630d946159.1694438226.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230911_061748_752886_E322887D X-CRM114-Status: UNSURE ( 9.32 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org - Move CONFIG_KEXEC (moved in commit 89cde455915f4611 ("kexec: consolidate kexec and crash options into kernel/Kconfig.kexec")), - Enable CONFIG_FRAMEBUFFER_CONSOLE (no longer auto-enabled since commit a5ae331edb02b664 ("drm: Drop select FRAMEBUFFER_CONSOLE for DRM_FBDEV_EMULATION")). Signed-off-by: Geert Uytterhoeven --- Perhaps this is worthwhile to be queued as a fix for v6.6, due to the text console regression? --- arch/arm/configs/shmobile_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 22205ef0f3768420..bd975d105687be39 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -6,6 +6,7 @@ CONFIG_CGROUPS=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PERF_EVENTS=y +CONFIG_KEXEC=y CONFIG_ARCH_RENESAS=y CONFIG_PL310_ERRATA_588369=y CONFIG_SMP=y @@ -13,7 +14,6 @@ CONFIG_SCHED_MC=y CONFIG_NR_CPUS=8 CONFIG_HIGHMEM=y CONFIG_ARM_APPENDED_DTB=y -CONFIG_KEXEC=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y @@ -148,6 +148,7 @@ CONFIG_FB=y CONFIG_FB_SH_MOBILE_LCDC=y CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_AS3711=y +CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y