From patchwork Tue Dec 20 06:03:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 707334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tjSBc6QfSz9t0w for ; Tue, 20 Dec 2016 17:12:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i4ORvdxX"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tjSBc5JTfzDwTS for ; Tue, 20 Dec 2016 17:12:56 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i4ORvdxX"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tjS0p5LR2zDwhb for ; Tue, 20 Dec 2016 17:04:26 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i4ORvdxX"; dkim-atps=neutral Received: by mail-pf0-x241.google.com with SMTP id y68so8419764pfb.1 for ; Mon, 19 Dec 2016 22:04:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ifZO0g/iVs8LR/GymQhsiCQl99UDCe8Pu53a3AZtDSk=; b=i4ORvdxX7pL8eGnMNpnVbX+ULqx6XjxjGiJFEXRbCzDGirkQc9OIvFlLojVGc3EH4N Q4NeoEZZWhzz4pVoZJa6F1Hj3fOF+ijqLLUrfqZkKo8mmBUx1GfGsDvRLQAPAJAANhzz mcv+bBAABX/g6BJkfgE5siUZHIpJFiNox6U/HRNiz7RdbupVFXn9vY1HQVOkuec3CRsQ xVoJqNGt8cd2Z6upkVgP4zWABRDn2dedIABhEyv/qtre7bfUaxJ1f1y2McPullEQgUWO f7mNLPtzCbFzIqEV8bRDK4BL2dLOdCKMwgj2iDatZgNGoYYaAS1EM1I4dShnmqYabm5A Ht7A== 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; bh=ifZO0g/iVs8LR/GymQhsiCQl99UDCe8Pu53a3AZtDSk=; b=AjKvKLXJ2MFcArgoQHZSQlLA62MGfh1/PKkucN/6Yqpw8aQVI2LL+LI6P3xiP2VRfG t4+eoeeA7kowLRDt7lEZMsdFUkG/egUUxTrAADuWpHqsf46k2HteQL7f0vGHVTYlFM7X en+qpjTFMhktBkbpser6fsvPHmKH0EEaeKnLRGqIQE0i60GRzr+J+wOFxb4y3EavdyEb b1MBYZvNUAEZmRLuGYOqlisgmfn4eYF69A+/rFpv0xL++W/j+IlEPRZ179OfQvWQPBex sXuKI32wqVk5WlAQL8r0hn1JiONh3TY20dSNRgTn2D0D4hnsD552IouxQJmxC3ui/hMY jWRQ== X-Gm-Message-State: AKaTC024Uksxv9W8qBkNzFwNO2jhGAiEopPfI4zKGxtCRdA+WXbHa/eoL8o2Ju1qMry8wQ== X-Received: by 10.84.210.228 with SMTP id a91mr41053740pli.0.1482213864981; Mon, 19 Dec 2016 22:04:24 -0800 (PST) Received: from flat-canetoad.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id u64sm28213696pgc.39.2016.12.19.22.04.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Dec 2016 22:04:24 -0800 (PST) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Tue, 20 Dec 2016 17:03:45 +1100 Message-Id: <1482213825-30448-15-git-send-email-oohall@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482213825-30448-1-git-send-email-oohall@gmail.com> References: <1482213825-30448-1-git-send-email-oohall@gmail.com> Subject: [Skiboot] [PATCH v2 14/14] console: remove force_dummy_console() X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" force_dummy_console() was only ever used to ensure the dummy console would be initialised when the platform did not setup it's usual console. The new console init path will uses the dummy console by default so this is now unnecessary. Signed-off-by: Oliver O'Halloran --- core/console.c | 9 +-------- include/console.h | 2 -- platforms/mambo/mambo.c | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/core/console.c b/core/console.c index 34605c4ed0b7..86d34470aa05 100644 --- a/core/console.c +++ b/core/console.c @@ -49,7 +49,7 @@ struct memcons memcons __section(".data.memcons") = { .ibuf_size = INMEM_CON_IN_LEN, }; -bool dummy_console_enabled(void) +static bool dummy_console_enabled(void) { #ifdef FORCE_DUMMY_CONSOLE return true; @@ -59,13 +59,6 @@ bool dummy_console_enabled(void) #endif } -void force_dummy_console(void) -{ - if (!dummy_console_enabled()) - dt_add_property(dt_chosen, "sapphire,enable-dummy-console", - NULL, 0); -} - /* * Helper function for adding /ibm,opal/consoles/serial@ nodes */ diff --git a/include/console.h b/include/console.h index 53feccb00a95..ea1c4e2b9085 100644 --- a/include/console.h +++ b/include/console.h @@ -75,8 +75,6 @@ struct opal_con_ops { int64_t (*flush)(int64_t term_number); }; -extern bool dummy_console_enabled(void); -extern void force_dummy_console(void); extern bool flush_console(void); extern void set_console(struct con_ops *driver); diff --git a/platforms/mambo/mambo.c b/platforms/mambo/mambo.c index 807931392bf0..b627b7f017b6 100644 --- a/platforms/mambo/mambo.c +++ b/platforms/mambo/mambo.c @@ -213,7 +213,6 @@ static void mambo_rtc_init(void) static void mambo_platform_init(void) { - force_dummy_console(); mambo_rtc_init(); bogus_disk_flash_init(); }