From patchwork Sun Jul 25 16:13:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1509614 X-Patchwork-Delegate: trini@ti.com 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=85.214.62.61; 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=clFJlten; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4GXp6v0xw4z9sWX for ; Mon, 26 Jul 2021 02:15:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 98E6C82937; Sun, 25 Jul 2021 18:14:21 +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="clFJlten"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8A5B182C8C; Sun, 25 Jul 2021 18:14:14 +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=-3.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) (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 3392F82952 for ; Sun, 25 Jul 2021 18:14:05 +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-x32f.google.com with SMTP id f20-20020a9d6c140000b02904bb9756274cso7446378otq.6 for ; Sun, 25 Jul 2021 09:14:05 -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=+voESsF2cbskqTI6nCSmHStX5aYpEsTwB6Lu54qfEWc=; b=clFJltenBB+ihQuY8TvBt/SD4YZyiWueMCeMOXaiaTob5sxvhtPJ05OWw6ab/G1jQj 88KtqPVsQQMy7XTVDaU+Yn66VmKImLkRIseIFpeOAscqj0mU67TWE0DO+Y7Vy/g8mMp7 snyQkczOHp6CtVLa7mlde4HFIx1A5Lco/RRcs= 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=+voESsF2cbskqTI6nCSmHStX5aYpEsTwB6Lu54qfEWc=; b=qUytuu//l+ZzuyQ3+hdYaZA4XCSZlxmBgP/rAlZKV9Q/CvetJ+Lp6AyiQ9+jkDIpan oe8UIez1giSbeWEVliLcAqxKiisAuGK9sMLfVSbEUyIZDq0XXMhl2v0A9kfcZgycpRpn wiXDPQxA95Gm2aPv2S/CgGUeVAwdl9FbVIXIvrfjlVD0YI9XOi5AMxbP7N+Df5Wg+Pta ie3y8L2Mc703Rj5UTRBWYDzVq335+ypaMAXGm+LGoqOvWpdITNf/JMuBfEBPMtscbgcu EePQ7wfcGhngF5PB9iIUCPK2fI6H9YQqh91KXSn654EEwyx2sOpX7WvSalqD2lsiMlQY YkbQ== X-Gm-Message-State: AOAM532CQ5kKP9ylKcoqkNCURBuoSnvpyM6HC1UmUZ35bidl+1Fb8mCu ljBsOu6kfsTyRXAG6U3WX/2dhl0OmElNKnRm X-Google-Smtp-Source: ABdhPJwT3X1TSbJZrJEuorACKEsRsHiZrAujno86yGT8XFGX6GosMFbDcolSSmF5P/INYECHqpRfmw== X-Received: by 2002:a05:6830:4104:: with SMTP id w4mr9283275ott.59.1627229643524; Sun, 25 Jul 2021 09:14:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jul 2021 09:14:03 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jaehoon Chung , Lokesh Vutla , Peng Fan Subject: [PATCH v6 1/5] omap: mmc: Avoid using libfdt with of-platdata Date: Sun, 25 Jul 2021 10:13:43 -0600 Message-Id: <20210725161347.457937-2-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 this driver is enabled in SPL on omapl138_lcdk, which uses of-platdata. The driver needs to be ported to use of-platdata properly. For now, avoid a build error by returning an error. Signed-off-by: Simon Glass --- (no changes since v1) drivers/mmc/davinci_mmc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index 05ca3612809..7016649524f 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -506,6 +506,12 @@ static int davinci_mmc_of_to_plat(struct udevice *dev) struct davinci_mmc_plat *plat = dev_get_plat(dev); struct mmc_config *cfg = &plat->cfg; + /* FIXME: Cannot read from device tree with of-platdata */ + if (CONFIG_IS_ENABLED(OF_PLATDATA)) { + printf("Please fix this driver to use of-platdata"); + return -ENOSYS; + } + plat->reg_base = (struct davinci_mmc_regs *)dev_read_addr(dev); cfg->f_min = 200000; cfg->f_max = 25000000; From patchwork Sun Jul 25 16:13:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1509613 X-Patchwork-Delegate: trini@ti.com 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=UhdntF0C; 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 4GXp6q5nQtz9sWX for ; Mon, 26 Jul 2021 02:14:59 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D2D0282E05; Sun, 25 Jul 2021 18:14:30 +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="UhdntF0C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4C91C82C40; Sun, 25 Jul 2021 18:14:18 +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=-3.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) (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 2010182AC8 for ; Sun, 25 Jul 2021 18:14:06 +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-x333.google.com with SMTP id c2-20020a0568303482b029048bcf4c6bd9so6068597otu.8 for ; Sun, 25 Jul 2021 09:14:06 -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=3C0rBAClhFj99Uz/EL8CKPuqO6I/PXo37Qtbha3P7T4=; b=UhdntF0C4E1P1kikKV1PMAyojzhfltMlDGGfUS5+RhIH0IhV08GhabqXPCDeU6nV2y uZPQMxNR0ZBqyGcQBcDHvxqJbpK5ev7GV9g0vLkUyOh7arps0WT6DMMBKijB2jbgx0st rO8RD8wmgTZPs6fxepIrT4qdCg6uCQhKvpyjg= 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=3C0rBAClhFj99Uz/EL8CKPuqO6I/PXo37Qtbha3P7T4=; b=duZ6wEeeMC7M4OgsG4VJ4oEXUx6gA1YQGtfgi/t4vpFzGSj82IemlsQyRoZoCVGZIx vrCUYkDa4KgE1+lvJ6RVkxGpCgTh4KajrzfmSp4VkrBCEWNHk2ECRfQpasJxogypjsQO 9mwI58udf+EGdx11pZyVfOgyOG2TYacRqdB5+gy7vEaXdKR9zlYqVrzBMc3LB1GU4jPI xM9mx0DVnvVyV8d/FkisqrvLubxU4Eij2bJg0sCKfmPvnQhbkvk46hY13nOxKFiRKIgZ HPhWygNAEbE8QMnVSUlO40aJC4sOq8rNfrHU0VODfFHKSw0HnnKr8WNqLngXKNIqXDgD OkhA== X-Gm-Message-State: AOAM532sWRyo4xPaviuML7tF5JOrhL1RH9IYB8oVqaiwFF1dcGEdh2ik Gay7sLKRz+zalELDGGyEd46POWLo+/c+Ag+g X-Google-Smtp-Source: ABdhPJwqhYcdUkG33zOgWEprtjYqbUbSFWPPsezusYW5ABXx7IeXFv6wBeWYS8zltTvgHhM5WIyvdA== X-Received: by 2002:a9d:2072:: with SMTP id n105mr9634782ota.132.1627229644396; Sun, 25 Jul 2021 09:14:04 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jul 2021 09:14:04 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Joe Hershberger , Ramon Fried Subject: [PATCH v6 2/5] net: atheros: Add a check for OF_CONTROL Date: Sun, 25 Jul 2021 10:13:44 -0600 Message-Id: <20210725161347.457937-3-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 This phy cannot be used when OF_CONTROL is not enabled. A few boards expect it to build, though, so add a runtime check for this case. Signed-off-by: Simon Glass Reviewed-by: Ramon Fried --- Changes in v6: - Add new patch for atheros drivers/net/phy/atheros.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c index f922fecd6b5..cc772f3060f 100644 --- a/drivers/net/phy/atheros.c +++ b/drivers/net/phy/atheros.c @@ -7,6 +7,7 @@ * Copyright (c) 2019 Michael Walle */ #include +#include #include #include #include @@ -197,6 +198,16 @@ static int ar803x_of_init(struct phy_device *phydev) u32 strength, freq, min_uV, max_uV; int sel; + /* + * This driver requires OF_CONTROL but this is included on some boards + * that don't support it in SPL. Return an error so the board vendor + * can resolve this. + */ + if (!CONFIG_IS_ENABLED(OF_CONTROL)) { + log_err("atheros driver requires OF_CONTROL enabled"); + return -ENOSYS; + } + node = phy_get_ofnode(phydev); if (!ofnode_valid(node)) return -EINVAL; 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 From patchwork Sun Jul 25 16:13:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1509616 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=85.214.62.61; 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=aBIQ4WXB; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4GXp7F1BKrz9sWX for ; Mon, 26 Jul 2021 02:15:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F3D2F8321C; Sun, 25 Jul 2021 18:14:44 +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="aBIQ4WXB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 121E482937; Sun, 25 Jul 2021 18:14:20 +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=-3.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-oo1-xc35.google.com (mail-oo1-xc35.google.com [IPv6:2607:f8b0:4864:20::c35]) (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 CCFEE82C28 for ; Sun, 25 Jul 2021 18:14:08 +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-oo1-xc35.google.com with SMTP id e3-20020a4ab9830000b029026ada3b6b90so1667402oop.0 for ; Sun, 25 Jul 2021 09:14:08 -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=MNZjKN14F2yDmf5opAJqqbzWZYu7l4Fq6KIsCKbJYAQ=; b=aBIQ4WXB69EAx0Y47fiUS9tqI+K7h0I3rumMdcLkTF+x9Qm/F5zBXM7FWwLxeuMgQd 6bIG4o5lycNS80ZnTRmKD9HvbMMzDIHbknlotMyY2mgGRXvYBXfqwI6hhrn0WEAjH+vR a5PDBNtZgrixak8Dz/n1+5lPEefgB/Xs406ZI= 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=MNZjKN14F2yDmf5opAJqqbzWZYu7l4Fq6KIsCKbJYAQ=; b=Gou60jfG1MPNmWdeL85ZlA5n4S1onF881ZY0oP/m7pIxkWtWVDMpPv2AvDJzRv18IS be5cz06EgHpjHfwlyuRFPppFWUM8B/ZxKd7grZRNw5T5jk6EeYOZzV/i9PTFelGhrElw Mnwu+dvIa9+y7VtEngGDVAdtCojzZ3Z0/xgtRSPcAtQgOjY8e96NTBA0CMmB1dMle6PW n7u3jVew7M9Ynu3aTd8fKQZgRmHqM08LF3MTcTfEyOuv64Zc6VGW18nHEmcMGh61sf5/ mqZwh0Y2mJM9Ha6RPTdGrUZMvP4aEHO6T2E7cztKuZet6kV3pYWbKzGZQC93/vAeEli1 8pGA== X-Gm-Message-State: AOAM533i2FxZ2tW4p57ayVBkgW6RfOHWQjSwj4OMvXqIUGtVM5NrbVl2 ipfiqw03JfmtoaLobaPWRw4L/CKc2hKR/Asn X-Google-Smtp-Source: ABdhPJysriamgEiStXesRHhLQizmVfy+5SRWSqqnUOICXwhGJF+JssxdnwOadVss1e1dyknQUatHNw== X-Received: by 2002:a4a:498f:: with SMTP id z137mr8199905ooa.64.1627229647242; Sun, 25 Jul 2021 09:14:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jul 2021 09:14:06 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Marek Vasut , Pavel Herrmann Subject: [PATCH v6 5/5] dm: core: Don't include ofnode functions with of-platdata Date: Sun, 25 Jul 2021 10:13:47 -0600 Message-Id: <20210725161347.457937-6-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 These functions cannot work with of-platdata since libfdt is not available. At present when dev_read_...() functions are used it produces error messages about ofnode which is confusing. Adjust the Makefile and header to produce an error message for the actual dev_read...() function which is called. This makes it easier to see what code needs to be converted for use with of-platdata. Signed-off-by: Simon Glass --- (no changes since v3) Changes in v3: - Fix eth_dev_get_mac_address() call dev_read...() only when available drivers/core/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/core/Makefile b/drivers/core/Makefile index 5edd4e41357..725e6e94cd2 100644 --- a/drivers/core/Makefile +++ b/drivers/core/Makefile @@ -15,6 +15,8 @@ obj-$(CONFIG_$(SPL_)OF_LIVE) += of_access.o of_addr.o ifndef CONFIG_DM_DEV_READ_INLINE obj-$(CONFIG_OF_CONTROL) += read.o endif -obj-$(CONFIG_OF_CONTROL) += of_extra.o ofnode.o read_extra.o +ifdef CONFIG_$(SPL_TPL_)OF_LIBFDT +obj-$(CONFIG_$(SPL_TPL_)OF_CONTROL) += of_extra.o ofnode.o read_extra.o +endif ccflags-$(CONFIG_DM_DEBUG) += -DDEBUG