Unverified Commit dd4dfc60 authored by Grant Likely's avatar Grant Likely Committed by GitHub
Browse files

Merge pull request #2 from apalos/master

Fixes for lx2160a build
parents 87180263 01754f75
...@@ -10,6 +10,15 @@ RCW_TARGET_PATH := $(RCW_PATH)/$(CONFIG_SYS_CONFIG_NAME) ...@@ -10,6 +10,15 @@ RCW_TARGET_PATH := $(RCW_PATH)/$(CONFIG_SYS_CONFIG_NAME)
TFA_PLAT := $(CONFIG_SYS_CONFIG_NAME) TFA_PLAT := $(CONFIG_SYS_CONFIG_NAME)
TFA_EXTRA += RCW=$(RCW_TARGET_PATH)/RCW/template.bin TFA_EXTRA += RCW=$(RCW_TARGET_PATH)/RCW/template.bin
TFA_EXTRA += TRUSTED_BOARD_BOOT=0 GENERATE_COT=0 BOOT_MODE=auto SECURE_BOOT=false TFA_EXTRA += TRUSTED_BOARD_BOOT=0 GENERATE_COT=0 BOOT_MODE=auto SECURE_BOOT=false
OPTEE_EXTRA += CFG_RPMB_FS_DEV_ID=1
OPTEE_PLATFORM := ls
OPTEE_PLATFORM_FLAVOR := lx2160ardb
# In TF-A for LX2, the option for parsing header on optee is not supported.
# It expects a binary which can be loaded in memory and where execution can
# start from.
# This option forces an objcopy which converts elf into bin and the header
# gets removed.
USE_TEE_BIN = TRUE
FLASH_IMAGE := $(CONFIG_SYS_CONFIG_NAME)-sdcard.img FLASH_IMAGE := $(CONFIG_SYS_CONFIG_NAME)-sdcard.img
......
...@@ -223,6 +223,9 @@ endif # ifeq($(CONFIG_EFI_MM_COMM_TEE),y) ...@@ -223,6 +223,9 @@ endif # ifeq($(CONFIG_EFI_MM_COMM_TEE),y)
OPTEE_EXTRA += ARCH=arm OPTEE_EXTRA += ARCH=arm
OPTEE_EXTRA += CROSS_COMPILE32=arm-linux-gnueabihf- OPTEE_EXTRA += CROSS_COMPILE32=arm-linux-gnueabihf-
OPTEE_EXTRA += PLATFORM=$(OPTEE_PLATFORM) OPTEE_EXTRA += PLATFORM=$(OPTEE_PLATFORM)
ifneq ($(OPTEE_PLATFORM_FLAVOR),)
OPTEE_EXTRA += PLATFORM_FLAVOR=$(OPTEE_PLATFORM_FLAVOR)
endif
OPTEE_EXTRA += CFG_ARM64_core=y OPTEE_EXTRA += CFG_ARM64_core=y
OPTEE_EXTRA += CFG_RPMB_FS=y OPTEE_EXTRA += CFG_RPMB_FS=y
OPTEE_EXTRA += CFG_RPMB_WRITE_KEY=1 OPTEE_EXTRA += CFG_RPMB_WRITE_KEY=1
...@@ -232,14 +235,28 @@ OPTEE_EXTRA += CFG_CORE_HEAP_SIZE=524288 ...@@ -232,14 +235,28 @@ OPTEE_EXTRA += CFG_CORE_HEAP_SIZE=524288
#OPTEE_EXTRA += CFG_TA_ASLR=n #OPTEE_EXTRA += CFG_TA_ASLR=n
# Tell TFA where to find the OP-TEE binaries # Tell TFA where to find the OP-TEE binaries
TFA_EXTRA += BL32=$(OPTEE_OUTPUT)/arm-plat-vexpress/core/tee-header_v2.bin ifneq ($(USE_TEE_BIN),)
TFA_EXTRA += BL32_EXTRA1=$(OPTEE_OUTPUT)/arm-plat-vexpress/core/tee-pager_v2.bin # On some platforms the option for parsing header on optee is not supported.
TFA_EXTRA += BL32_EXTRA2=$(OPTEE_OUTPUT)/arm-plat-vexpress/core/tee-pageable_v2.bin # Those platforms expect a binary which can be loaded in memory and where
# execution can start from.
# This option forces an objcopy which converts elf into bin and the header
# gets removed.
optee-tee-bin: optee_os/all
$(CROSS_COMPILE)objcopy -v -O binary \
$(OPTEE_OUTPUT)/arm-plat-$(OPTEE_PLATFORM)/core/tee.elf \
$(OPTEE_OUTPUT)/arm-plat-$(OPTEE_PLATFORM)/core/tee.bin
TFA_EXTRA += BL32=$(OPTEE_OUTPUT)/arm-plat-$(OPTEE_PLATFORM)/core/tee.bin
FIP_DEPS += optee-tee-bin
else
TFA_EXTRA += BL32=$(OPTEE_OUTPUT)/arm-plat-$(OPTEE_PLATFORM)/core/tee-header_v2.bin
TFA_EXTRA += BL32_EXTRA1=$(OPTEE_OUTPUT)/arm-plat-$(OPTEE_PLATFORM)/core/tee-pager_v2.bin
TFA_EXTRA += BL32_EXTRA2=$(OPTEE_OUTPUT)/arm-plat-$(OPTEE_PLATFORM)/core/tee-pageable_v2.bin
endif #ifeq($(USE_TEE_BIN),)
TFA_EXTRA += BL32_RAM_LOCATION=tdram TFA_EXTRA += BL32_RAM_LOCATION=tdram
TFA_EXTRA += SPD=opteed TFA_EXTRA += SPD=opteed
FIP_DEPS += optee_os/all FIP_DEPS += optee_os/all
endif # ifeq($(CONFIG_OPTEE),y) endif # ifeq($(CONFIG_OPTEE),y)
# Default Trusted Firmware configuration settings # Default Trusted Firmware configuration settings
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment