From patchwork Thu Oct 6 02:42:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 678702 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sqH6V6ZrKz9sBr for ; Thu, 6 Oct 2016 13:44:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=U6O7d9WQ; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E6ED6A7711; Thu, 6 Oct 2016 04:43:36 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6qtbLVVj1VP6; Thu, 6 Oct 2016 04:43:36 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DE501B384A; Thu, 6 Oct 2016 04:43:03 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 59E5BA76F9 for ; Thu, 6 Oct 2016 04:42:45 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NRsTnHk1RV5d for ; Thu, 6 Oct 2016 04:42:45 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-oi0-f52.google.com (mail-oi0-f52.google.com [209.85.218.52]) by theia.denx.de (Postfix) with ESMTPS id 0AD21A7714 for ; Thu, 6 Oct 2016 04:42:38 +0200 (CEST) Received: by mail-oi0-f52.google.com with SMTP id r126so7359045oib.0 for ; Wed, 05 Oct 2016 19:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=NJkfWKO2glLsYG1VL7fbDwozRpuFzREGPpwpIq2Z+2c=; b=U6O7d9WQcSjJytymNq0D1wli2u44tk08J8XFvv5Sg9x8KHPKfqxI2/JIdgjSSbZqdg 6D/dDgeCJ3Cg8BTO8f3qHU6YFAW/rhVYlx1JOwrhGJW2Y7GOak/cFISew2PMRhGePi/Q 3KdUsSvKbuqgH0BXwRCTO1AdeW5o1sR5CKRalYbtFE6d9Ud+R2uTp0vMv/8XnFR/bRzh AwoK1tCJyfssqD9WV6U0wQ/d5c1HnLey4uOjt/XGx+oz8D/yu+rJnH26b3R9KxMuB8aM 68tC5x9NIYXzs3CrxCVRyTg49H0wzUv4ESve/kqpUQDFQwYacDbEYt0/bNwofxakCCeQ kGgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=NJkfWKO2glLsYG1VL7fbDwozRpuFzREGPpwpIq2Z+2c=; b=ah8ZhmhRafQbWlANvoiXOwF96Dm06cgwF/NcwFh6EcYZIqv6qvDRHF79a23+6X8Ha5 FCUxGQb/T6T5mWGf84ZFmPyxMGr8asXgwVe5sWdSSYP+H/buneVJg+FUFN0IzT8iLymp FTL+j+vGJh5mbjNP9pkVI2yJ0f0CCxlTrlGhs0294ktIg4AS4zEAq+/hTNRpAx9D1Pd3 Z6/9tfY8SBD6DVPbYC2cd6qb3p+nIVrZWjCIk6mzLMdpTE/hS/wPSE5bHLAAm6QoFW1N K3M3HombUfsXSZMD+b9+sFko+sGIoojv6PppcGIg7K6V61z2h+416bgIoApX/BQvJY7n HV+w== X-Gm-Message-State: AA6/9RkJPs3gLvrfIRm3NtrDYduJ/BsOxS5AkuPOP0fd9M/nS+CpX084Opx9cKAgYsU/qCtw X-Received: by 10.202.245.144 with SMTP id t138mr9603875oih.162.1475721756699; Wed, 05 Oct 2016 19:42:36 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:12:6c03:e5c0:da1f:9820]) by smtp.gmail.com with ESMTPSA id f36sm656056otf.17.2016.10.05.19.42.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Oct 2016 19:42:36 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id A2F94220A60; Wed, 5 Oct 2016 20:42:35 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 5 Oct 2016 20:42:18 -0600 Message-Id: <1475721740-15124-11-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1475721740-15124-1-git-send-email-sjg@chromium.org> References: <1475721740-15124-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v2 10/12] x86: Adjust config to support DM_VIDEO X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Update the common configuration so that it works correctly when CONFIG_DM_VIDEO is enabled. This involves dropping the legacy CONFIG_VIDEO option and changing the stdio device from "vga" to "vidconsole". Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v2: None include/configs/x86-chromebook.h | 10 ++++++++-- include/configs/x86-common.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index 312987e..7fba716 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -53,8 +53,14 @@ #define CONFIG_SYS_WHITE_ON_BLACK +#ifdef CONFIG_DM_VIDEO +#define VIDEO_DEV "vidconsole" +#else +#define VIDEO_DEV "vga" +#endif + #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ - "stdout=vga,serial\0" \ - "stderr=vga,serial\0" + "stdout=" VIDEO_DEV ",serial\0" \ + "stderr=" VIDEO_DEV ",serial\0" #endif diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 74b2522..96c53b8 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -131,11 +131,13 @@ /*----------------------------------------------------------------------- * Video Configuration */ +#ifndef CONFIG_DM_VIDEO #define CONFIG_VIDEO #define CONFIG_VIDEO_SW_CURSOR #define VIDEO_FB_16BPP_WORD_SWAP #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_CFB_CONSOLE +#endif #define CONFIG_CONSOLE_SCROLL_LINES 5 /*-----------------------------------------------------------------------