From patchwork Wed Sep 16 08:18:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1365028 X-Patchwork-Delegate: monstr@monstr.eu 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=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=ROgCJiwd; 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 4BrtKW2XnBz9sRK for ; Wed, 16 Sep 2020 18:18:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C8AF181260; Wed, 16 Sep 2020 10:18:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="ROgCJiwd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1B54D822DB; Wed, 16 Sep 2020 10:18:39 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) (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 100DF801D8 for ; Wed, 16 Sep 2020 10:18:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ej1-x643.google.com with SMTP id r7so9031137ejs.11 for ; Wed, 16 Sep 2020 01:18:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=LbiR+MyLsbFNJfZ5WFWxnWn8mkO6jBfR3ruXedMBVfg=; b=ROgCJiwdgvgB27c3426fUInJlvjTteR7Z2ZsM6MXhXCg97hA3EU8rYMFup7WV1YTks EpLVJABoiMRkD80yaiAgIWAzEqfvPxlPlPit87iJ0eORNvPJtfrueMHWTjbD9WQeU7TP gDMNPSBFPWlgLG21sUh5exozz1ebjzxrSxg5HldeQpMzR8ErtIHRClQJl2cOOU8InyHU O+hgEbtkquaf6tKim1qO8gcP0mEZ0t9YOpElAvK0xbLcLzxn3c8AyWmcuR09jPL9WE5g YQQ2IxOIIk8g3/ybYMq1hmxXKzlJmWNfxGOPx/7taoNKhWyS1s9LzVptf56+7HtZ5cwt 9K+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version:content-transfer-encoding; bh=LbiR+MyLsbFNJfZ5WFWxnWn8mkO6jBfR3ruXedMBVfg=; b=E0Kvw4hDATm3iqMVdKrp31s7cOiGVgWvbmDrUQG5plYja5qV+8XdIXT27fdJ6FMQf7 2CQVpPDSv4ZyNMg0L79pU6v3JtFBA9razVKFPnJKC8z9ye+Ly7jiQWwZW+snbcjwOd2D yoBKfePoo1cwbb5kBKk/KXMDxG0gRUNuD4W1epFuzIfodaiQWxdIm4D0/4HEQ24kUk19 FMwfWUh/Q3be6vECwHf3w/51KonLRv2Qh2O1RE38WJx70FYtXQ8HjFlLu/k2ECrEXXTd Kj/TVE5cGFQ1Cxx/53ELCgD3EoANGW2y59mbJgKz6rY9r+m52bcKGzfPYxzgHDH854Me I0vg== X-Gm-Message-State: AOAM531bC37W50gifVehTX2qfOEa2u1eCiBHHDpjAU2LL0QD1AU72Up/ Hgp6ih+a6S9o//NCjngErcf74r0vJRXudQ== X-Google-Smtp-Source: ABdhPJxwZNwqVO98Cfl2BzKXTnN+ljg1Ub36wi8thuzzyg8av1XmndevMx6Ecbqc0s0vHRB39kp6Aw== X-Received: by 2002:a17:906:3791:: with SMTP id n17mr23769695ejc.216.1600244315423; Wed, 16 Sep 2020 01:18:35 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id s19sm12081133eja.54.2020.09.16.01.18.34 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Sep 2020 01:18:34 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Subject: [PATCH] xilinx: versal: Fix compilation error when !CONFIG_NET Date: Wed, 16 Sep 2020 10:18:30 +0200 Message-Id: <6d8c3b4252fe35fe5ec7af9b19da65011209fa79.1600244307.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.28.0 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 PXE and DHCP shouldn't be listed when commands are not enabled that's why handle it in the same way as is done for Zynq and ZynqMP. Fixes: ec48b6c991f4 ("arm64: versal: Add support for new Xilinx Versal ACAPs") Signed-off-by: Michal Simek --- include/configs/xilinx_versal.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index d7255a05dff1..8b416327b57c 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -94,6 +94,18 @@ # define BOOT_TARGET_DEVICES_MMC(func) #endif +#if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP) +# define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na) +#else +# define BOOT_TARGET_DEVICES_PXE(func) +#endif + +#if defined(CONFIG_CMD_DHCP) +# define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na) +#else +# define BOOT_TARGET_DEVICES_DHCP(func) +#endif + #if defined(CONFIG_ZYNQMP_GQSPI) || defined(CONFIG_CADENCE_OSPI_VERSAL) # define BOOT_TARGET_DEVICES_XSPI(func) func(XSPI, xspi, 0) #else @@ -135,8 +147,8 @@ BOOT_TARGET_DEVICES_MMC(func) \ BOOT_TARGET_DEVICES_XSPI(func) \ BOOT_TARGET_DEVICES_DFU_USB(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_DEVICES_PXE(func) \ + BOOT_TARGET_DEVICES_DHCP(func) #include