From patchwork Thu Sep 27 16:55:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maksym Kokhan X-Patchwork-Id: 975817 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=globallogic.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=globallogic.com header.i=@globallogic.com header.b="eZF3rdt9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Lgt345c4z9sCn for ; Fri, 28 Sep 2018 02:55:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728707AbeI0XOp (ORCPT ); Thu, 27 Sep 2018 19:14:45 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:41942 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727588AbeI0XOo (ORCPT ); Thu, 27 Sep 2018 19:14:44 -0400 Received: by mail-lf1-f65.google.com with SMTP id q39-v6so1347890lfi.8 for ; Thu, 27 Sep 2018 09:55:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=globallogic.com; s=google; h=from:to:cc:subject:date:message-id; bh=jIQCx/pZEBHGO0iRLLbR8qjBss0/jgBaBqZvoVB58Rk=; b=eZF3rdt9TzMJKFMzx2gYgQzaSX93alAwGDPSyLWBgVEGOvC6v3r0LICFrlbPy7KIxX fCzpCPenxkGLuUc3I0R62jagvW7X1xj14NPS8VjqoMKq+14mRdupRFBKZo5nwNN+kOVx KxEDxvfFBjuf4pYH+bp91YvupVxJZR1cXhnas= 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; bh=jIQCx/pZEBHGO0iRLLbR8qjBss0/jgBaBqZvoVB58Rk=; b=FfMuGo2dyPyilMBYfTTYToabQV41wIdfQR52GVOyosvugqXYAg5+xj1bLLC5TE6z1G /8wBouGIkkmVUT42EnF0ubUY6WgPoO/o66z4nlr2Yx+rFOc5/5NDLeHVbqT86n2WW6t8 n0k8l3LMXhKii6aeQpv3T/dDKx/b2OtW+V1TgXZjdoA+HedRKZpda1BUi2dzNPEy7KGH 79xIoegYwg+UdYY/tuPfZE7vDzvogiJpgFdPaap+18JRiPva7aPkhExpvAuk4XvJVY6J KuqF/AnPcFVUaHoA2x2xH85AcO3ib6NtdJlbNND3Kdc8dA07PVNbklyc0bzorSvZiEuF hqdQ== X-Gm-Message-State: ABuFfohV0nvye/Gp3m/4Bp4R39sj/QWp+BbqP0rqSpX0FqSLNcyz4KPN U0g4VgoopuRnsIjYHUmlo2FtFw== X-Google-Smtp-Source: ACcGV63XySk+RAQOdV73uAiYRcvDnr/Cy2IIJfvUdj/BQ0fHvpnoFwqulxl2lIewYR+eIpraRpVfsg== X-Received: by 2002:a19:18e3:: with SMTP id 96-v6mr8385155lfy.133.1538067332961; Thu, 27 Sep 2018 09:55:32 -0700 (PDT) Received: from kbp1-lhp-f55466.synapse.com ([195.238.92.77]) by smtp.gmail.com with ESMTPSA id l3-v6sm507508lja.25.2018.09.27.09.55.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Sep 2018 09:55:32 -0700 (PDT) From: Maksym Kokhan To: Rob Herring , Frank Rowand Cc: Daniel Walker , Daniel Walker , Andrii Bordunov , Ruslan Bilovol , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/8] drivers: of: ifdef out cmdline section Date: Thu, 27 Sep 2018 19:55:27 +0300 Message-Id: <1538067327-5785-1-git-send-email-maksym.kokhan@globallogic.com> X-Mailer: git-send-email 2.7.4 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Daniel Walker It looks like there's some seepage of cmdline stuff into the generic device tree code. This conflicts with the generic cmdline implementation so I remove it in the case when that's enabled. Cc: Daniel Walker Cc: Daniel Walker Signed-off-by: Daniel Walker Signed-off-by: Maksym Kokhan --- drivers/of/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 800ad25..74b85ad 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1096,7 +1096,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, * managed to set the command line, unless CONFIG_CMDLINE_FORCE * is set in which case we override whatever was found earlier. */ -#ifdef CONFIG_CMDLINE +#if defined(CONFIG_CMDLINE) && !defined(CONFIG_GENERIC_CMDLINE) #if defined(CONFIG_CMDLINE_EXTEND) strlcat(data, " ", COMMAND_LINE_SIZE); strlcat(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);