tegra210: add a config for wrapping the bootblock as bct

default to yes, but let mainboards overwrite it
This commit is contained in:
Andre Heider 2018-02-03 12:57:38 +01:00
parent 15e9ed37e0
commit 535b549047
2 changed files with 6 additions and 0 deletions

View file

@ -17,6 +17,10 @@ config SOC_NVIDIA_TEGRA210
if SOC_NVIDIA_TEGRA210 if SOC_NVIDIA_TEGRA210
config BOOTBLOCK_WRAP_BCT
bool
default y
config VBOOT config VBOOT
select VBOOT_STARTS_IN_BOOTBLOCK select VBOOT_STARTS_IN_BOOTBLOCK
select VBOOT_SEPARATE_VERSTAGE select VBOOT_SEPARATE_VERSTAGE

View file

@ -101,6 +101,7 @@ rmodules_arm-y += monotonic_timer.c
CPPFLAGS_common += -Isrc/soc/nvidia/tegra210/include/ CPPFLAGS_common += -Isrc/soc/nvidia/tegra210/include/
ifeq ($(CONFIG_BOOTBLOCK_WRAP_BCT),y)
# We want to grab the bootblock right before it goes into the image and wrap # We want to grab the bootblock right before it goes into the image and wrap
# it inside a BCT, but ideally we would do that without making special, one # it inside a BCT, but ideally we would do that without making special, one
# use modifications to the main ARM Makefile. We do this in two ways. First, # use modifications to the main ARM Makefile. We do this in two ways. First,
@ -130,6 +131,7 @@ $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin $(BCT_BIN)
echo "BootLoader = $<,$(call loadaddr,bootblock),$(call loadaddr,bootblock),Complete;" >> $(BCT_WRAPPER) echo "BootLoader = $<,$(call loadaddr,bootblock),$(call loadaddr,bootblock),Complete;" >> $(BCT_WRAPPER)
@printf " CBOOTIMAGE $(subst $(obj)/,,$(@))\n" @printf " CBOOTIMAGE $(subst $(obj)/,,$(@))\n"
$(CBOOTIMAGE) $(CBOOTIMAGE_OPTS) $(BCT_WRAPPER) $@ $(CBOOTIMAGE) $(CBOOTIMAGE_OPTS) $(BCT_WRAPPER) $@
endif
# We need to ensure that TZ memory has enough space to hold TTB and resident EL3 # We need to ensure that TZ memory has enough space to hold TTB and resident EL3
# components (including BL31 and Secure OS) # components (including BL31 and Secure OS)