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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 00FA2C433EF for ; Wed, 9 Feb 2022 11:40:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AFDCB83D47; Wed, 9 Feb 2022 12:40:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Vy7R6WYO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D16E583DE9; Wed, 9 Feb 2022 12:40:19 +0100 (CET) Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) (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 9ABA98367D for ; Wed, 9 Feb 2022 12:40:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aford173@gmail.com Received: by mail-ej1-x62c.google.com with SMTP id k25so6449855ejp.5 for ; Wed, 09 Feb 2022 03:40:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=MjlRcH5G3FXXytA27XPlSdL24ptBJsHb8I0vE0hw/Zs=; b=Vy7R6WYOHaaIYyDXMHGFRSwyvX4ybsRtEXnctlVBHV9F0NyP0TcNKBEod5DCiNn6v/ jfqGDYSFW9ORrlLzA7nkI4j54D5f6cl0QHQIH6JGaCv+PszedYrjNws1nW6DfIx8gxCu GdCs9v3pJpj3Dfd5M+9+e7a5JWmCVNIBTVpJ4CJ3mLQ+Cr7WxyaTAlZrK/9MUGrrhi4q yKDjHwudsKhUXXascuVFrjc5VoOtYY/2gw2l74C1yNe/FUcRLshFS8YwTp/NkLf+Uagd tMwHjnqjUBEUawW+yukwW1XwhV1g/bZCJcumN4zMo0tSGQpCnLsb0c9uU0ZEwjSvm5w5 +FHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=MjlRcH5G3FXXytA27XPlSdL24ptBJsHb8I0vE0hw/Zs=; b=20L9RZRZscUMIkb1Ti8t+nwBb3VM0dxvvQq+18tLid1oN93LUxDgryitt62Ye4IN54 UYjqgWEpqwguno/MJoNRh4BWZOuUs7+1fbEyj7mUTnQdFONpi2b4OPazTM/rmAemeJSc 63zMVbYcHqifnbCBNE7UUcB7MkVcFBwmxG/Pbcmp10RbL+XBHA+Pvb0vR6miyH+N8TsC bIRE7aiVGjEg+j8N/qCkr/1AZCUPN0T8AR+lmqvGP7qJ+0yuWv0Sy9SAZ6nBh7cDRcwv qa1hCNtWpkklnaGtCiisPTtte8zPgFvLMDI5hV9l45lcqVFTHe0I4r4+v2Jg129xSbFY JJPA== X-Gm-Message-State: AOAM533yQR0mcn1r13+/0IME+sjsb1KogK7Yf85pWk5ccXFqhyWk9+db j5WgmKoroJhT/NZyyWRx96iflPnbjsd4sTXEjpE= X-Google-Smtp-Source: ABdhPJyh4jjyHYh3nD3TGWZNznVgn91BAQOeUNPISEv9Xyso6ZaZ6T2EYOzr/32YOPX59l8wEXPmezjeJr5XqoHEJpE= X-Received: by 2002:a17:906:4787:: with SMTP id cw7mr1604143ejc.504.1644406814870; Wed, 09 Feb 2022 03:40:14 -0800 (PST) MIME-Version: 1.0 References: <20211014184811.482560-1-sjg@chromium.org> <20211014124803.v3.7.Id5595981cd99201c6a2d8b714254d775436a3483@changeid> In-Reply-To: <20211014124803.v3.7.Id5595981cd99201c6a2d8b714254d775436a3483@changeid> From: Adam Ford Date: Wed, 9 Feb 2022 05:40:03 -0600 Message-ID: Subject: Re: [PATCH v3 07/18] pxe: Move pxe_utils files To: Simon Glass Cc: U-Boot Mailing List , Patrice Chotard , Artem Lapkin , Tom Rini , Joe Hershberger , Heinrich Schuchardt , Peter Hoyes , Lokesh Vutla Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean On Thu, Oct 14, 2021 at 1:50 PM Simon Glass 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@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 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@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 > --- > > (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 > #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.1079.g6e70778dc9-goog >