diff mbox series

[V2,08/12] board: ti: j721s2: Add board_init and support for selecting DT based on EEPROM

Message ID 20221221135219.24702-9-sinthu.raja@ti.com
State Superseded
Delegated to: Tom Rini
Headers show
Series AM68: Add support for AM68 Starter Kit | expand

Commit Message

Sinthu Raja Dec. 21, 2022, 1:52 p.m. UTC 
From: Sinthu Raja <sinthu.raja@ti.com>

Add the board_init_f API for SPL and run the platform-required SoC initialization.

Add the functionality for board name-based DTB selection from FIT within SPL. This
will make it easier to utilise one defconfig for both the EVM and the SK.

Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
---

Changes in V2:
=============
Address review comments:
- Move board_init and board detection API to board specific file.

 board/ti/j721s2/evm.c | 66 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

Comments

Tom Rini Dec. 23, 2022, 3 p.m. UTC | #1 
On Wed, Dec 21, 2022 at 07:22:15PM +0530, Sinthu Raja wrote:

> From: Sinthu Raja <sinthu.raja@ti.com>
> 
> Add the board_init_f API for SPL and run the platform-required SoC initialization.
> 
> Add the functionality for board name-based DTB selection from FIT within SPL. This
> will make it easier to utilise one defconfig for both the EVM and the SK.
> 
> Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
[snip]
> +#ifdef CONFIG_SPL_OF_LIST
> +void do_dt_magic(void)
> +{
> +        int ret, rescan, mmc_dev = -1;
> +        static struct mmc *mmc;
> +
> +        if (IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT))
> +                do_board_detect();

I think we should rework this slightly for clarity about mini-U-Boot vs
EVM and family support to be:

/* Support for the various EVM / SK families */
#if defined(CONFIG_SPL_OF_LIST) && defined(CONFIG_TI_I2C_BOARD_DETECT)
void do_dt_magic(void)
{
...

Instead. Or does that not work because of how we handle the R5 support
here? If we so, then please just add the comment.
diff mbox series

Patch

diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c
index 7e448bd51c..7f0ad38b91 100644
--- a/board/ti/j721s2/evm.c
+++ b/board/ti/j721s2/evm.c
@@ -23,6 +23,7 @@ 
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
 #include <dm/uclass-internal.h>
+#include <dm/root.h>
 
 #include "../common/board_detect.h"
 
@@ -202,3 +203,68 @@  int board_late_init(void)
 void spl_board_init(void)
 {
 }
+
+#ifdef CONFIG_SPL_OF_LIST
+void do_dt_magic(void)
+{
+        int ret, rescan, mmc_dev = -1;
+        static struct mmc *mmc;
+
+        if (IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT))
+                do_board_detect();
+
+        /*
+         * Board detection has been done.
+         * Let us see if another dtb wouldn't be a better match
+         * for our board
+         */
+        if (IS_ENABLED(CONFIG_CPU_V7R)) {
+                ret = fdtdec_resetup(&rescan);
+                if (!ret && rescan) {
+                        dm_uninit();
+                        dm_init_and_scan(true);
+                }
+        }
+
+        /*
+         * Because of multi DTB configuration, the MMC device has
+         * to be re-initialized after reconfiguring FDT inorder to
+         * boot from MMC. Do this when boot mode is MMC and ROM has
+         * not loaded SYSFW.
+         */
+        switch (spl_boot_device()) {
+        case BOOT_DEVICE_MMC1:
+                mmc_dev = 0;
+                break;
+        case BOOT_DEVICE_MMC2:
+        case BOOT_DEVICE_MMC2_2:
+                mmc_dev = 1;
+                break;
+        }
+
+        if (mmc_dev > 0 && !check_rom_loaded_sysfw()) {
+                ret = mmc_init_device(mmc_dev);
+                if (!ret) {
+                        mmc = find_mmc_device(mmc_dev);
+                        if (mmc) {
+                                ret = mmc_init(mmc);
+                                if (ret) {
+                                        printf("mmc init failed with error: %d\n", ret);
+                                }
+                        }
+                }
+        }
+}
+#endif
+
+#ifdef CONFIG_SPL_BUILD
+void board_init_f(ulong dummy)
+{
+	k3_spl_init();
+#ifdef CONFIG_SPL_OF_LIST
+	do_dt_magic();
+#endif
+	k3_mem_init();
+
+}
+#endif