From patchwork Tue Jan 15 16:17:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1025293 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="c2Fc9Pwb"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43fFwB6Y0fz9sDB for ; Wed, 16 Jan 2019 03:21:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 92DA3C22052; Tue, 15 Jan 2019 16:19:41 +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 5A18FC21FD6; Tue, 15 Jan 2019 16:18:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D2449C22086; Tue, 15 Jan 2019 16:18:18 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id A671FC22086 for ; Tue, 15 Jan 2019 16:18:14 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id u4so3651319wrp.3 for ; Tue, 15 Jan 2019 08:18:14 -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=xcouZkYyUK4i5KIwHCX1Wsiuiy/JNInEfwKg2Y2UMDs=; b=c2Fc9PwbxuRE898GEzCBrWXxjlOk55bbQ51aNvpROJqjg6IjYm/Q7fBR+c7Rs5QaIK 0yFukoqWy+vQtT/O8gs4SgMvdH3Q03qqi/6GQVAaK6g3WwREpWbWKrX5xHXqBUPaTuHH fGoFlwQep45g+/zd7EgC0yANwoYJiPN2opXo+lOcjYmx342qeMV0DMAUy84D4LC3JvoY 5WwpjCSY4IXQhOpV3WtkKLolGNCr0uHpeUX50F+DAdwa1RNPHaiS7T4YJe+QBUSIsi9A LqQjh/Itz0bI3DJUPdODQYxehKv8IfmJYjrB0PWT4YLo1NXmUAJ15kFxqtxrhEiNqcq+ NhEQ== 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=xcouZkYyUK4i5KIwHCX1Wsiuiy/JNInEfwKg2Y2UMDs=; b=d/je/g3mtkb3DGcmn2JCwGcKMHLvmJrY3AjRXp6jabqaejRjWQog5P4q9shPHbUzn4 vtssmREifhU5Jz9gwTdLQkWHe9L98iPS25gOoIFBxlAEA2NtyqeGBK5iw1O/UrZMMd8l 1Weq7XJvePq5PSQ2p92ghjeGbbDFHGLRN4onXVKrC4p05Qz76/x5lrm5o5TMU0fDf0Co cYK2KopjYfsqvj3FZHrGLfBugjy/sZw+ObehIlYAYJJtn4g0ASUtahgpxSxCpnrY47N/ kxnJ7oP5nkPkIIepBBJgcvkP853oRUDTfiD4+QvxXJ47UxrmO/f42tG0ciZJ5u9Ud8Uw 6nqg== X-Gm-Message-State: AJcUukeRyEzpZrJ5RHw074He+JrSqAvLY9iA7xf0A5SC+cSBA+RB3OJO 6kgd2DG6PVviDgSVSAlV/rw5zg== X-Google-Smtp-Source: ALg8bN4/TjnSLm3uCzxULKzByXQvo6ALE4AE149C6kauQwrEflykTgrKh575cM649n3lwA6vUzTJyg== X-Received: by 2002:adf:ecc8:: with SMTP id s8mr3727821wro.208.1547569094243; Tue, 15 Jan 2019 08:18:14 -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.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Jan 2019 08:18:13 -0800 (PST) From: Neil Armstrong To: agust@denx.de, u-boot@lists.denx.de Date: Tue, 15 Jan 2019 17:17:57 +0100 Message-Id: <20190115161759.1657-10-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: mjourdan@baylibre.com, linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH u-boot 09/11] configs: meson64: use vidconsole and usbkbd if enabled 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" Allows displaying the console via video and using a USB keyboard. Also enables CONFIG_SPLASH_SCREEN if using video. Signed-off-by: Neil Armstrong Signed-off-by: Maxime Jourdan Reviewed-by: Anatolij Gustschin --- include/configs/meson64.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 40ac079dfc..d82a674270 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -16,6 +16,26 @@ #define GICC_BASE 0xc4302000 #endif +/* For splashscreen */ +#ifdef CONFIG_DM_VIDEO +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_BMP_16BPP +#define CONFIG_BMP_24BPP +#define CONFIG_BMP_32BPP +#define CONFIG_SPLASH_SCREEN +#define CONFIG_SPLASH_SCREEN_ALIGN +#define STDOUT_CFG "vidconsole,serial" +#else +#define STDOUT_CFG "serial" +#endif + +#ifdef CONFIG_USB_KEYBOARD +#define STDIN_CFG "usbkbd,serial" +#define CONFIG_PREBOOT "usb start" +#else +#define STDIN_CFG "serial" +#endif + #define CONFIG_CPU_ARMV8 #define CONFIG_REMAKE_ELF #define CONFIG_ENV_SIZE 0x2000 @@ -59,6 +79,9 @@ #ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ + "stdin=" STDIN_CFG "\0" \ + "stdout=" STDOUT_CFG "\0" \ + "stderr=" STDOUT_CFG "\0" \ "fdt_addr_r=0x08008000\0" \ "scriptaddr=0x08000000\0" \ "kernel_addr_r=0x08080000\0" \