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

[Adam Ford]

On Thu, Oct 14, 2021 at 1: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.
>
+cc lokeshvutla at ti.com

Simon,

I can't explain why, but with git bisect, it appears this patch breaks
my omap3_logic board (DM3730) by making it wrongly think there is 4GB
of RAM, when in reality there is only 256MB.  We have both 256MB and
512MB parts, and the automatic memory detection has always 'just
worked' in the past.

With this patch now, I see:
U-Boot 2022.01-rc1-00185-g262cfb5b15 (Feb 09 2022 - 05:23:42 -0600)

OMAP3630/3730-GP ES1.2, CPU-OPP2, L3-200MHz, Max CPU Clock 1 GHz
Model: LogicPD Zoom DM3730 Torpedo + Wireless Development Kit
DRAM:  4 GiB
<hang>

With the previous commit, 8018b9af57b5 ("pxe: Tidy up the is_pxe
global"), it properly detects the RAM and fully boots.

U-Boot 2022.01-rc1-00184-g8018b9af57 (Feb 09 2022 - 05:21:39 -0600)

OMAP3630/3730-GP ES1.2, CPU-OPP2, L3-200MHz, Max CPU Clock 1 GHz
Model: LogicPD Zoom DM3730 Torpedo + Wireless Development Kit
DRAM:  256 MiB
NAND:  512 MiB
MMC:   OMAP SD/MMC: 0
Loading Environment from NAND... OK
OMAP die ID: 619e00029ff800000168300f1502501f
Net:   eth0: ethernet at 08000000
Hit any key to stop autoboot:  0
OMAP Logic #

I have CONFIG_CMD_BOOTM,  CONFIG_CMD_PXE and CONFIG_CMD_SYSBOOT all
defined, so I am having a hard time understanding why this would
change behavior or stomp on the the structure that knows the memory
size.

If I jump ahead to the current 'master' 531c0089457:("Merge branch
'2022-02-08-TI-platform-updates')  and revert this patch, my board
boots correctly again, but I am struggling to understand why.

Do you have any suggestions for me to try?

thanks,

adam

> 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
>