[PATCH v3 07/18] pxe: Move pxe_utils files

[Ramon Fried]

On Thu, Oct 14, 2021 at 9:50 PM Simon Glass <sjg at chromium.org> wrote:
>
> 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 <sjg at chromium.org>
> ---
>
> (no changes since v1)
>
>  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 a19e85cf6c8..2938c3f1458 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 image-board.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 <command.h>
>  #include <env.h>
>  #include <fs.h>
> -#include "pxe_utils.h"
> +#include <pxe_utils.h>
>
>  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.1079.g6e70778dc9-goog
>
Reviewed-by: Ramon Fried <rfried.dev at gmail.com>