public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Nishanth Menon <nm@ti.com>
To: Tom Rini <trini@konsulko.com>
Cc: Kamlesh Gurudasani <kamlesh@ti.com>,
	Sinthu Raja <sinthu.raja@ti.com>,
	Neha Malcom Francis <n-francis@ti.com>,
	Heinrich Schuchardt <xypron.glpk@gmx.de>,
	Roger Quadros <rogerq@kernel.org>, Simon Glass <sjg@chromium.org>,
	Andrew Davis <afd@ti.com>,
	Mattijs Korpershoek <mkorpershoek@baylibre.com>,
	Nikhil M Jain <n-jain1@ti.com>,
	Manorit Chawdhry <m-chawdhry@ti.com>, Bryan Brattlof <bb@ti.com>,
	Robert Nelson <robertcnelson@gmail.com>, <u-boot@lists.denx.de>,
	Jon Humphreys <j-humphreys@ti.com>, Nishanth Menon <nm@ti.com>
Subject: [PATCH V2 08/10] board: beagle: beagleboneai64: Set fdtfile from C code instead of findfdt script
Date: Tue, 9 Jan 2024 13:15:03 -0600	[thread overview]
Message-ID: <20240109191506.3820908-9-nm@ti.com> (raw)
In-Reply-To: <20240109191506.3820908-1-nm@ti.com>

Stop using the findfdt script and switch to setting the fdtfile from C
code.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
Changes from V1:
* Just macro name change s/TI_EVM_FDT_FOLDER_PATH/TI_FDT_FOLDER_PATH
* Commit message update to drop the "warning added to findfdt" since
  that is not done.

I have retained the explicit setting of fdtfile to remove dependency on
TI evm specific logic. Also, the dynamic population of fdtfile instead
of env_set("fdtfile", "ti/k3-j721e-beagleboneai64.dtb") to allow for the
upcoming board variants to be able to  configure the dtb name via a
config fragment.

V1: https://lore.kernel.org/r/20240108173301.2692332-9-nm@ti.com
 board/beagle/beagleboneai64/beagleboneai64.c   | 14 ++++++++++++++
 board/beagle/beagleboneai64/beagleboneai64.env |  1 -
 configs/j721e_beagleboneai64_a72_defconfig     |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/board/beagle/beagleboneai64/beagleboneai64.c b/board/beagle/beagleboneai64/beagleboneai64.c
index c8c1c78ae5a2..c5b4ff7df47a 100644
--- a/board/beagle/beagleboneai64/beagleboneai64.c
+++ b/board/beagle/beagleboneai64/beagleboneai64.c
@@ -28,3 +28,17 @@ int dram_init_banksize(void)
 {
 	return fdtdec_setup_memory_banksize();
 }
+
+#ifdef CONFIG_BOARD_LATE_INIT
+int board_late_init(void)
+{
+	char fdtfile[50];
+
+	snprintf(fdtfile, sizeof(fdtfile), "%s/%s.dtb",
+		 CONFIG_TI_FDT_FOLDER_PATH, CONFIG_DEFAULT_DEVICE_TREE);
+
+	env_set("fdtfile", fdtfile);
+
+	return 0;
+}
+#endif
diff --git a/board/beagle/beagleboneai64/beagleboneai64.env b/board/beagle/beagleboneai64/beagleboneai64.env
index 4f0a94a8113e..647b25d14c8e 100644
--- a/board/beagle/beagleboneai64/beagleboneai64.env
+++ b/board/beagle/beagleboneai64/beagleboneai64.env
@@ -1,5 +1,4 @@
 #include <env/ti/ti_common.env>
-#include <env/ti/default_findfdt.env>
 #include <env/ti/mmc.env>
 
 name_kern=Image
diff --git a/configs/j721e_beagleboneai64_a72_defconfig b/configs/j721e_beagleboneai64_a72_defconfig
index 959f86844d32..9e53658eacb9 100644
--- a/configs/j721e_beagleboneai64_a72_defconfig
+++ b/configs/j721e_beagleboneai64_a72_defconfig
@@ -34,7 +34,8 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_BOOTCOMMAND="run set_led_state_start_load;run findfdt; run envboot; bootflow scan -lb;run set_led_state_fail_load"
+CONFIG_BOOTCOMMAND="run set_led_state_start_load; run envboot; bootflow scan -lb;run set_led_state_fail_load"
+CONFIG_BOARD_LATE_INIT=y
 CONFIG_LOGLEVEL=7
 CONFIG_SPL_MAX_SIZE=0xc0000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
-- 
2.43.0


  parent reply	other threads:[~2024-01-09 19:19 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-09 19:14 [PATCH V2 00/10] board/ti: k3 boards: Stop using findfdt Nishanth Menon
2024-01-09 19:14 ` [PATCH V2 01/10] board: ti: common: Introduce a common fdt ops library Nishanth Menon
2024-01-12 21:13   ` Jon Humphreys
2024-01-09 19:14 ` [PATCH V2 02/10] board: ti: am62ax: Set fdtfile from C code instead of findfdt script Nishanth Menon
2024-01-12 21:13   ` Jon Humphreys
2024-01-09 19:14 ` [PATCH V2 03/10] board: ti: am62x: " Nishanth Menon
2024-01-12 21:14   ` Jon Humphreys
2024-01-09 19:14 ` [PATCH V2 04/10] board: ti: am64x: " Nishanth Menon
2024-01-12 21:14   ` Jon Humphreys
2024-01-09 19:15 ` [PATCH V2 05/10] board: ti: am65x: " Nishanth Menon
2024-01-12 21:14   ` Jon Humphreys
2024-01-09 19:15 ` [PATCH V2 06/10] board: ti: j721e: " Nishanth Menon
2024-01-12 21:14   ` Jon Humphreys
2024-01-09 19:15 ` [PATCH V2 07/10] board: ti: j721s2: " Nishanth Menon
2024-01-12 21:15   ` Jon Humphreys
2024-01-09 19:15 ` Nishanth Menon [this message]
2024-01-12 21:15   ` [PATCH V2 08/10] board: beagle: beagleboneai64: " Jon Humphreys
2024-01-09 19:15 ` [PATCH V2 09/10] board: beagle: beagleplay: " Nishanth Menon
2024-01-12 21:15   ` Jon Humphreys
2024-01-09 19:15 ` [PATCH V2 10/10] include: env: ti: Drop default_findfdt Nishanth Menon
2024-01-10 17:31   ` Roger Quadros
2024-01-10 18:34     ` Nishanth Menon
2024-01-12 21:15   ` Jon Humphreys
2024-01-11 10:17 ` [PATCH V2 00/10] board/ti: k3 boards: Stop using findfdt Roger Quadros
2024-01-20 16:36 ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240109191506.3820908-9-nm@ti.com \
    --to=nm@ti.com \
    --cc=afd@ti.com \
    --cc=bb@ti.com \
    --cc=j-humphreys@ti.com \
    --cc=kamlesh@ti.com \
    --cc=m-chawdhry@ti.com \
    --cc=mkorpershoek@baylibre.com \
    --cc=n-francis@ti.com \
    --cc=n-jain1@ti.com \
    --cc=robertcnelson@gmail.com \
    --cc=rogerq@kernel.org \
    --cc=sinthu.raja@ti.com \
    --cc=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    --cc=xypron.glpk@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox