From patchwork Tue Jan 15 16:17:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1025299 X-Patchwork-Delegate: agust@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="nk5Lc/vH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43fFzw44TQz9sCs for ; Wed, 16 Jan 2019 03:25:00 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 326DBC2209E; Tue, 15 Jan 2019 16:21:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4738AC22097; Tue, 15 Jan 2019 16:19:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2FF87C2207E; Tue, 15 Jan 2019 16:18:19 +0000 (UTC) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by lists.denx.de (Postfix) with ESMTPS id F3B0AC220A2 for ; Tue, 15 Jan 2019 16:18:15 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id m22so3830473wml.3 for ; Tue, 15 Jan 2019 08:18:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XdFlpcWqNimRDBSAVnxb0JtFkPf65JOSTI6WG2yqYtI=; b=nk5Lc/vHj8uzX15nWooOhc+3b1iICA7Che2zE4Zg8f/hUrnf/zs9LbZoaUKEttNJi1 GJHkW66zmaIcHCy4eijEb6X/akVU9hnLxgrRnPbXSg6BAPD6pO4TVLhF/H9aqqAg/Zrl HQyLrTjOuC9g8tAIRyv/4X3pYugoOKEnyIkfExQhguP1JsE2PS4n0bToHg4vQu7HWoDg UgX/lRPgooW1RoksBQLJO4mG7UHJM2i0nXqg/03iDvhr6U7sexhAhzCatHlc/hpvvn+5 KVvq8AgRYpNYq1avGBM8NXC3IgQ6VliyAVJ5pP4BO9AyScCXdynKSmylH/RdVzNajgrR RzoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XdFlpcWqNimRDBSAVnxb0JtFkPf65JOSTI6WG2yqYtI=; b=BO6FY8EsVRrpSJKzCqCoKQGcDmAOfdErjCdf2OJQg0RmGyCHMSY8n5dZHuD/VBunnN sERszf+NpaGR1R0MUy8DB/z7n7ncbfUfI+Tz7rYcqIV6C9VrVzjKPkEVjIlwdjS+bd8H YRlIxNYSkRBqKElXC3pFjZazvW5S7mRGy2++/eRdCwDUD7/KiKcOs449WOyMzGEb6Pgr ml1WKpOtX3Jdw3nEXWbTPNeipcV9RvJEOjmxuf75A/PTr6dhfBjRtGYoqHpRl49jYTWu gQ0XanMCvmiucONUOcZApofDxsXxPG7682yFdy0qaybWcxIFWgCWmjRTzznihbm7vbg8 rLlg== X-Gm-Message-State: AJcUukfAQgYFcecFZ1eKpbX4SgRzpGrH043Qh5R0FqnUeT5taeCMi6QN I5av69F15idwtae0obAmA6mTrQ== X-Google-Smtp-Source: ALg8bN7XLJTKSIVn+I3z9J/SWi+eRt0rJ4cPemGR6WmYTXqjsuF1ZZ8RkZQpA7LheniIS3dMf0hDVA== X-Received: by 2002:a1c:ae88:: with SMTP id x130mr3761123wme.91.1547569095506; Tue, 15 Jan 2019 08:18:15 -0800 (PST) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id o81sm54014829wmd.10.2019.01.15.08.18.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Jan 2019 08:18:14 -0800 (PST) From: Neil Armstrong To: agust@denx.de, u-boot@lists.denx.de Date: Tue, 15 Jan 2019 17:17:58 +0100 Message-Id: <20190115161759.1657-11-narmstrong@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190115161759.1657-1-narmstrong@baylibre.com> References: <20190115161759.1657-1-narmstrong@baylibre.com> MIME-Version: 1.0 Cc: Maxime Jourdan , linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH u-boot 10/11] arm: meson64: enable console mux and console env by default X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Maxime Jourdan With the recent addition of the meson VPU driver, enable the following config entries by default for meson-64 targets: CONFIG_CONSOLE_MUX, CONFIG_SYS_CONSOLE_IS_IN_ENV. This allows outputting the console via video if CONFIG_VIDEO_MESON is selected. Signed-off-by: Maxime Jourdan Signed-off-by: Neil Armstrong Reviewed-by: Anatolij Gustschin --- configs/khadas-vim2_defconfig | 2 ++ configs/khadas-vim_defconfig | 2 ++ configs/libretech-cc_defconfig | 2 ++ configs/odroid-c2_defconfig | 2 ++ configs/p212_defconfig | 2 ++ 5 files changed, 10 insertions(+) diff --git a/configs/khadas-vim2_defconfig b/configs/khadas-vim2_defconfig index 75514d2ca5..ed8e32776c 100644 --- a/configs/khadas-vim2_defconfig +++ b/configs/khadas-vim2_defconfig @@ -44,3 +44,5 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y CONFIG_USB_DWC3=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_CONSOLE_MUX=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/khadas-vim_defconfig b/configs/khadas-vim_defconfig index cf87802653..add8e0973a 100644 --- a/configs/khadas-vim_defconfig +++ b/configs/khadas-vim_defconfig @@ -49,3 +49,5 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y CONFIG_USB_DWC3=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_CONSOLE_MUX=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/libretech-cc_defconfig b/configs/libretech-cc_defconfig index c21b9ad9ca..c3fdca5e67 100644 --- a/configs/libretech-cc_defconfig +++ b/configs/libretech-cc_defconfig @@ -49,3 +49,5 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y CONFIG_USB_DWC3=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_CONSOLE_MUX=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 33e6e74fa2..60cf97b3b6 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -38,3 +38,5 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_CONSOLE_MUX=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/p212_defconfig b/configs/p212_defconfig index 2ab47e616f..d2c2da10f4 100644 --- a/configs/p212_defconfig +++ b/configs/p212_defconfig @@ -48,3 +48,5 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y CONFIG_USB_DWC3=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_CONSOLE_MUX=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y