From patchwork Sun Jul 25 16:13:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1509615 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=F8QeUh6r; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GXp720w0mz9sWX for ; Mon, 26 Jul 2021 02:15:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F1D3A83201; Sun, 25 Jul 2021 18:14:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="F8QeUh6r"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22F6B82B77; Sun, 25 Jul 2021 18:14:17 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C3EF882C2C for ; Sun, 25 Jul 2021 18:14:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-ot1-x335.google.com with SMTP id f20-20020a9d6c140000b02904bb9756274cso7446475otq.6 for ; Sun, 25 Jul 2021 09:14:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/32eBqIl9m0Y6/mFWXf1ndqu+kx+08sLsjN1GF/5b4w=; b=F8QeUh6ruxMpkfcj6PI0PwXhOdrD7tsskm/vgTyN77KqDS+jL44kesnhBXfNNOcKGP 1JeRL+IJdr+Zn0KNWWiBi4RAFRIsjrK3qo0/3KuMpPjdGl/QNk1aVm4wmaf7qzf+/Je4 iqLPenQoBNHN0Eo6AoSIrrUpj1I6UM6+ZYie8= 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=/32eBqIl9m0Y6/mFWXf1ndqu+kx+08sLsjN1GF/5b4w=; b=awTOHGuNBA0wS+BW1yzUNL9fIXgfEQsyI4ExtgwXTy2/yQ5YqypKTeM7F2PwBi7Qp9 MlffFRbastyczcpvYyT25N4Lp8KopolnK8lELxCD8/WdyvrIkdrzR2HRrK/Uxin13QMI F3ywAcBVxTbaNmB/fcnQ40dbr9SHG5s5xy+f4XzPr+4yjxo+ySfGqwoF2vM86QoHiVLl A419TuBF2BLbPgrri8+k08KgEMLiUE3SN9oo3VLcTrQPKpektOtQw3AI4IBwHtKRud8u Sq6e0IweyFkPIDtp9ko0rcajnoFP/ng3e6UmrBErZTAqv9Wc2wIU5HMw70rQMwRZfmd8 y2hg== X-Gm-Message-State: AOAM531/KdA2mycHt3hlhfJe+gYcaTxBWb13YaayH/5ZNqCnLtOJuQrM m9JOpZ+32OOZdh/jpAajHVUlMEmH3CPFfuM3 X-Google-Smtp-Source: ABdhPJxd8SUtgkG26fVdAM4/HydTuzp6uS9rjy1fcBKRFPnA8lYz7jYsZQZej0JcNf1JnWUBfnYOQA== X-Received: by 2002:a9d:5d14:: with SMTP id b20mr9337493oti.307.1627229646351; Sun, 25 Jul 2021 09:14:06 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id y61sm6778937ota.31.2021.07.25.09.14.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jul 2021 09:14:05 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Alexandru Gagniuc , Aswath Govindraju , Bin Meng , Heinrich Schuchardt , Joel Stanley , Patrick Delaunay , Tero Kristo Subject: [PATCH v6 4/5] spl: Allow SPL/TPL to use of-platdata without libfdt Date: Sun, 25 Jul 2021 10:13:46 -0600 Message-Id: <20210725161347.457937-5-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog In-Reply-To: <20210725161347.457937-1-sjg@chromium.org> References: <20210725161347.457937-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean At present libfdt is included in SPL/TPL if SPL/TPL_OF_CONTROL is enabled. But if of-platdata is in use this is not required. Update the condition to avoid building this extra code. This ensures that if a libfdt function is used it will produce a link error rather than silently increasing the build size. Signed-off-by: Simon Glass --- Changes in v6: - Rebase to master Changes in v5: - Drop rockchip patches as those boards have been fixed Changes in v4: - Add new patch for rockchip build errors - Add new patch for omap MMC build errors - Add new patch for rockchip chromebook build errors - Pull out patches into a new series - Add new patches to handle build failures lib/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Kconfig b/lib/Kconfig index ad4d75e0a40..ef1235bf0c8 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -599,7 +599,7 @@ config OF_LIBFDT_OVERLAY config SPL_OF_LIBFDT bool "Enable the FDT library for SPL" - default y if SPL_OF_CONTROL + default y if SPL_OF_CONTROL && !SPL_OF_PLATDATA help This enables the FDT library (libfdt). It provides functions for accessing binary device tree images in memory, such as adding and @@ -620,7 +620,7 @@ config SPL_OF_LIBFDT_ASSUME_MASK config TPL_OF_LIBFDT bool "Enable the FDT library for TPL" - default y if TPL_OF_CONTROL + default y if TPL_OF_CONTROL && !TPL_OF_PLATDATA help This enables the FDT library (libfdt). It provides functions for accessing binary device tree images in memory, such as adding and