Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E225C07E99 for ; Fri, 9 Jul 2021 14:12:18 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 76935613BC for ; Fri, 9 Jul 2021 14:12:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76935613BC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23338832BE; Fri, 9 Jul 2021 16:12:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 3300E832BD; Fri, 9 Jul 2021 16:12:06 +0200 (CEST) Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (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 5F81C832A3 for ; Fri, 9 Jul 2021 16:12:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f169.google.com with SMTP id v10so7675066qto.1 for ; Fri, 09 Jul 2021 07:12:03 -0700 (PDT) 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=IV0V7oi4P9bZNIsqEJyeE+nQpenTUGjJeKjd/AuSjcE=; b=q/5G+vSRbuLeUHAtgijkyoAIE2+0BBLN6Hw/mYNkzECctrBB65CdLeXNzwxeboTOdr My/9Tz5Euq/rboldJZgW5MOboonFGmEqZjCeTajc5BkNbYbO1ZSDd78PmltPnHVU82Cf 8/w3cEs7Of/0qyHhmRcCmXOwOS+Y7T0mW+sewd652ueTmY7Ti6QZZ+iBaliWnk4O6fbP W73+Y3az16s9ISZaXVVzHOZsEAh1fmfHbKtnEsesa0MybFHAflLkDpppuC008+cPuLeo WV4xMa4jNeq5rO4GPBraqdBidtGCPH+NTDD0ZZ0YKLs4dXNiOhn0sHuHAOizF+9RbObV YwPA== X-Gm-Message-State: AOAM532yDQq+IGOUcARyCC5jhJVz3Jo268mAk710niOvt/uA3oyF8nyy xiwbZqryg11PcU0Hf1c4WdMjP3DykJwg X-Google-Smtp-Source: ABdhPJwh8j65wvHbhuJxrQBcSjnuk6ZIr/L6DLn0ip35ar7CA11C9yO9Et/h3JyNCNIdru+/hTRYtA== X-Received: by 2002:ac8:5e82:: with SMTP id r2mr22819198qtx.252.1625839921698; Fri, 09 Jul 2021 07:12:01 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-1083-622a-b9ec-c6c6.res6.spectrum.com. [2603:6081:7b01:cbda:1083:622a:b9ec:c6c6]) by smtp.gmail.com with ESMTPSA id i2sm2558673qko.43.2021.07.09.07.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:12:00 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Tom Warren Subject: [PATCHv2 2/4] tegra: Test on CONFIG_CMD_USB being enabled for distro bootcmd Date: Fri, 9 Jul 2021 10:11:54 -0400 Message-Id: <20210709141156.28268-2-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210709141156.28268-1-trini@konsulko.com> References: <20210709141156.28268-1-trini@konsulko.com> 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 Reuse the common logic to allow for BOOT_TARGET_DEVICES to list USB as a possibility if we're building for a platform that will have USB but not if we don't, so that we don't hit the link-time check for trying to have USB boot on a non-USB system. Cc: Tom Warren Signed-off-by: Tom Rini --- Changes in v2: - New patch. This problem shows up later in the series when we stop building USB framework without a host controller of some sort also enabled. --- include/configs/tegra-common-post.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index fae0e761fb42..dd7a75ae4674 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -21,11 +21,18 @@ #define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */ #ifndef CONFIG_SPL_BUILD + +#if CONFIG_IS_ENABLED(CMD_USB) +# define BOOT_TARGET_USB(func) func(USB, usb, 0) +#else +# define BOOT_TARGET_USB(func) +#endif + #ifndef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ - func(USB, usb, 0) \ + BOOT_TARGET_USB(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) #endif -- 2.17.1