diff --git a/sbl_component.mk b/sbl_component.mk
--- a/sbl_component.mk
+++ b/sbl_component.mk
#
ifeq ($(sbl_component_make_include), )
-sbl_BOARDLIST = am65xx_evm am65xx_idk
+sbl_BOARDLIST = am65xx_evm am65xx_idk j721e_evm
-sbl_SOCLIST = am65xx
+sbl_SOCLIST = am65xx j721e
-sbl_am65xx_CORELIST = mcu1_0 mcu1_1 mpu1_0 mpu1_1 mpu2_0 mpu2_1
+am65xx_smp_CORELIST := mcu1_0 mpu1_0 mpu2_0
+sbl_am65xx_CORELIST := mcu1_0 mcu1_1 mpu1_0 mpu1_1 mpu2_0 mpu2_1
+am65xx_LASTCORE := $(word $(words $(sbl_am65xx_CORELIST)), $(sbl_am65xx_CORELIST))
-############################
-# Only MMCSD supported for IDK
-# Oveerride even if user inadvertently
-# tries to build it.
-############################
-ifeq ($(BOARD), am65xx_idk)
- override BOOTMODE = mmcsd
-endif # ifeq ($(BOARD), am65xx_idk)
+j721e_smp_CORELIST := mcu1_0 mcu2_0 mcu3_0 mpu1_0
+sbl_j721e_CORELIST := mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 mpu1_0 mpu1_1
+j721e_LASTCORE := $(word $(words $(sbl_j721e_CORELIST)), $(sbl_j721e_CORELIST))
+sbl_DISABLE_PARALLEL_MAKE = yes
############################
# sbl package
# List of components included under sbl
# The components included here are built and will be part of sbl
############################
-sbl_LIB_LIST = sbl_lib_$(BOOTMODE)
+sbl_LIB_LIST = sbl_lib_mmcsd sbl_lib_ospi sbl_lib_uart sbl_lib_hyperflash sbl_lib_cust
############################
# sbl example
# SBL Modules
#
-# SBL LIB
-sbl_lib_$(BOOTMODE)_COMP_LIST = sbl_lib_$(BOOTMODE)
-sbl_lib_$(BOOTMODE)_RELPATH = ti/boot/sbl
-sbl_lib_$(BOOTMODE)_PATH = $(PDK_SBL_COMP_PATH)
-sbl_lib_$(BOOTMODE)_LIBNAME = sbl_lib_$(BOOTMODE)
-sbl_lib_$(BOOTMODE)_OBJPATH = $(PDK_SBL_COMP_PATH)/obj/$(BOOTMODE)
-sbl_lib_$(BOOTMODE)_LIBPATH = $(PDK_SBL_COMP_PATH)/lib/$(BOOTMODE)
-sbl_lib_$(BOOTMODE)_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_lib.mk
-export sbl_lib_$(BOOTMODE)_MAKEFILE
-export sbl_lib_$(BOOTMODE)_LIBNAME
-export sbl_lib_$(BOOTMODE)_LIBPATH
-sbl_lib_$(BOOTMODE)_BOARD_DEPENDENCY = yes
-sbl_lib_$(BOOTMODE)_SOC_DEPENDENCY = yes
-sbl_lib_$(BOOTMODE)_CORE_DEPENDENCY = yes
-export sbl_lib_$(BOOTMODE)_COMP_LIST
-export sbl_lib_$(BOOTMODE)_BOARD_DEPENDENCY
-export sbl_lib_$(BOOTMODE)_CORE_DEPENDENCY
-sbl_lib_$(BOOTMODE)_PKG_LIST = sbl_lib_$(BOOTMODE)
-sbl_lib_$(BOOTMODE)_INCLUDE = $(sbl_lib_$(BOOTMODE)_PATH)
-sbl_lib_$(BOOTMODE)_SOCLIST = $(sbl_SOCLIST)
-sbl_lib_$(BOOTMODE)_BOARDLIST = $(sbl_BOARDLIST)
-export sbl_lib_$(BOOTMODE)_SOCLIST
-export sbl_lib_$(BOOTMODE)_BOARDLIST
-sbl_lib_$(BOOTMODE)_$(SOC)_CORELIST = mcu1_0
-export sbl_lib_$(BOOTMODE)_$(SOC)_CORELIST
+# SBL MMCSD LIB
+sbl_lib_mmcsd_COMP_LIST = sbl_lib_mmcsd
+sbl_lib_mmcsd_RELPATH = ti/boot/sbl
+export sbl_lib_mmcsd_OBJPATH = ti/boot/sbl/mmcsd
+sbl_lib_mmcsd_PATH = $(PDK_SBL_COMP_PATH)
+sbl_lib_mmcsd_LIBNAME = sbl_lib_mmcsd
+sbl_lib_mmcsd_LIBPATH = $(PDK_SBL_COMP_PATH)/lib/mmcsd
+sbl_lib_mmcsd_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_lib.mk BOOTMODE=mmcsd
+export sbl_lib_mmcsd_MAKEFILE
+export sbl_lib_mmcsd_LIBNAME
+export sbl_lib_mmcsd_LIBPATH
+sbl_lib_mmcsd_BOARD_DEPENDENCY = yes
+sbl_lib_mmcsd_SOC_DEPENDENCY = yes
+sbl_lib_mmcsd_CORE_DEPENDENCY = no
+export sbl_lib_mmcsd_COMP_LIST
+export sbl_lib_mmcsd_BOARD_DEPENDENCY
+export sbl_lib_mmcsd_CORE_DEPENDENCY
+sbl_lib_mmcsd_PKG_LIST = sbl_lib_mmcsd
+sbl_lib_mmcsd_INCLUDE = $(sbl_lib_mmcsd_PATH)
+sbl_lib_mmcsd_SOCLIST = $(sbl_SOCLIST)
+sbl_lib_mmcsd_BOARDLIST = $(sbl_BOARDLIST)
+export sbl_lib_mmcsd_SOCLIST
+export sbl_lib_mmcsd_BOARDLIST
+sbl_lib_mmcsd_$(SOC)_CORELIST = mcu1_0
+export sbl_lib_mmcsd_$(SOC)_CORELIST
+
+# SBL OSPI LIB
+sbl_lib_ospi_COMP_LIST = sbl_lib_ospi
+sbl_lib_ospi_RELPATH = ti/boot/sbl/ospi
+export sbl_lib_ospi_OBJPATH = ti/boot/sbl/ospi
+sbl_lib_ospi_PATH = $(PDK_SBL_COMP_PATH)
+sbl_lib_ospi_LIBNAME = sbl_lib_ospi
+sbl_lib_ospi_LIBPATH = $(PDK_SBL_COMP_PATH)/lib/ospi
+sbl_lib_ospi_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_lib.mk BOOTMODE=ospi
+export sbl_lib_ospi_MAKEFILE
+export sbl_lib_ospi_LIBNAME
+export sbl_lib_ospi_LIBPATH
+sbl_lib_ospi_BOARD_DEPENDENCY = yes
+sbl_lib_ospi_SOC_DEPENDENCY = yes
+sbl_lib_ospi_CORE_DEPENDENCY = no
+export sbl_lib_ospi_COMP_LIST
+export sbl_lib_ospi_BOARD_DEPENDENCY
+export sbl_lib_ospi_CORE_DEPENDENCY
+sbl_lib_ospi_PKG_LIST = sbl_lib_ospi
+sbl_lib_ospi_INCLUDE = $(sbl_lib_ospi_PATH)
+sbl_lib_ospi_SOCLIST = $(sbl_SOCLIST)
+sbl_lib_ospi_BOARDLIST = $(sbl_BOARDLIST)
+export sbl_lib_ospi_SOCLIST
+export sbl_lib_ospi_BOARDLIST
+sbl_lib_ospi_$(SOC)_CORELIST = mcu1_0
+export sbl_lib_ospi_$(SOC)_CORELIST
+
+# SBL HYPERFLASH LIB
+sbl_lib_hyperflash_COMP_LIST = sbl_lib_hyperflash
+sbl_lib_hyperflash_RELPATH = ti/boot/sbl/hyperflash
+export sbl_lib_hyperflash_OBJPATH = ti/boot/sbl/hyperflash
+sbl_lib_hyperflash_PATH = $(PDK_SBL_COMP_PATH)
+sbl_lib_hyperflash_LIBNAME = sbl_lib_hyperflash
+sbl_lib_hyperflash_LIBPATH = $(PDK_SBL_COMP_PATH)/lib/hyperflash
+sbl_lib_hyperflash_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_lib.mk BOOTMODE=hyperflash
+export sbl_lib_hyperflash_MAKEFILE
+export sbl_lib_hyperflash_LIBNAME
+export sbl_lib_hyperflash_LIBPATH
+sbl_lib_hyperflash_BOARD_DEPENDENCY = yes
+sbl_lib_hyperflash_SOC_DEPENDENCY = yes
+sbl_lib_hyperflash_CORE_DEPENDENCY = no
+export sbl_lib_hyperflash_COMP_LIST
+export sbl_lib_hyperflash_BOARD_DEPENDENCY
+export sbl_lib_hyperflash_CORE_DEPENDENCY
+sbl_lib_hyperflash_PKG_LIST = sbl_lib_hyperflash
+sbl_lib_hyperflash_INCLUDE = $(sbl_lib_hyperflash_PATH)
+sbl_lib_hyperflash_SOCLIST = j721e
+sbl_lib_hyperflash_BOARDLIST = j721e_evm
+export sbl_lib_hyperflash_SOCLIST
+export sbl_lib_hyperflash_BOARDLIST
+sbl_lib_hyperflash_$(SOC)_CORELIST = mcu1_0
+export sbl_lib_hyperflash_$(SOC)_CORELIST
+
+# SBL UART LIB
+sbl_lib_uart_COMP_LIST = sbl_lib_uart
+sbl_lib_uart_RELPATH = ti/boot/sbl
+export sbl_lib_uart_OBJPATH = ti/boot/sbl/uart
+sbl_lib_uart_PATH = $(PDK_SBL_COMP_PATH)
+sbl_lib_uart_LIBNAME = sbl_lib_uart
+sbl_lib_uart_LIBPATH = $(PDK_SBL_COMP_PATH)/lib/uart
+sbl_lib_uart_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_lib.mk BOOTMODE=uart
+export sbl_lib_uart_MAKEFILE
+export sbl_lib_uart_LIBNAME
+export sbl_lib_uart_LIBPATH
+sbl_lib_uart_BOARD_DEPENDENCY = yes
+sbl_lib_uart_SOC_DEPENDENCY = yes
+sbl_lib_uart_CORE_DEPENDENCY = no
+export sbl_lib_uart_COMP_LIST
+export sbl_lib_uart_BOARD_DEPENDENCY
+export sbl_lib_uart_CORE_DEPENDENCY
+sbl_lib_uart_PKG_LIST = sbl_lib_uart
+sbl_lib_uart_INCLUDE = $(sbl_lib_uart_PATH)
+sbl_lib_uart_SOCLIST = $(sbl_SOCLIST)
+sbl_lib_uart_BOARDLIST = $(sbl_BOARDLIST)
+export sbl_lib_uart_SOCLIST
+export sbl_lib_uart_BOARDLIST
+sbl_lib_uart_$(SOC)_CORELIST = mcu1_0
+export sbl_lib_uart_$(SOC)_CORELIST
#
# SBL Examples
#
-# SBL Image
-sbl_$(BOOTMODE)_img_COMP_LIST = sbl_$(BOOTMODE)_img
-sbl_$(BOOTMODE)_img_RELPATH = ti/boot/sbl/board/$(SOC)
-sbl_$(BOOTMODE)_img_OBJPATH = $(PDK_SBL_COMP_PATH)/obj/$(BOOTMODE)
-sbl_$(BOOTMODE)_img_BINPATH = $(PDK_SBL_COMP_PATH)/binary/$(BOOTMODE)
-sbl_$(BOOTMODE)_img_PATH = $(PDK_SBL_COMP_PATH)/board/$(BOARD)
-sbl_$(BOOTMODE)_img_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_img.mk
-export sbl_$(BOOTMODE)_img_MAKEFILE
-sbl_$(BOOTMODE)_img_BOARD_DEPENDENCY = yes
-sbl_$(BOOTMODE)_img_CORE_DEPENDENCY = no
-export sbl_$(BOOTMODE)_img_COMP_LIST
-export sbl_$(BOOTMODE)_img_BOARD_DEPENDENCY
-export sbl_$(BOOTMODE)_img_CORE_DEPENDENCY
-sbl_$(BOOTMODE)_img_PKG_LIST = sbl
-sbl_$(BOOTMODE)_img_INCLUDE = $(sbl_$(BOOTMODE)_img_PATH)
-sbl_$(BOOTMODE)_img_BOARDLIST = $(sbl_BOARDLIST)
-export sbl_$(BOOTMODE)_img_BOARDLIST
-sbl_$(BOOTMODE)_img_$(SOC)_CORELIST = mcu1_0
-export sbl_$(BOOTMODE)_img_$(SOC)_CORELIST
-sbl_EXAMPLE_LIST += sbl_$(BOOTMODE)_img
-sbl_$(BOOTMODE)_img_SBL_IMAGEGEN = yes
-export sbl_$(BOOTMODE)_img_SBL_IMAGEGEN
+# SBL MMCSD Image
+sbl_mmcsd_img_COMP_LIST = sbl_mmcsd_img
+sbl_mmcsd_img_RELPATH = ti/boot/sbl/board/k3
+sbl_mmcsd_img_CUSTOM_BINPATH = $(PDK_SBL_COMP_PATH)/binary/$(BOARD)/mmcsd/bin
+sbl_mmcsd_img_PATH = $(PDK_SBL_COMP_PATH)/board/k3
+sbl_mmcsd_img_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_img.mk BOOTMODE=mmcsd
+export sbl_mmcsd_img_MAKEFILE
+sbl_mmcsd_img_BOARD_DEPENDENCY = yes
+sbl_mmcsd_img_SOC_DEPENDENCY = yes
+sbl_mmcsd_img_CORE_DEPENDENCY = no
+export sbl_mmcsd_img_COMP_LIST
+export sbl_mmcsd_img_BOARD_DEPENDENCY
+export sbl_mmcsd_img_SOC_DEPENDENCY
+export sbl_mmcsd_img_CORE_DEPENDENCY
+sbl_mmcsd_img_PKG_LIST = sbl
+sbl_mmcsd_img_INCLUDE = $(sbl_mmcsd_img_PATH)
+sbl_mmcsd_img_BOARDLIST = $(sbl_BOARDLIST)
+export sbl_mmcsd_img_BOARDLIST
+sbl_mmcsd_img_$(SOC)_CORELIST = mcu1_0
+export sbl_mmcsd_img_$(SOC)_CORELIST
+sbl_EXAMPLE_LIST += sbl_mmcsd_img
+sbl_mmcsd_img_SBL_IMAGEGEN = yes
+export sbl_mmcsd_img_SBL_IMAGEGEN
+
+# SBL OSPI Image
+sbl_ospi_img_COMP_LIST = sbl_ospi_img
+sbl_ospi_img_RELPATH = ti/boot/sbl/board/k3
+sbl_ospi_img_CUSTOM_BINPATH = $(PDK_SBL_COMP_PATH)/binary/$(BOARD)/ospi/bin
+sbl_ospi_img_PATH = $(PDK_SBL_COMP_PATH)/board/k3
+sbl_ospi_img_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_img.mk BOOTMODE=ospi
+export sbl_ospi_img_MAKEFILE
+sbl_ospi_img_BOARD_DEPENDENCY = yes
+sbl_ospi_img_SOC_DEPENDENCY = yes
+sbl_ospi_img_CORE_DEPENDENCY = no
+export sbl_ospi_img_COMP_LIST
+export sbl_ospi_img_BOARD_DEPENDENCY
+export sbl_ospi_img_SOC_DEPENDENCY
+export sbl_ospi_img_CORE_DEPENDENCY
+sbl_ospi_img_PKG_LIST = sbl
+sbl_ospi_img_INCLUDE = $(sbl_ospi_img_PATH)
+sbl_ospi_img_BOARDLIST = $(sbl_BOARDLIST)
+export sbl_ospi_img_BOARDLIST
+sbl_ospi_img_$(SOC)_CORELIST = mcu1_0
+export sbl_ospi_img_$(SOC)_CORELIST
+sbl_EXAMPLE_LIST += sbl_ospi_img
+sbl_ospi_img_SBL_IMAGEGEN = yes
+export sbl_ospi_img_SBL_IMAGEGEN
+
+# SBL HYPERFLASH Image
+sbl_hyperflash_img_COMP_LIST = sbl_hyperflash_img
+sbl_hyperflash_img_RELPATH = ti/boot/sbl/board/k3
+sbl_hyperflash_img_CUSTOM_BINPATH = $(PDK_SBL_COMP_PATH)/binary/$(BOARD)/hyperflash/bin
+sbl_hyperflash_img_PATH = $(PDK_SBL_COMP_PATH)/board/k3
+sbl_hyperflash_img_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_img.mk BOOTMODE=hyperflash
+export sbl_hyperflash_img_MAKEFILE
+sbl_hyperflash_img_BOARD_DEPENDENCY = yes
+bl_hyperflash_img_SOC_DEPENDENCY = yes
+sbl_hyperflash_img_CORE_DEPENDENCY = no
+export sbl_hyperflash_img_COMP_LIST
+export sbl_hyperflash_img_BOARD_DEPENDENCY
+export sbl_hyperflash_img_SOC_DEPENDENCY
+export sbl_hyperflash_img_CORE_DEPENDENCY
+sbl_hyperflash_img_PKG_LIST = sbl
+sbl_hyperflash_img_INCLUDE = $(sbl_hyperflash_img_PATH)
+sbl_hyperflash_img_BOARDLIST = j721e_evm
+export sbl_hyperflash_img_BOARDLIST
+sbl_hyperflash_img_$(SOC)_CORELIST = mcu1_0
+export sbl_hyperflash_img_$(SOC)_CORELIST
+sbl_EXAMPLE_LIST += sbl_hyperflash_img
+sbl_hyperflash_img_SBL_IMAGEGEN = yes
+export sbl_hyperflash_img_SBL_IMAGEGEN
+
+# SBL UART Image
+sbl_uart_img_COMP_LIST = sbl_uart_img
+sbl_uart_img_RELPATH = ti/boot/sbl/board/k3
+sbl_uart_img_CUSTOM_BINPATH = $(PDK_SBL_COMP_PATH)/binary/$(BOARD)/uart/bin
+sbl_uart_img_PATH = $(PDK_SBL_COMP_PATH)/board/k3
+sbl_uart_img_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_img.mk BOOTMODE=uart
+export sbl_uart_img_MAKEFILE
+sbl_uart_img_BOARD_DEPENDENCY = yes
+sbl_uart_img_SOC_DEPENDENCY = yes
+sbl_uart_img_CORE_DEPENDENCY = no
+export sbl_uart_img_COMP_LIST
+export sbl_uart_img_BOARD_DEPENDENCY
+export sbl_uart_img_SOC_DEPENDENCY
+export sbl_uart_img_CORE_DEPENDENCY
+sbl_uart_img_PKG_LIST = sbl
+sbl_uart_img_INCLUDE = $(sbl_uart_img_PATH)
+sbl_uart_img_BOARDLIST = $(sbl_BOARDLIST)
+export sbl_uart_img_BOARDLIST
+sbl_uart_img_$(SOC)_CORELIST = mcu1_0
+export sbl_uart_img_$(SOC)_CORELIST
+sbl_EXAMPLE_LIST += sbl_uart_img
+sbl_uart_img_SBL_IMAGEGEN = yes
+export sbl_uart_img_SBL_IMAGEGEN
# Individual Core Boot Test
sbl_boot_test_COMP_LIST = sbl_boot_test
-sbl_boot_test_RELPATH = ti/boot/sbl/example/ampMulticoreApp
-sbl_boot_test_OBJPATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp/obj
-sbl_boot_test_BINPATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp/binary
-sbl_boot_test_PATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp
+sbl_boot_test_RELPATH = ti/boot/sbl/example/k3MulticoreApp
+sbl_boot_test_BINPATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp/binary
+sbl_boot_test_PATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp
sbl_boot_test_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_boot_test.mk
export sbl_boot_test_MAKEFILE
-sbl_boot_test_BOARD_DEPENDENCY = yes
+sbl_boot_test_BOARD_DEPENDENCY = no
+sbl_boot_test_SOC_DEPENDENCY = no
sbl_boot_test_CORE_DEPENDENCY = no
export sbl_boot_test_COMP_LIST
export sbl_boot_test_BOARD_DEPENDENCY
+export sbl_boot_test_SOC_DEPENDENCY
export sbl_boot_test_CORE_DEPENDENCY
sbl_boot_test_PKG_LIST = sbl_boot_test
sbl_boot_test_INCLUDE = $(sbl_boot_test_PATH)
-sbl_boot_test_BOARDLIST = am65xx_evm am65xx_idk
+sbl_boot_test_BOARDLIST = $(sbl_BOARDLIST)
export sbl_boot_test_BOARDLIST
sbl_boot_test_$(SOC)_CORELIST = $(sbl_$(SOC)_CORELIST)
export sbl_boot_test_$(SOC)_CORELIST
# Multicore AMP Boot Test
sbl_multicore_amp_COMP_LIST = sbl_multicore_amp
-sbl_multicore_amp_RELPATH = ti/boot/sbl/example/ampMulticoreApp
-sbl_multicore_amp_OBJPATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp/obj
-sbl_multicore_amp_BINPATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp/binary
-sbl_multicore_amp_PATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp
+sbl_multicore_amp_RELPATH = ti/boot/sbl/example/k3MulticoreApp
+sbl_multicore_amp_BINPATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp/binary
+sbl_multicore_amp_PATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp
sbl_multicore_amp_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_multicore_amp.mk
export sbl_multicore_amp_MAKEFILE
-sbl_multicore_amp_BOARD_DEPENDENCY = yes
+sbl_multicore_amp_BOARD_DEPENDENCY = no
+sbl_multicore_amp_SOC_DEPENDENCY = no
sbl_multicore_amp_CORE_DEPENDENCY = no
export sbl_multicore_amp_COMP_LIST
export sbl_multicore_amp_BOARD_DEPENDENCY
+export sbl_multicore_amp_SOC_DEPENDENCY
export sbl_multicore_amp_CORE_DEPENDENCY
sbl_multicore_amp_PKG_LIST = sbl_multicore_amp
sbl_multicore_amp_INCLUDE = $(sbl_multicore_amp_PATH)
-sbl_multicore_amp_BOARDLIST = am65xx_evm am65xx_idk
+sbl_multicore_amp_BOARDLIST = $(sbl_BOARDLIST)
export sbl_multicore_amp_BOARDLIST
-sbl_multicore_amp_$(SOC)_CORELIST := $(word $(words $(sbl_am65xx_CORELIST)), $(sbl_am65xx_CORELIST))
+sbl_multicore_amp_$(SOC)_CORELIST = $($(SOC)_LASTCORE)
export sbl_multicore_amp_$(SOC)_CORELIST
sbl_EXAMPLE_LIST += sbl_multicore_amp
sbl_multicore_amp_SBL_APPIMAGEGEN = no
# R5 Lockstep and MPU SMP Boot Test
sbl_smp_test_COMP_LIST = sbl_smp_test
-sbl_smp_test_RELPATH = ti/boot/sbl/example/ampMulticoreApp
-sbl_smp_test_OBJPATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp/obj
-sbl_smp_test_BINPATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp/binary
-sbl_smp_test_PATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp
-sbl_smp_test_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_smp_test.mk
+sbl_smp_test_RELPATH = ti/boot/sbl/example/k3MulticoreApp
+sbl_smp_test_BINPATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp/binary
+sbl_smp_test_PATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp
+sbl_smp_test_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_smp_test.mk BOOTMODE=mmcsd
export sbl_smp_test_MAKEFILE
-sbl_smp_test_BOARD_DEPENDENCY = yes
+sbl_smp_test_BOARD_DEPENDENCY = no
+sbl_smp_test_SOC_DEPENDENCY = no
sbl_smp_test_CORE_DEPENDENCY = no
export sbl_smp_test_COMP_LIST
export sbl_smp_test_BOARD_DEPENDENCY
+export sbl_smp_test_SOC_DEPENDENCY
export sbl_smp_test_CORE_DEPENDENCY
sbl_smp_test_PKG_LIST = sbl_smp_test
sbl_smp_test_INCLUDE = $(sbl_smp_test_PATH)
-sbl_smp_test_BOARDLIST = am65xx_evm am65xx_idk
+sbl_smp_test_BOARDLIST = $(sbl_BOARDLIST)
export sbl_smp_test_BOARDLIST
-sbl_smp_test_$(SOC)_CORELIST = mcu1_0 mpu1_0
+sbl_smp_test_$(SOC)_CORELIST = $($(SOC)_smp_CORELIST)
export sbl_smp_test_$(SOC)_CORELIST
sbl_EXAMPLE_LIST += sbl_smp_test
sbl_smp_test_SBL_APPIMAGEGEN = yes
# Multicore SMP Boot Test
sbl_multicore_smp_COMP_LIST = sbl_multicore_smp
-sbl_multicore_smp_RELPATH = ti/boot/sbl/example/ampMulticoreApp
-sbl_multicore_smp_OBJPATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp/obj
-sbl_multicore_smp_BINPATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp/binary
-sbl_multicore_smp_PATH = $(PDK_SBL_COMP_PATH)/example/ampMulticoreApp
+sbl_multicore_smp_RELPATH = ti/boot/sbl/example/k3MulticoreApp
+sbl_multicore_smp_BINPATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp/binary
+sbl_multicore_smp_PATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp
sbl_multicore_smp_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_multicore_smp.mk
export sbl_multicore_smp_MAKEFILE
-sbl_multicore_smp_BOARD_DEPENDENCY = yes
+sbl_multicore_smp_BOARD_DEPENDENCY = no
+sbl_multicore_smp_SOC_DEPENDENCY = no
sbl_multicore_smp_CORE_DEPENDENCY = no
export sbl_multicore_smp_COMP_LIST
export sbl_multicore_smp_BOARD_DEPENDENCY
+export sbl_multicore_smp_SOC_DEPENDENCY
export sbl_multicore_smp_CORE_DEPENDENCY
sbl_multicore_smp_PKG_LIST = sbl_multicore_smp
sbl_multicore_smp_INCLUDE = $(sbl_multicore_smp_PATH)
-sbl_multicore_smp_BOARDLIST = am65xx_evm am65xx_idk
+sbl_multicore_smp_BOARDLIST = $(sbl_BOARDLIST)
export sbl_multicore_smp_BOARDLIST
-sbl_multicore_smp_$(SOC)_CORELIST := $(word $(words $(sbl_am65xx_CORELIST)), $(sbl_am65xx_CORELIST))
+sbl_multicore_smp_$(SOC)_CORELIST := $($(SOC)_LASTCORE)
export sbl_multicore_smp_$(SOC)_CORELIST
sbl_EXAMPLE_LIST += sbl_multicore_smp
sbl_multicore_smp_SBL_APPIMAGEGEN = no
export sbl_multicore_smp_SBL_APPIMAGEGEN
-PDK_CFLAGS += -DOSAL_NONOS_CONFIGNUM_SEMAPHORE=16
+# R5 boot XIP Test
+sbl_boot_xip_test_COMP_LIST = sbl_boot_xip_test
+sbl_boot_xip_test_RELPATH = ti/boot/sbl/example/k3MulticoreApp
+sbl_boot_xip_test_BINPATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp/binary
+sbl_boot_xip_test_PATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp
+sbl_boot_xip_test_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_mcu0_boot_xip_test.mk
+export sbl_boot_xip_test_MAKEFILE
+sbl_boot_xip_test_BOARD_DEPENDENCY = no
+sbl_boot_xip_test_SOC_DEPENDENCY = no
+sbl_boot_xip_test_CORE_DEPENDENCY = no
+export sbl_boot_xip_test_COMP_LIST
+export sbl_boot_xip_test_BOARD_DEPENDENCY
+export sbl_boot_xip_test_SOC_DEPENDENCY
+export sbl_boot_xip_test_CORE_DEPENDENCY
+sbl_boot_xip_test_PKG_LIST = sbl_boot_xip_test
+sbl_boot_xip_test_INCLUDE = $(sbl_boot_xip_test_PATH)
+sbl_boot_xip_test_BOARDLIST = $(sbl_BOARDLIST)
+export sbl_boot_xip_test_BOARDLIST
+sbl_boot_xip_test_$(SOC)_CORELIST = mcu1_0
+export sbl_boot_xip_test_$(SOC)_CORELIST
+sbl_EXAMPLE_LIST += sbl_boot_xip_test
+sbl_boot_xip_test_SBL_APPIMAGEGEN = yes
+sbl_boot_xip_test_SBL_APP_BINIMAGEGEN = yes
+sbl_boot_xip_test_SBL_APP_BIN_SECTIONS = --only-section .rstvectors --only-section .sbl_mcu_1_0_resetvector
+export sbl_boot_xip_test_SBL_APPIMAGEGEN
+export sbl_boot_xip_test_SBL_APP_BINIMAGEGEN
+export sbl_boot_xip_test_SBL_APP_BIN_SECTIONS
+
+# R5 boot XIP entry
+sbl_boot_xip_entry_COMP_LIST = sbl_boot_xip_entry
+sbl_boot_xip_entry_RELPATH = ti/boot/sbl/example/k3MulticoreApp
+sbl_boot_xip_entry_BINPATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp/binary
+sbl_boot_xip_entry_PATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp
+sbl_boot_xip_entry_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_mcu0_boot_xip_entry.mk
+export sbl_boot_xip_entry_MAKEFILE
+sbl_boot_xip_entry_BOARD_DEPENDENCY = no
+sbl_boot_xip_entry_SOC_DEPENDENCY = no
+sbl_boot_xip_entry_CORE_DEPENDENCY = no
+export sbl_boot_xip_entry_COMP_LIST
+export sbl_boot_xip_entry_BOARD_DEPENDENCY
+export sbl_boot_xip_entry_SOC_DEPENDENCY
+export sbl_boot_xip_entry_CORE_DEPENDENCY
+sbl_boot_xip_entry_PKG_LIST = sbl_boot_xip_entry
+sbl_boot_xip_entry_INCLUDE = $(sbl_boot_xip_entry_PATH)
+sbl_boot_xip_entry_BOARDLIST = $(sbl_BOARDLIST)
+export sbl_boot_xip_entry_BOARDLIST
+sbl_boot_xip_entry_$(SOC)_CORELIST = mcu1_0
+export sbl_boot_xip_entry_$(SOC)_CORELIST
+sbl_EXAMPLE_LIST += sbl_boot_xip_entry
+sbl_boot_xip_entry_SBL_APPIMAGEGEN = yes
+export sbl_boot_xip_entry_SBL_APPIMAGEGEN
+
+# Display profiling info before MCU1_0 boot
+# increases delay time, between end of SBL
+# and start of app, but useful for
+# debugging and tuning performace knobs
+#SBL_CFLAGS += -DSBL_DISPLAY_PROFILE_INFO
+# 0 - use cpu for reads (slower, no $ coherency ops needed), smaller SBL
+# 1 - use dma for data reads (faster, $ coherency ops needed), larger SBL
+SBL_CFLAGS += -DSBL_USE_DMA=1
+
+###### Use boot_perf_benchmark example#######
+###### to fine tune the perf knobs #########
+
+###########START BOOT PERF KNOBS#############
# SBL log level
# no logs = 0, only errors =1, normal logs = 2, all logs = 3
-SBL_CFLAGS = -DSBL_LOG_LEVEL=2
+SBL_CFLAGS += -DSBL_LOG_LEVEL=2
+
+SBL_CFLAGS += -DSBL_ENABLE_PLL
+SBL_CFLAGS += -DSBL_ENABLE_CLOCKS
+SBL_CFLAGS += -DSBL_ENABLE_DDR
+
+############################################
+# DISABLING the options above this caption
+# improves boot time at the cost of moving
+# PLL, LPSC and DDR init to the app
+#
+# ENABLING the options below this caption
+# improves boot time by skipping stuff SBL
+# usually does.
+###########################################
+# If enabled, the SBL will branch to the start
+# of MCU_0 app without resetting the core
+# if csl defaults are godd enough this enables
+# app to skip redoing mcu initialization
+#SBL_CFLAGS += -DSBL_SKIP_MCU_RESET
-# BOOTMODE specific CFLAGS
-ifeq ($(BOOTMODE), mmcsd)
- SBL_CFLAGS+= -DBOOT_MMCSD
-endif # ifeq ($(BOOTMODE), mmcsd)
+# If enabled, SBL will skip initializing
+# sysfw. The SBL will only load it.
+# No SCI Client APIs will work. Saves
+# boot time. When this is enabled
+# make sure that SBL_SKIP_MCU_RESET is also
+# enabled, as resetting a core needs SYSFW
+# to be running.
+# SBL_CFLAGS += -DSBL_SKIP_SYSFW_INIT
-ifeq ($(BOOTMODE), ospi)
- SBL_CFLAGS += -DBOOT_OSPI
-endif # ifeq ($(BOOTMODE), ospi)
+# If enabled, SBL will skip calling
+# Sciclient_boardCfg* API. Enabling
+# it saves boot time, can affect
+# functionality. The app must call the
+# Sciclient_boardCfg* APIs that the SBL
+# skips. Like for eg, if SBL skips calling
+# Sciclient_boardCfgPm, then Sciclient_boardCfgRm
+# and Sciclient_boardCfgSec must also
+# be skipped.
+#SBL_CFLAGS += -DSBL_SKIP_BRD_CFG_BOARD
+#SBL_CFLAGS += -DSBL_SKIP_BRD_CFG_RM
+#SBL_CFLAGS += -DSBL_SKIP_BRD_CFG_SEC
+#SBL_CFLAGS += -DSBL_SKIP_BRD_CFG_PM
-ifeq ($(BOOTMODE), qspi)
- SBL_CFLAGS += -DBOOT_QSPI
-endif # ifeq ($(BOOTMODE), qspi)
+# If enabled, SBL will not enable all the
+# PLLs and Clocks, user can specify a
+# subset of PLLs and clocks in board
+# that is needed only for the application
+# startup. The rest can be initialized by the
+# app to save boot time or if the application
+# usecase demands it.
+#SBL_CFLAGS += -DSBL_ENABLE_CUST_PLLS
+#SBL_CFLAGS += -DSBL_ENABLE_CUST_CLOCKS
+###########END BOOT PERF KNOBS#############
-ifeq ($(BOOTMODE), spi)
- SBL_CFLAGS += -DBOOT_SPI
-endif # ifeq ($(BOOTMODE), spi)
+# Example - Building Custom SBL Images
+# Build and SBl with custom flags to change
+# different build configurations
+CUST_SBL_TEST_SOCS = am65xx j721e
+CUST_SBL_TEST_BOARDS = am65xx_evm j721e_evm
+#CUST_SBL_TEST_FLAGS =" -DSBL_USE_DMA=1 -DSBL_LOG_LEVEL=0 -DSBL_SCRATCH_MEM_START=0x70100000 -DSBL_SCRATCH_MEM_SIZE=0xF0000 -DSBL_SKIP_MCU_RESET -DBOOT_OSPI "
+#CUST_SBL_TEST_FLAGS =" -DSBL_USE_DMA=1 -DSBL_LOG_LEVEL=0 -DSBL_SCRATCH_MEM_START=0x70100000 -DSBL_SKIP_MCU_RESET -DSBL_SKIP_BRD_CFG_PM -DBOOT_OSPI "
+#CUST_SBL_TEST_FLAGS =" -DSBL_USE_DMA=0 -DSBL_LOG_LEVEL=0 -DSBL_SCRATCH_MEM_START=0x70100000 -DSBL_SCRATCH_MEM_SIZE=0xF0000 -DSBL_SKIP_SYSFW_INIT -DSBL_SKIP_MCU_RESET -DBOOT_OSPI"
+#CUST_SBL_TEST_FLAGS =" -DSBL_USE_DMA=1 -DSBL_LOG_LEVEL=1 -DSBL_SCRATCH_MEM_START=0xB8000000 -DSBL_SCRATCH_MEM_SIZE=0x4000000 -DSBL_ENABLE_PLL -DSBL_ENABLE_CLOCKS -DSBL_ENABLE_DDR -DSBL_SKIP_MCU_RESET -DBOOT_OSPI"
+CUST_SBL_TEST_FLAGS =" -DSBL_USE_DMA=0 -DSBL_LOG_LEVEL=1 -DSBL_SCRATCH_MEM_START=0x70100000 -DSBL_SCRATCH_MEM_SIZE=0xF0000 -DSBL_ENABLE_PLL -DSBL_ENABLE_CLOCKS -DSBL_ENABLE_CUST_PLLS -DSBL_ENABLE_CUST_CLOCKS -DSBL_SKIP_MCU_RESET -DBOOT_OSPI"
+
+# SBL Custom LIB
+sbl_lib_cust_COMP_LIST = sbl_lib_cust
+sbl_lib_cust_RELPATH = ti/boot/sbl
+export sbl_lib_cust_OBJPATH = ti/boot/sbl/cust
+sbl_lib_cust_PATH = $(PDK_SBL_COMP_PATH)
+sbl_lib_cust_LIBNAME = sbl_lib_cust
+sbl_lib_cust_LIBPATH = $(PDK_SBL_COMP_PATH)/lib/cust
+sbl_lib_cust_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_lib.mk BOOTMODE=cust CUST_SBL_FLAGS=$(CUST_SBL_TEST_FLAGS)
+export sbl_lib_cust_MAKEFILE
+export sbl_lib_cust_LIBNAME
+export sbl_lib_cust_LIBPATH
+sbl_lib_cust_BOARD_DEPENDENCY = yes
+sbl_lib_cust_SOC_DEPENDENCY = yes
+sbl_lib_cust_CORE_DEPENDENCY = no
+export sbl_lib_cust_COMP_LIST
+export sbl_lib_cust_BOARD_DEPENDENCY
+export sbl_lib_cust_CORE_DEPENDENCY
+sbl_lib_cust_PKG_LIST = sbl_lib_cust
+sbl_lib_cust_INCLUDE = $(sbl_lib_cust_PATH)
+sbl_lib_cust_SOCLIST = $(CUST_SBL_TEST_SOCS)
+sbl_lib_cust_BOARDLIST = $(CUST_SBL_TEST_BOARDS)
+export sbl_lib_cust_SOCLIST
+export sbl_lib_cust_BOARDLIST
+sbl_lib_cust_$(SOC)_CORELIST = mcu1_0
+export sbl_lib_cust_$(SOC)_CORELIST
+
+# SBL custom image
+sbl_cust_img_COMP_LIST = sbl_cust_img
+sbl_cust_img_RELPATH = ti/boot/sbl/board/k3
+sbl_cust_img_CUSTOM_BINPATH = $(PDK_SBL_COMP_PATH)/binary/$(BOARD)/cust/bin
+sbl_cust_img_PATH = $(PDK_SBL_COMP_PATH)/board/k3
+sbl_cust_img_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_img.mk BOOTMODE=cust CUST_SBL_FLAGS=$(CUST_SBL_TEST_FLAGS)
+export sbl_cust_img_MAKEFILE
+sbl_cust_img_BOARD_DEPENDENCY = yes
+sbl_cust_img_SOC_DEPENDENCY = yes
+sbl_cust_img_CORE_DEPENDENCY = no
+export sbl_cust_img_COMP_LIST
+export sbl_cust_img_BOARD_DEPENDENCY
+export sbl_cust_img_SOC_DEPENDENCY
+export sbl_cust_img_CORE_DEPENDENCY
+sbl_cust_img_PKG_LIST = sbl
+sbl_cust_img_INCLUDE = $(sbl_cust_img_PATH)
+sbl_cust_img_SOCLIST = $(CUST_SBL_TEST_SOCS)
+sbl_cust_img_BOARDLIST = $(CUST_SBL_TEST_BOARDS)
+export sbl_cust_img_SOCLIST
+export sbl_cust_img_BOARDLIST
+sbl_cust_img_$(SOC)_CORELIST = mcu1_0
+export sbl_cust_img_$(SOC)_CORELIST
+sbl_EXAMPLE_LIST += sbl_cust_img
+sbl_cust_img_SBL_IMAGEGEN = yes
+export sbl_cust_img_SBL_IMAGEGEN
+
+# R5 boot performance Test - works only with custom SBL
+sbl_boot_perf_test_COMP_LIST = sbl_boot_perf_test
+sbl_boot_perf_test_RELPATH = ti/boot/sbl/example/k3MulticoreApp
+sbl_boot_perf_test_BINPATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp/binary
+sbl_boot_perf_test_PATH = $(PDK_SBL_COMP_PATH)/example/k3MulticoreApp
+sbl_boot_perf_test_MAKEFILE = -f$(PDK_SBL_COMP_PATH)/build/sbl_mcu0_boot_perf_test.mk BOOTMODE=cust CUST_SBL_FLAGS=$(CUST_SBL_TEST_FLAGS)
+export sbl_boot_perf_test_MAKEFILE
+sbl_boot_perf_test_BOARD_DEPENDENCY = no
+sbl_boot_perf_test_SOC_DEPENDENCY = no
+sbl_boot_perf_test_CORE_DEPENDENCY = no
+export sbl_boot_perf_test_COMP_LIST
+export sbl_boot_perf_test_BOARD_DEPENDENCY
+export sbl_boot_perf_test_SOC_DEPENDENCY
+export sbl_boot_perf_test_CORE_DEPENDENCY
+sbl_boot_perf_test_PKG_LIST = sbl_boot_perf_test
+sbl_boot_perf_test_INCLUDE = $(sbl_boot_perf_test_PATH)
+sbl_boot_perf_test_SOCLIST = $(CUST_SBL_TEST_SOCS)
+sbl_boot_perf_test_BOARDLIST = $(CUST_SBL_TEST_BOARDS)
+export sbl_boot_perf_test_SOCLIST
+export sbl_boot_perf_test_BOARDLIST
+sbl_boot_perf_test_$(SOC)_CORELIST = mcu1_0
+export sbl_boot_perf_test_$(SOC)_CORELIST
+sbl_EXAMPLE_LIST += sbl_boot_perf_test
+sbl_boot_perf_test_SBL_APPIMAGEGEN = yes
+export sbl_boot_perf_test_SBL_APPIMAGEGEN
+
+# SBL not supported for any profile
+# other than release
+ifneq ($(BUILD_PROFILE), release)
+sbl_LIB_LIST =
+sbl_EXAMPLE_LIST =
+SBL_CFLAGS =
+endif # ifneq ($(BUILD_PROFILE), release)
export sbl_LIB_LIST
export sbl_EXAMPLE_LIST