AM625SIP: Falcon Boot on SDK 10

Hello Suran,

I was able to fix this issue on my own. 

My problem was the dtb was not being loaded.
I had to add to common/spl/spl_fit.c to manually load the dtb with this line.
+       spl_fit_append_fdt(spl_image, info, offset, &ctx);

This is probably because I have some wrong configuration somewhere.

With the below patches I now have a successful boot in falcon mode.

From 60e7c102e0604f639c00ac8028f91ec591831148 Mon Sep 17 00:00:00 2001
From: Josiah Morrow <josiah_morrow@innovationfirst.com>
Date: Tue, 29 Apr 2025 20:54:01 -0500
Subject: [PATCH] falcon mode 10.0 changes

---
 arch/arm/dts/k3-am625-sk-binman.dtsi | 16 +++---
 arch/arm/dts/k3-binman.dtsi          | 76 +++++++++++++++++++++++++++-
 common/spl/spl_fit.c                 |  1 +
 configs/am62x_evm_r5_defconfig       |  9 ++--
 include/configs/am62x_evm.h          |  4 ++
 include/configs/ti_armv7_common.h    | 24 ++++-----
 include/env/ti/k3_dfu.env            |  3 +-
 include/env/ti/k3_dfu.h              |  3 +-
 8 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/arch/arm/dts/k3-am625-sk-binman.dtsi b/arch/arm/dts/k3-am625-sk-binman.dtsi
index eddf0559..9510c25b 100644
--- a/arch/arm/dts/k3-am625-sk-binman.dtsi
+++ b/arch/arm/dts/k3-am625-sk-binman.dtsi
@@ -141,7 +141,7 @@

 #ifdef CONFIG_TARGET_AM625_A53_EVM

-#define SPL_AM625_SK_DTB "spl/dts/k3-am625-sk.dtb"
+#define SPL_AM625_SK_DTB "k3-am625-sk-new.dtb"
 #define AM625_SK_DTB "u-boot.dtb"

 &binman {
@@ -209,7 +209,7 @@
        };

        ti-spl {
-               insert-template = <&ti_spl_template>;
+               insert-template = <&ti_spl_kernel_template>;

                fit {
                        images {
@@ -264,16 +264,18 @@
                                };

                                fdt-0 {
-                                       description = "k3-am625-sk";
+                                       description = "k3-am625-sk-new";
                                        type = "flat_dt";
                                        arch = "arm";
                                        compression = "none";
+                                       load=<0x82000000>;
+                                       entry=<0x82000000>;
                                        ti-secure {
                                                content = <&spl_am625_sk_dtb>;
                                                keyfile = "custMpk.pem";
                                        };
                                        spl_am625_sk_dtb: blob-ext {
-                                               filename = SPL_AM625_SK_DTB;
+                                               filename = "k3-am625-sk-new.dtb";
                                        };

                                };
@@ -284,11 +286,11 @@
                                default = "conf-0";

                                conf-0 {
-                                       description = "k3-am625-sk";
+                                       description = "k3-am625-sk-new";
                                        firmware = "atf";
-                                       loadables = "tee", "tifsstub-hs", "tifsstub-fs",
-                                       "tifsstub-gp", "dm", "spl";
                                        fdt = "fdt-0";
+                                       loadables = "tee", "tifsstub-hs", "tifsstub-fs",
+                                       "tifsstub-gp", "dm", "kernel";
                                };
                        };
                };
diff --git a/arch/arm/dts/k3-binman.dtsi b/arch/arm/dts/k3-binman.dtsi
index 621653e9..7ba01c62 100644
--- a/arch/arm/dts/k3-binman.dtsi
+++ b/arch/arm/dts/k3-binman.dtsi
@@ -486,7 +486,81 @@
                start_address = <0x0 0x9e800000>;
                end_address = <0x0 0x9fffffff>;
        };
-
+
+        ti_spl_kernel_template: template-9 {
+                filename = "tispl.bin";
+                pad-byte = <0xff>;
+
+                fit {
+                        description = "Configuration to load ATF and SPL";
+                        #address-cells = <1>;
+
+                        images {
+
+                                atf {
+                                        description = "ARM Trusted Firmware";
+                                        type = "firmware";
+                                        arch = "arm64";
+                                        compression = "none";
+                                        os = "arm-trusted-firmware";
+                                        load = <CONFIG_K3_ATF_LOAD_ADDR>;
+                                        entry = <CONFIG_K3_ATF_LOAD_ADDR>;
+                                        ti-secure {
+                                                content = <&atf1>;
+                                                keyfile = "custMpk.pem";
+                                        };
+                                       atf1: atf-bl31 {
+                                                filename = "bl31.bin";
+                                        };
+                                };
+
+                                tee {
+                                        description = "OP-TEE";
+                                        type = "tee";
+                                        arch = "arm64";
+                                        compression = "none";
+                                        os = "tee";
+                                        load = <CONFIG_K3_OPTEE_LOAD_ADDR>;
+                                        entry = <CONFIG_K3_OPTEE_LOAD_ADDR>;
+                                        ti-secure {
+                                                content = <&tee1>;
+                                                keyfile = "custMpk.pem";
+                                        };
+                                        tee1: tee-os {
+                                        };
+                                };
+
+                                dm {
+                                        description = "DM binary";
+                                        type = "firmware";
+                                        arch = "arm32";
+                                        compression = "none";
+                                        os = "DM";
+                                        load = <0x89000000>;
+                                        entry = <0x89000000>;
+                                };
+
+                                kernel {
+                                        description = "Linux Kernel (64-bit)";
+                                       type = "kernel";
+                                        os = "linux";
+                                        arch = "arm64";
+                                        compression = "none";
+                                        load = <0x80080000>;
+                                        entry = <0x80080000>;
+                                        ti-secure {
+                                                content = <&kernel>;
+                                                keyfile = "custMpk.pem";
+
+                                        };
+                                        kernel: blob-ext {
+                                                filename = "Image";
+                                        };
+                                };
+
+                        };
+                };
+       };
 };

 #endif
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 872df0c0..57c77a2a 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -764,6 +764,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
        if (ret)
                return ret;

+       spl_fit_append_fdt(spl_image, info, offset, &ctx);
        /*
         * For backward compatibility, we treat the first node that is
         * as a U-Boot image, if no OS-type has been declared.
diff --git a/configs/am62x_evm_r5_defconfig b/configs/am62x_evm_r5_defconfig
index 222765d0..1463b170 100644
--- a/configs/am62x_evm_r5_defconfig
+++ b/configs/am62x_evm_r5_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_K3=y
+CONFIG_SYS_TEXT_BASE=0x83000000
 CONFIG_SYS_MALLOC_LEN=0x08000000
 CONFIG_SYS_MALLOC_F_LEN=0x9000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -20,7 +21,7 @@ CONFIG_DM_RESET=y
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
-CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_STACK_R_ADDR=0x89000000
 CONFIG_SPL_SYS_MALLOC_F_LEN=0x7000
 CONFIG_SPL_SIZE_LIMIT=0x3A7F0
 CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x3500
@@ -29,7 +30,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y
 CONFIG_SPL_SIZE_LIMIT_SUBTRACT_MALLOC=y
@@ -39,13 +40,13 @@ CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
 CONFIG_SPL_BSS_START_ADDR=0x43c3b000
 CONFIG_SPL_BSS_MAX_SIZE=0x3000
 CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_SYS_MALLOC_SIMPLE=n
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
 CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
+CONFIG_SPL_SYS_MALLOC_SIZE=0x2000000
 CONFIG_SPL_EARLY_BSS=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h
index 6ef79d1b..cde92a91 100644
--- a/include/configs/am62x_evm.h
+++ b/include/configs/am62x_evm.h
@@ -28,4 +28,8 @@
 #define CFG_SYS_NAND_ECCBYTES        14
 /*-- end NAND config --*/

+#ifdef CONFIG_SYS_K3_SPL_ATF
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "tispl.bin"
+#endif
+
 #endif /* __CONFIG_AM625_EVM_H */
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 3def7b10..7d43273a 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -32,18 +32,18 @@
  * storage, and can be re-used after 'fdt apply' command is done.
  */
 #define DEFAULT_LINUX_BOOT_ENV \
-       "loadaddr=0x82000000\0" \
-       "kernel_addr_r=0x82000000\0" \
-       "fdtaddr=0x88000000\0" \
-       "dtboaddr=0x89000000\0" \
-       "fdt_addr_r=0x88000000\0" \
-       "fdtoverlay_addr_r=0x89000000\0" \
-       "rdaddr=0x88080000\0" \
-       "ramdisk_addr_r=0x88080000\0" \
-       "scriptaddr=0x80000000\0" \
-       "pxefile_addr_r=0x80100000\0" \
-       "bootm_size=0x10000000\0" \
-       "boot_fdt=try\0"
+        "loadaddr=0x84000000\0" \
+        "kernel_addr_r=0x84000000\0" \
+        "fdtaddr=0x88000000\0" \
+        "dtboaddr=0x89000000\0" \
+        "fdt_addr_r=0x88000000\0" \
+        "fdtoverlay_addr_r=0x89000000\0" \
+        "rdaddr=0x88080000\0" \
+        "ramdisk_addr_r=0x88080000\0" \
+        "scriptaddr=0x80000000\0" \
+        "pxefile_addr_r=0x80100000\0" \
+        "bootm_size=0x10000000\0" \
+        "boot_fdt=try\0"

 #define DEFAULT_FIT_TI_ARGS \
        "boot_fit=0\0" \
diff --git a/include/env/ti/k3_dfu.env b/include/env/ti/k3_dfu.env
index 00548693..2930ff68 100644
--- a/include/env/ti/k3_dfu.env
+++ b/include/env/ti/k3_dfu.env
@@ -25,8 +25,7 @@ dfu_alt_info_ospi=
        rootfs raw 0x800000 0x3800000

 dfu_alt_info_ram=
-       tispl.bin ram 0x80080000 0x200000;
-       u-boot.img ram 0x81000000 0x400000
+       tispl.bin ram 0x84000000 0x4000000

 dfu_alt_info_ospi_nand=
        ospi_nand.tiboot3 part 1;
diff --git a/include/env/ti/k3_dfu.h b/include/env/ti/k3_dfu.h
index 098f5f5d..2073d849 100644
--- a/include/env/ti/k3_dfu.h
+++ b/include/env/ti/k3_dfu.h
@@ -40,7 +40,6 @@

 #define DFU_ALT_INFO_RAM \
        "dfu_alt_info_ram=" \
-       "tispl.bin ram 0x80080000 0x200000;" \
-       "u-boot.img ram 0x81000000 0x400000\0" \
+       "tispl.bin ram 0x84000000 0x4000000\0"

 #endif /* __TI_DFU_H */
--
2.34.1

diff --git a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
index 57fbcd689..509ad8880 100644
--- a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
@@ -29,6 +29,7 @@ chosen {
                ranges;

                stdout-path = "serial2:115200n8";
+               bootargs = "console=ttyS2,115200 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait";

                framebuffer0: framebuffer@0 {
                        compatible = "simple-framebuffer";
@@ -100,8 +101,8 @@ wkup_r5fss0_core0_memory_region: r5f-memory@9db00000 {
                        no-map;
                };

-               secure_tfa_ddr: tfa@9e780000 {
-                       reg = <0x00 0x9e780000 0x00 0x80000>;
+               secure_tfa_ddr: tfa@80000000 {
+                       reg = <0x00 0x80000000 0x00 0x80000>;
                        alignment = <0x1000>;
                        no-map;
                };