From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 41A07C4338F for ; Thu, 19 Aug 2021 03:48:15 +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 BD32C6108B for ; Thu, 19 Aug 2021 03:48:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BD32C6108B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8B002831EE; Thu, 19 Aug 2021 05:46:56 +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="ACa5gKOm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 793508317A; Thu, 19 Aug 2021 05:46:31 +0200 (CEST) Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) (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 3A3488314B for ; Thu, 19 Aug 2021 05:46: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=sjg@chromium.org Received: by mail-oi1-x22b.google.com with SMTP id bd1so6682361oib.3 for ; Wed, 18 Aug 2021 20:46:21 -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=dhHHjS6L9b1IYmW7JREeM9tsnhkuRMuPDHOlSQAbK48=; b=ACa5gKOmc1Qch6FuUBjbbR+EN4/LiVRisEdfGAPZnPIjEtfcOR8m5L7KowBgVOvlnJ +V47pg7YkpZLXuQhH4ZZvvU+4184ke6VOGVwnnfSYKgsRZozp+q5xa357/V5puJQOMOk +/WeNrkA+868OM1moYeM/iZFs5OkxOZmSJsgw= 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=dhHHjS6L9b1IYmW7JREeM9tsnhkuRMuPDHOlSQAbK48=; b=TuOehiSLv66QyZCeUzXLqkc0HFDE1gu4bpmSyOdRDVLoax1kQgj9xXLa045vCVRAMC uGnKXz/F8rnMsZ+h/hxH+cVGMqH4HKpai4E9dekD7IVZEbnuSIQE0ODIaL11B6BGBMc9 tiH57e6nFpqegIpYs1roU+SfB+rXIvrV6ibSWb8QOADuGkUT6nJ9QPfZmYEibWq7MmaH ygM+D51CMR1Ou/daCcFwGr2b7YN5QqKmdXdJGjr6DV7FP0JUSNMU+R1EENF1t4raDfB4 nOxl0vgv8Zh+SWOE/KRGKNQM/DMgjDG+A69JyQIYSoz5jstY9hctS5ga16li+Of+W3k9 CIQA== X-Gm-Message-State: AOAM5329eKUJcgtN0HGzMCcmyijgp1UIQcbSUonC8+dK2EFFUdWQF86n q36Zqv7rjiuyWBkkP1kOGWlguWavvWTD9Q== X-Google-Smtp-Source: ABdhPJxESA0APzN5kuz0T3T9SioWuj45qYZuD7hqAtYaFVLl0gzqVWaqk2QYhPa0lId1WkQvVy7L1w== X-Received: by 2002:aca:a80a:: with SMTP id r10mr403817oie.119.1629344779438; Wed, 18 Aug 2021 20:46:19 -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 q3sm370025ooa.13.2021.08.18.20.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 20:46:19 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Ilias Apalodimas , Steffen Jaeckel , Michal Simek , Tom Rini , Dennis Gilmore , Daniel Schwierzeck , Lukas Auer , Simon Glass Subject: [PATCH 07/28] pxe: Move pxe_utils files Date: Wed, 18 Aug 2021 21:45:40 -0600 Message-Id: <20210818214547.7.Id5595981cd99201c6a2d8b714254d775436a3483@changeid> X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog In-Reply-To: <20210819034601.1618773-1-sjg@chromium.org> References: <20210819034601.1618773-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Move the header file into the main include/ directory so we can use it from the bootmethod code. Move the C file into boot/ since it relates to booting. Signed-off-by: Simon Glass --- boot/Makefile | 3 +++ {cmd => boot}/pxe_utils.c | 0 cmd/Makefile | 4 ++-- cmd/sysboot.c | 2 +- {cmd => include}/pxe_utils.h | 0 5 files changed, 6 insertions(+), 3 deletions(-) rename {cmd => boot}/pxe_utils.c (100%) rename {cmd => include}/pxe_utils.h (100%) diff --git a/boot/Makefile b/boot/Makefile index 57d26346afb..e8f984248e6 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -14,6 +14,9 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o +obj-$(CONFIG_CMD_PXE) += pxe_utils.o +obj-$(CONFIG_CMD_SYSBOOT) += pxe_utils.o + endif obj-y += image.o diff --git a/cmd/pxe_utils.c b/boot/pxe_utils.c similarity index 100% rename from cmd/pxe_utils.c rename to boot/pxe_utils.c diff --git a/cmd/Makefile b/cmd/Makefile index ed3669411e6..891819ae0f6 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -123,7 +123,7 @@ obj-$(CONFIG_CMD_PINMUX) += pinmux.o obj-$(CONFIG_CMD_PMC) += pmc.o obj-$(CONFIG_CMD_PSTORE) += pstore.o obj-$(CONFIG_CMD_PWM) += pwm.o -obj-$(CONFIG_CMD_PXE) += pxe.o pxe_utils.o +obj-$(CONFIG_CMD_PXE) += pxe.o obj-$(CONFIG_CMD_WOL) += wol.o obj-$(CONFIG_CMD_QFW) += qfw.o obj-$(CONFIG_CMD_READ) += read.o @@ -145,7 +145,7 @@ obj-$(CONFIG_CMD_SETEXPR_FMT) += printf.o obj-$(CONFIG_CMD_SPI) += spi.o obj-$(CONFIG_CMD_STRINGS) += strings.o obj-$(CONFIG_CMD_SMC) += smccc.o -obj-$(CONFIG_CMD_SYSBOOT) += sysboot.o pxe_utils.o +obj-$(CONFIG_CMD_SYSBOOT) += sysboot.o obj-$(CONFIG_CMD_STACKPROTECTOR_TEST) += stackprot_test.o obj-$(CONFIG_CMD_TERMINAL) += terminal.o obj-$(CONFIG_CMD_TIME) += time.o diff --git a/cmd/sysboot.c b/cmd/sysboot.c index 85fa5d8aa01..b81255e155a 100644 --- a/cmd/sysboot.c +++ b/cmd/sysboot.c @@ -4,7 +4,7 @@ #include #include #include -#include "pxe_utils.h" +#include static char *fs_argv[5]; diff --git a/cmd/pxe_utils.h b/include/pxe_utils.h similarity index 100% rename from cmd/pxe_utils.h rename to include/pxe_utils.h -- 2.33.0.rc1.237.g0d66db33f3-goog