From patchwork Fri Sep 29 09:01:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 146462 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3882972vqu; Fri, 29 Sep 2023 02:07:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFJmeiVm3O9vY5WnbejG1qoriKnf16IOqUPtcLp7ihZ91+eNI0/OTOQaRGV4pV65dG1APae X-Received: by 2002:a05:6a00:24cf:b0:68f:dfe2:9f03 with SMTP id d15-20020a056a0024cf00b0068fdfe29f03mr3759001pfv.11.1695978434131; Fri, 29 Sep 2023 02:07:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695978434; cv=none; d=google.com; s=arc-20160816; b=XkhioyILoumpH3cVs11LXWnmCjrOFA0ol8Kendf2aRQK9HtBkuhNSTUCEgaTxaK8hb WSe4i4ylesyb7Oqs8QxOu4UrCFzds+Ps9T2HDN6Ec0dZlYLnUGTzsgoUH4fUZlxIl4Wt jfMnMyzzxzMktizr3QJ+fsiW2Bpmvt6YPH3FYSrHeUhLOINjPGY4XlnL4NLjRN0gm8qn Q9wXgANfy8TSniRTBiJvpz3mShcD7q2GztC+p9v1XS+kKwjfCxyYM+u6SzBh+XDuQ2cQ qoJJc6Th316/Cw16BbtSc/L2JuqT2IlWM5X+3pwWQjluenEPN1umA4+IlVNYalcI5/5t 0U8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=eZCByMsSuryJBNkNU0gA+zvpUFm5sjedvjezH1qlhm0=; fh=BDrdCxyUpw5Sv0kLI7N5Px35XW+74mo73F6dqwMNkq4=; b=mLOmtgjkRi5qFZuKpbNJylsTo4Fe+TD1ZoGv77NTn79EN7cyaochS3lfVVuLh0bPz+ G1ZMpvDnGLyfqI0QkRd5xcDCxAOZMwnftYowGCiRkAQr+f/Dj+jqDS16SCVnJY6ru41X tIIefjqHeWn9TWONm3gclEMrHqLye+D4ge5R5kNoUb3MAnIWSyyEcO/68isF/0ENA0t9 6X6S1lxbqwxq0IU7LuwJs0n2VEPG54mTCw/YtvF6d7nxrYOiTdkgOrfQr3JdRVvHG3vB itQgwZzD72xoj/CISeWYpcCG8vr56QzoiW9c+fzRcWRSk3ELTizNcGLFUATSChpde9gu 8DUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id j72-20020a638b4b000000b00577f7bc56absi21528726pge.100.2023.09.29.02.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:07:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 4CBA3822E567; Fri, 29 Sep 2023 02:02:23 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232865AbjI2JBt (ORCPT + 20 others); Fri, 29 Sep 2023 05:01:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231774AbjI2JBp (ORCPT ); Fri, 29 Sep 2023 05:01:45 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F5C5180 for ; Fri, 29 Sep 2023 02:01:41 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:e207:8adb:af22:7f1e]) by laurent.telenet-ops.be with bizsmtp id rl1e2A00Q3w8i7m01l1ezx; Fri, 29 Sep 2023 11:01:39 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qm9N3-004qFu-Le; Fri, 29 Sep 2023 11:01:38 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qm9NS-001b52-Jy; Fri, 29 Sep 2023 11:01:38 +0200 From: Geert Uytterhoeven To: Laurent Vivier Cc: linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] m68k: defconfig: Update virt_defconfig for v6.6-rc3 Date: Fri, 29 Sep 2023 11:01:34 +0200 Message-Id: <6f30b86b83b972e9902b62295f397a20512d5507.1695977960.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 29 Sep 2023 02:02:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778362282700495944 X-GMAIL-MSGID: 1778362282700495944 - Enable CONFIG_DRM_FBDEV_EMULATION and CONFIG_FB_DEVICE (no longer auto-enabled since commit bb6c4507fe825f1b ("drm: fix up fbdev Kconfig defaults")), - Drop CONFIG_FRAMEBUFFER_CONSOLE=y (auto-enabled since commit bb6c4507fe825f1b ("drm: fix up fbdev Kconfig defaults")). Signed-off-by: Geert Uytterhoeven --- Perhaps CONFIG_FB_DEVICE should not be enabled? To be queued in the m68k for-v6.7 branch. --- arch/m68k/configs/virt_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/m68k/configs/virt_defconfig b/arch/m68k/configs/virt_defconfig index 3afc6762b0946aa6..ec021a1d48ee7d86 100644 --- a/arch/m68k/configs/virt_defconfig +++ b/arch/m68k/configs/virt_defconfig @@ -47,8 +47,9 @@ CONFIG_INPUT_EVDEV=y CONFIG_VIRTIO_CONSOLE=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_DRM=y +CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_VIRTIO_GPU=y -CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FB_DEVICE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_VIRTIO=y