From patchwork Mon Oct 1 17:55:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 977354 X-Patchwork-Delegate: sjg@chromium.org 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=fail (p=none dis=none) header.from=chromium.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42P9CQ0PJ3z9sB5 for ; Tue, 2 Oct 2018 04:04:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C0262C21EDC; Mon, 1 Oct 2018 17:58:44 +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 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 B619FC21FB3; Mon, 1 Oct 2018 17:57:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BDBCEC21F51; Mon, 1 Oct 2018 17:55:55 +0000 (UTC) Received: from mail-it1-f201.google.com (mail-it1-f201.google.com [209.85.166.201]) by lists.denx.de (Postfix) with ESMTPS id 8A9EDC21E90 for ; Mon, 1 Oct 2018 17:55:51 +0000 (UTC) Received: by mail-it1-f201.google.com with SMTP id d194-v6so11970140itb.8 for ; Mon, 01 Oct 2018 10:55:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=TVO+2DR1PhpcdPLxvbQjRxa5iJiMU4CiJYEWGDwQvUY=; b=QmjhZupMDFOKk3F06d2pkIQw547GcxOwJ1KvxKmnLcxGlHkvhEErH6hvcoUf64yq5v ylW5XeDavwZQbr74fn04uArxPx0wxXdaHstb4Wc18+wHYOp0KsiR5TClnRFkycyeMzOT C3TVjaam4wtTDeYFLIH9orJFixtf3yh7O2OOSTRvDgaS/ptAiEGuuqkqqzk4doT5IJvL Dh1diSFUFu7KB1vVB1OfEHfQhKzrvBsalXOpr3gfdA4agL3tphUip16rLRvmeN+WkQL4 JTFiERCFaWYXzDVR6jJY0s65NOawWtZ4Zj56ogIXySdL6UD+j5pHLmCScg/RsMC/IYOD 8c2w== X-Gm-Message-State: ABuFfoiA3NLURtfrUTq+BTVpMayRcrBWcKFrypzuqzGt/7titxLTO5H1 1IXV/1V7beVn74wol6KDdMenAN8= X-Google-Smtp-Source: ACcGV6123n8WpyiWVT4bjhmzTjjGwwYtqfOQ+9hhbIh2ji5B8uod0hq35ru5AMQoYd9RXJMt7PrB/xg= X-Received: by 2002:a24:fe01:: with SMTP id w1-v6mr2915794ith.0.1538416550603; Mon, 01 Oct 2018 10:55:50 -0700 (PDT) Date: Mon, 1 Oct 2018 11:55:16 -0600 In-Reply-To: <20181001175520.239554-1-sjg@chromium.org> Message-Id: <20181001175520.239554-12-sjg@chromium.org> Mime-Version: 1.0 References: <20181001175520.239554-1-sjg@chromium.org> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini Subject: [U-Boot] [PATCH 11/15] serial: sandbox: Allow serial output without device tree 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" At present sandbox assumes that device-tree control is active, but this may not be the case in SPL or TPL. Add some conditions to handle this. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- drivers/serial/sandbox.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index 4fbc5956b76..9e9bf3e011f 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -22,6 +22,8 @@ DECLARE_GLOBAL_DATA_PTR; +#if CONFIG_IS_ENABLED(OF_CONTROL) + /* * * serial_buf: A buffer that holds keyboard characters for the @@ -142,6 +144,7 @@ static int sandbox_serial_getc(struct udevice *dev) serial_buf_read = increment_buffer_index(serial_buf_read); return result; } +#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ #ifdef CONFIG_DEBUG_UART_SANDBOX @@ -173,6 +176,7 @@ static int sandbox_serial_setconfig(struct udevice *dev, uint serial_config) return 0; } +#if CONFIG_IS_ENABLED(OF_CONTROL) static const char * const ansi_colour[] = { "black", "red", "green", "yellow", "blue", "megenta", "cyan", "white", @@ -232,3 +236,4 @@ U_BOOT_DEVICE(serial_sandbox_non_fdt) = { .name = "serial_sandbox", .platdata = &platdata_non_fdt, }; +#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */