paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git$ git diffdiff --git a/plat/ti/k3/board/lite/board.mk b/plat/ti/k3/board/lite/board.mk index 76246be47c..aa5a0e4577 100644 --- a/plat/ti/k3/board/lite/board.mk +++ b/plat/ti/k3/board/lite/board.mk @@ -7,7 +7,7 @@ BL32_BASE ?= 0x9e800000 $(eval $(call add_define,BL32_BASE)) -PRELOADED_BL33_BASE ?= 0x80080000 +PRELOADED_BL33_BASE ?= 0x80200000 $(eval $(call add_define,PRELOADED_BL33_BASE)) K3_HW_CONFIG_BASE ?= 0x82000000 diff --git a/plat/ti/k3/common/k3_bl31_setup.c b/plat/ti/k3/common/k3_bl31_setup.c index 457c95dd6f..12ff1e8b48 100644 --- a/plat/ti/k3/common/k3_bl31_setup.c +++ b/plat/ti/k3/common/k3_bl31_setup.c @@ -83,6 +83,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, bl33_image_ep_info.pc = PRELOADED_BL33_BASE; bl33_image_ep_info.spsr = k3_get_spsr_for_bl33_entry(); SET_SECURITY_STATE(bl33_image_ep_info.h.attr, NON_SECURE); + NOTICE("BL33 base: 0x%x\n", PRELOADED_BL33_BASE); #ifdef K3_HW_CONFIG_BASE /* diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile index 042e844626..cc0d810828 100644 --- a/tools/cert_create/Makefile +++ b/tools/cert_create/Makefile @@ -78,8 +78,8 @@ INC_DIR += -I ./include -I ${PLAT_INCLUDE} -I ${OPENSSL_DIR}/include # directory. However, for a local build of OpenSSL, the built binaries are # located under the main project directory (i.e.: ${OPENSSL_DIR}, not # ${OPENSSL_DIR}/lib/). -LIB_DIR := -L ${OPENSSL_DIR}/lib -L ${OPENSSL_DIR} -LIB := -lssl -lcrypto +LIB_DIR := -L ${OPENSSL_DIR}/lib -L ${OPENSSL_DIR} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} +LIB := -lssl -lcrypto ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} HOSTCC ?= gcc diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile index d7e0fe5beb..3a9ea38d2a 100644 --- a/tools/fiptool/Makefile +++ b/tools/fiptool/Makefile @@ -39,7 +39,7 @@ HOSTCCFLAGS += -DUSING_OPENSSL3=$(USING_OPENSSL3) # directory. However, for a local build of OpenSSL, the built binaries are # located under the main project directory (i.e.: ${OPENSSL_DIR}, not # ${OPENSSL_DIR}/lib/). -LDLIBS := -L${OPENSSL_DIR}/lib -L${OPENSSL_DIR} -lcrypto +LDLIBS := -L${OPENSSL_DIR}/lib -L${OPENSSL_DIR} -lcrypto ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ifeq (${V},0) Q := @ @@ -47,7 +47,7 @@ else Q := endif -INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include +INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include ${BUILD_CFLAGS} ${BUILD_CFLAGS} HOSTCC ?= gcc paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git$ make ARCH=aarch64 \ > CROSS_COMPILE=/home/paul/arm-gnu-toolchain-11.3.rel1-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu- \ > PLAT=k3 TARGET_BOARD=lite SPD=opteed Including services/spd/opteed/opteed.mk Building k3 CC lib/libc/abort.c CC lib/libc/assert.c CC lib/libc/exit.c CC lib/libc/memchr.c CC lib/libc/memcmp.c CC lib/libc/memcpy.c CC lib/libc/memmove.c CC lib/libc/memrchr.c CC lib/libc/memset.c CC lib/libc/printf.c CC lib/libc/putchar.c CC lib/libc/puts.c CC lib/libc/snprintf.c CC lib/libc/strchr.c CC lib/libc/strcmp.c CC lib/libc/strlcat.c CC lib/libc/strlcpy.c CC lib/libc/strlen.c CC lib/libc/strncmp.c CC lib/libc/strnlen.c CC lib/libc/strrchr.c CC lib/libc/strtok.c CC lib/libc/strtoul.c CC lib/libc/strtoll.c CC lib/libc/strtoull.c CC lib/libc/strtol.c AS lib/libc/aarch64/setjmp.S AR /home/paul/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build/k3/lite/release/lib/libc.a CC bl31/bl31_context_mgmt.c CC bl31/bl31_main.c CC bl31/bl31_traps.c CC bl31/interrupt_mgmt.c CC common/runtime_svc.c CC drivers/arm/gic/v3/arm_gicv3_common.c CC drivers/arm/gic/v3/gic-x00.c CC drivers/arm/gic/v3/gicdv3_helpers.c CC drivers/arm/gic/v3/gicrv3_helpers.c CC drivers/arm/gic/v3/gicv3_helpers.c CC drivers/arm/gic/v3/gicv3_main.c CC lib/cpus/errata_report.c CC lib/el3_runtime/aarch64/context_mgmt.c CC lib/el3_runtime/cpu_data_array.c CC lib/extensions/spe/spe.c CC lib/extensions/sve/sve.c CC lib/locks/bakery/bakery_lock_normal.c CC lib/psci/psci_common.c CC lib/psci/psci_main.c CC lib/psci/psci_mem_protect.c CC lib/psci/psci_off.c CC lib/psci/psci_on.c CC lib/psci/psci_setup.c CC lib/psci/psci_suspend.c CC lib/psci/psci_system_off.c CC plat/common/plat_gicv3.c CC plat/common/plat_psci_common.c CC plat/ti/k3/common/drivers/sec_proxy/sec_proxy.c CC plat/ti/k3/common/drivers/ti_sci/ti_sci.c CC plat/ti/k3/common/k3_bl31_setup.c CC plat/ti/k3/common/k3_gicv3.c CC plat/ti/k3/common/k3_psci.c CC plat/ti/k3/common/k3_topology.c CC services/arm_arch_svc/arm_arch_svc_setup.c CC services/spd/opteed/opteed_common.c CC services/spd/opteed/opteed_main.c CC services/spd/opteed/opteed_pm.c CC services/std_svc/std_svc_setup.c CC common/bl_common.c CC common/tf_log.c CC drivers/console/multi_console.c CC plat/common/plat_bl_common.c CC plat/common/plat_log_common.c CC plat/common/aarch64/plat_common.c CC lib/compiler-rt/builtins/popcountdi2.c CC lib/compiler-rt/builtins/popcountsi2.c CC lib/xlat_tables_v2/aarch64/xlat_tables_arch.c CC lib/xlat_tables_v2/xlat_tables_context.c CC lib/xlat_tables_v2/xlat_tables_core.c CC lib/xlat_tables_v2/xlat_tables_utils.c CC plat/ti/k3/common/k3_console.c AS bl31/aarch64/bl31_entrypoint.S AS bl31/aarch64/crash_reporting.S AS bl31/aarch64/ea_delegate.S AS bl31/aarch64/runtime_exceptions.S AS lib/cpus/aarch64/cpu_helpers.S AS lib/cpus/aarch64/dsu_helpers.S AS lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S AS lib/cpus/aarch64/wa_cve_2017_5715_mmu.S AS lib/el3_runtime/aarch64/context.S AS lib/el3_runtime/aarch64/cpu_data.S AS lib/locks/exclusive/aarch64/spinlock.S AS lib/psci/aarch64/psci_helpers.S AS plat/common/aarch64/platform_mp_stack.S AS plat/ti/k3/common/k3_helpers.S AS services/spd/opteed/opteed_helpers.S AS common/aarch64/debug.S AS lib/aarch64/cache_helpers.S AS lib/aarch64/misc_helpers.S AS plat/common/aarch64/platform_helpers.S AS lib/cpus/aarch64/cortex_a53.S AS lib/cpus/aarch64/cortex_a72.S AS lib/xlat_tables_v2/aarch64/enable_mmu.S AS drivers/ti/uart/aarch64/16550_console.S PP bl31/bl31.ld.S LD /home/paul/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build/k3/lite/release/bl31/bl31.elf BIN /home/paul/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build/k3/lite/release/bl31.bin Built /home/paul/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build/k3/lite/release/bl31.bin successfully OD /home/paul/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build/k3/lite/release/bl31/bl31.dump paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git$ ls bl1 bl2u bl32 changelog.yaml dco.txt drivers include license.rst Makefile package.json plat services bl2 bl31 build common docs fdts lib licenses make_helpers package-lock.json readme.rst tools paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git$ cd build/ paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build$ lsk3 paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build$ cd k3/ paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build/k3$ ls lite paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build/k3$ cd lite/ paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build/k3/lite$ ls release paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build/k3/lite$ cd release/ paul@pau-ubt1804:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm-oe-linux/trusted-firmware-a/2.8+gitAUTOINC+2fcd408bb3-r0/git/build/k3/lite/release$ ls bl31 bl31.bin lib libc libwrapper romlib