From patchwork Sat Oct 3 17:31:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1376325 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; dmarc=pass (p=none dis=none) header.from=chromium.org 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=hVGNwAM0; 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 4C3Yp65bWcz9sSG for ; Sun, 4 Oct 2020 04:32:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 907AA8236C; Sat, 3 Oct 2020 19:32:11 +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="hVGNwAM0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E5C308236C; Sat, 3 Oct 2020 19:32:09 +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=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) (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 566298235C for ; Sat, 3 Oct 2020 19:32: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-il1-x142.google.com with SMTP id t12so4139435ilh.3 for ; Sat, 03 Oct 2020 10:32: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=PMt6rqcyuDHjBSFpe8SyH8/Qgb6mx7VoM/zJ0izBaBc=; b=hVGNwAM0ijyGOnkr63+g9zNqhNd71/4Jzr5lBmh09AeaiHD21VtpV4E2C0wLp/nUOE B5pQ+V0vGZX20yFWA37ewgJuxlO+5LVr8/cVca6iy3GvqVNYBfdh58mEfWgKr1VnrwVZ MwcvCLjI1tcr28m8hwHvkGYqxew0In1fDr0bw= 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=PMt6rqcyuDHjBSFpe8SyH8/Qgb6mx7VoM/zJ0izBaBc=; b=mOPQuS+UM/OBydF2+iO8iuPEAdrKOEvdsdDnAOCRRMyBlCX3qlTR3AN/9wEda72A2n DnkevIIFnOgjO/JpdO39OoRtSZ/Uwv1hmWlOGanbe1P3O4IaYN9mr/Fi+DnOjAigQHa9 MXIExWZ8WuuQCWrMuq4DwTFQAaTKOckJ5kW5kKQrK8Yy6oC5Zt/MWTDCXF+PuO4jAj9J ZO6P0M7ofYr+akJfV91qMJZRlMaZqs2UY3pkMUtqMiV0Mp2FBOny/n4pHGVTvLorAopM sOOxm33vDvSetsegMi4z4uv0b4e/aiqsjv7MlMvdZPx5rsEIC1gfFAWOX7ISDAgVU+BY 42Lg== X-Gm-Message-State: AOAM532eHNarL5oxHj7aeUA+eG9JeJks7H4SYw/izUckFIzLfcpbiKTv CuxWRoYUaLtRqoeIjNK1ZOQJGfMbsvMiETx5 X-Google-Smtp-Source: ABdhPJwTuFizwdm9072HqBBLoSRU1Ofcf8tVy8cMvRii25GHeIeuzNzFQ7TLlXDdwtFIfHK+bJYwNw== X-Received: by 2002:a92:ba44:: with SMTP id o65mr6278334ili.255.1601746326058; Sat, 03 Oct 2020 10:32:06 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id t14sm2930963ilj.45.2020.10.03.10.32.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 10:32:05 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Walter Lozano , Tom Rini , Simon Glass Subject: [PATCH 01/20] sandbox: Drop ad-hoc device declarations in SPL Date: Sat, 3 Oct 2020 11:31:23 -0600 Message-Id: <20201003173142.3213123-2-sjg@chromium.org> X-Mailer: git-send-email 2.28.0.806.g8561365e88-goog In-Reply-To: <20201003173142.3213123-1-sjg@chromium.org> References: <20201003173142.3213123-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.102.3 at phobos.denx.de X-Virus-Status: Clean Since sandbox's SPL is build with of-platadata, we should not use U_BOOT_DEVICE() declarations as well. Drop them. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- board/sandbox/sandbox.c | 2 ++ drivers/serial/sandbox.c | 3 +++ drivers/sysreset/sysreset_sandbox.c | 2 ++ 3 files changed, 7 insertions(+) diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 937ce284111..18a605de026 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -21,10 +21,12 @@ */ gd_t *gd; +#if !CONFIG_IS_ENABLED(OF_PLATDATA) /* Add a simple GPIO device */ U_BOOT_DEVICE(gpio_sandbox) = { .name = "sandbox_gpio", }; +#endif void flush_cache(unsigned long start, unsigned long size) { diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index f09d291e043..db2fbac6295 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -267,6 +267,7 @@ U_BOOT_DRIVER(sandbox_serial) = { .flags = DM_FLAG_PRE_RELOC, }; +#if !CONFIG_IS_ENABLED(OF_PLATDATA) static const struct sandbox_serial_platdata platdata_non_fdt = { .colour = -1, }; @@ -275,4 +276,6 @@ U_BOOT_DEVICE(serial_sandbox_non_fdt) = { .name = "sandbox_serial", .platdata = &platdata_non_fdt, }; +#endif + #endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c index 69c22a70008..71cabd19568 100644 --- a/drivers/sysreset/sysreset_sandbox.c +++ b/drivers/sysreset/sysreset_sandbox.c @@ -130,7 +130,9 @@ U_BOOT_DRIVER(warm_sysreset_sandbox) = { .ops = &sandbox_warm_sysreset_ops, }; +#if !CONFIG_IS_ENABLED(OF_PLATDATA) /* This is here in case we don't have a device tree */ U_BOOT_DEVICE(sysreset_sandbox_non_fdt) = { .name = "sysreset_sandbox", }; +#endif