diff options
| author | Simon Glass <sjg@chromium.org> | 2021-10-14 21:48:00 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-12 03:02:21 +0300 |
| commit | 262cfb5b15420a1aea465745a821e684b3dfa153 (patch) | |
| tree | 5ca11ceba83974229782b7298e99ed97af11c332 | |
| parent | 8018b9af57b5cd0cfddf48a8d12f04dba8b77a65 (diff) | |
| download | u-boot-262cfb5b15420a1aea465745a821e684b3dfa153.tar.xz | |
pxe: Move pxe_utils files
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@chromium.org>
Reviewed-by: Artem Lapkin <email2tema@gmail.com>
Tested-by: Artem Lapkin <email2tema@gmail.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
| -rw-r--r-- | boot/Makefile | 3 | ||||
| -rw-r--r-- | boot/pxe_utils.c (renamed from cmd/pxe_utils.c) | 0 | ||||
| -rw-r--r-- | cmd/Makefile | 4 | ||||
| -rw-r--r-- | cmd/sysboot.c | 2 | ||||
| -rw-r--r-- | include/pxe_utils.h (renamed from cmd/pxe_utils.h) | 0 |
5 files changed, 6 insertions, 3 deletions
diff --git a/boot/Makefile b/boot/Makefile index a19e85cf6c..2938c3f145 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 index 972f9b06b0..972f9b06b0 100644 --- a/cmd/pxe_utils.c +++ b/boot/pxe_utils.c diff --git a/cmd/Makefile b/cmd/Makefile index ed3669411e..891819ae0f 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 85fa5d8aa0..b81255e155 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 index 6681442ea5..6681442ea5 100644 --- a/cmd/pxe_utils.h +++ b/include/pxe_utils.h |