Merge changes from topic "marvell-a3k-separate-flash-and-uart" into integration
* changes: docs: marvell: Update info about WTMI_IMG option plat: marvell: armada: a3k: Remove unused variable WTMI_SYSINIT_IMG from Makefile plat: marvell: armada: Show informative build messages and blank lines plat: marvell: armada: Move definition of mrvl_flash target to common marvell_common.mk file plat: marvell: armada: a3k: Use $(Q) instead of @ plat: marvell: armada: a3k: Add a new target mrvl_uart which builds UART image plat: marvell: armada: a3k: Build UART image files directly in $(BUILD_UART) subdirectory plat: marvell: armada: a3k: Build intermediate files in $(BUILD_PLAT) directory plat: marvell: armada: a3k: Correctly set DDR_TOPOLOGY and CLOCKSPRESET for WTMI plat: marvell: armada: a3k: Allow use of the system Crypto++ library docs: marvell: Update info about WTP and MV_DDR_PATH parameters plat: marvell: armada: a3k: Add checks that WTP, MV_DDR_PATH and CRYPTOPP_PATH are correctly defined docs: marvell: Update mv-ddr-marvell and A3700-utils-marvell branches
This commit is contained in:
Manish Pandey
TrustedFirmware Code Review
commit
72645d5b60
|
|
@ -123,6 +123,9 @@ There are several build options:
|
|||
|
||||
For the mv_ddr source location, check the section "Tools and external components installation"
|
||||
|
||||
If MV_DDR_PATH source code is a git snapshot then provide path to the full git
|
||||
repository (including .git subdir) because mv_ddr build process calls git commands.
|
||||
|
||||
- CP_NUM
|
||||
|
||||
Total amount of CPs (South Bridge) connected to AP. When the parameter is omitted,
|
||||
|
|
@ -182,22 +185,43 @@ There are several build options:
|
|||
|
||||
- WTMI_IMG
|
||||
|
||||
For Armada37x0 only, the path of the WTMI image can point to an image which
|
||||
For Armada37x0 only, the path of the binary can point to an image which
|
||||
does nothing, an image which supports EFUSE or a customized CM3 firmware
|
||||
binary. The default image is wtmi.bin that built from sources in WTP
|
||||
binary. The default image is ``fuse.bin`` that built from sources in WTP
|
||||
folder, which is the next option. If the default image is OK, then this
|
||||
option should be skipped.
|
||||
|
||||
Please note that this is not a full WTMI image, just a main loop without
|
||||
hardware initialization code. Final WTMI image is built from this WTMI_IMG
|
||||
binary and sys-init code from the WTP directory which sets DDR and CPU
|
||||
clocks according to DDR_TOPOLOGY and CLOCKSPRESET options.
|
||||
|
||||
- WTP
|
||||
|
||||
For Armada37x0 only, use this parameter to point to wtptools source code
|
||||
directory, which can be found as a3700_utils.zip in the release. Usage
|
||||
example: ``WTP=/path/to/a3700_utils``
|
||||
|
||||
If WTP source code is a git snapshot then provide path to the full git
|
||||
repository (including .git subdir) because WTP build process calls git commands.
|
||||
|
||||
- CRYPTOPP_PATH
|
||||
|
||||
For Armada37x0 only, use this parameter tp point to Crypto++ source code
|
||||
directory, which is required for building WTP image tool.
|
||||
For Armada37x0 only, use this parameter to point to Crypto++ source code
|
||||
directory. If this option is specified then Crypto++ source code in
|
||||
CRYPTOPP_PATH directory will be automatically compiled. Crypto++ library
|
||||
is required for building WTP image tool. Either CRYPTOPP_PATH or
|
||||
CRYPTOPP_LIBDIR with CRYPTOPP_INCDIR needs to be specified for Armada37x0.
|
||||
|
||||
- CRYPTOPP_LIBDIR
|
||||
|
||||
For Armada37x0 only, use this parameter to point to the directory with
|
||||
compiled Crypto++ library. By default it points to the CRYPTOPP_PATH.
|
||||
|
||||
- CRYPTOPP_INCDIR
|
||||
|
||||
For Armada37x0 only, use this parameter to point to the directory with
|
||||
header files of Crypto++ library. By default it points to the CRYPTOPP_PATH.
|
||||
|
||||
|
||||
For example, in order to build the image in debug mode with log level up to 'notice' level run
|
||||
|
|
@ -217,7 +241,7 @@ line is as following
|
|||
MARVELL_SECURE_BOOT=0 DDR_TOPOLOGY=3 BOOTDEV=SPINOR PARTNUM=0 PLAT=a3700 \
|
||||
MV_DDR_PATH=/path/to/mv-ddr-marvell/ WTP=/path/to/A3700-utils-marvell/ \
|
||||
CRYPTOPP_PATH=/path/to/cryptopp/ BL33=/path/to/u-boot.bin \
|
||||
all fip mrvl_bootimage mrvl_flash
|
||||
all fip mrvl_bootimage mrvl_flash mrvl_uart
|
||||
|
||||
To build just TF-A without WTMI image (useful for A3720 Turris MOX board), run following command:
|
||||
|
||||
|
|
@ -279,8 +303,9 @@ Marvell's TF-A compilation generates 8 files:
|
|||
for booting via UART. Could be loaded via Marvell's WtpDownload tool from
|
||||
A3700-utils-marvell repository.
|
||||
|
||||
Additional make target ``mrvl_bootimage`` produce ``boot-image.bin`` file and target
|
||||
``mrvl_flash`` produce final ``flash-image.bin`` and ``uart-images.tgz.bin`` files.
|
||||
Additional make target ``mrvl_bootimage`` produce ``boot-image.bin`` file. Target
|
||||
``mrvl_flash`` produce final ``flash-image.bin`` file and target ``mrvl_uart``
|
||||
produce ``uart-images.tgz.bin`` file.
|
||||
|
||||
|
||||
Tools and external components installation
|
||||
|
|
@ -307,12 +332,12 @@ Armada37x0 Builds require installation of 3 components
|
|||
> export CROSS_CM3=/opt/arm-cross/bin/arm-linux-gnueabi
|
||||
|
||||
(2) DDR initialization library sources (mv_ddr) available at the following repository
|
||||
(use the "mv-ddr-devel" branch):
|
||||
(use the "master" branch):
|
||||
|
||||
https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell.git
|
||||
|
||||
(3) Armada3700 tools available at the following repository
|
||||
(use the "A3700_utils-armada-18.12-fixed" branch):
|
||||
(use the "master" branch):
|
||||
|
||||
https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell.git
|
||||
|
||||
|
|
@ -324,6 +349,6 @@ Armada70x0 and Armada80x0 Builds require installation of an additional component
|
|||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
(1) DDR initialization library sources (mv_ddr) available at the following repository
|
||||
(use the "mv-ddr-devel" branch):
|
||||
(use the "master" branch):
|
||||
|
||||
https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell.git
|
||||
|
|
|
|||
|
|
@ -71,19 +71,27 @@ endif
|
|||
|
||||
ifdef WTP
|
||||
|
||||
$(if $(wildcard $(value WTP)/*),,$(error "'WTP=$(value WTP)' was specified, but '$(value WTP)' directory does not exist"))
|
||||
$(if $(shell test -s "$(value WTP)/branch.txt" || git -C $(value WTP) rev-parse --show-cdup 2>&1),$(error "'WTP=$(value WTP)' was specified, but '$(value WTP)' does not contain valid Marvell a3700_utils release tarball nor git repository"))
|
||||
|
||||
DOIMAGEPATH := $(WTP)
|
||||
DOIMAGETOOL := $(DOIMAGEPATH)/wtptp/src/TBB_Linux/release/TBB_linux
|
||||
|
||||
ifeq ($(MARVELL_SECURE_BOOT),1)
|
||||
DOIMAGE_CFG := $(DOIMAGEPATH)/atf-tim.txt
|
||||
IMAGESPATH := $(DOIMAGEPATH)/tim/trusted
|
||||
BUILD_UART := uart-images
|
||||
UART_IMAGE := $(BUILD_UART).tgz.bin
|
||||
|
||||
TIMNCFG := $(DOIMAGEPATH)/atf-timN.txt
|
||||
ifeq ($(MARVELL_SECURE_BOOT),1)
|
||||
DOIMAGE_CFG := $(BUILD_PLAT)/atf-tim.txt
|
||||
DOIMAGEUART_CFG := $(BUILD_PLAT)/$(BUILD_UART)/atf-tim.txt
|
||||
IMAGESPATH := $(DOIMAGEPATH)/tim/trusted
|
||||
TIMNCFG := $(BUILD_PLAT)/atf-timN.txt
|
||||
TIMNUARTCFG := $(BUILD_PLAT)/$(BUILD_UART)/atf-timN.txt
|
||||
TIMNSIG := $(IMAGESPATH)/timnsign.txt
|
||||
TIM2IMGARGS := -i $(DOIMAGE_CFG) -n $(TIMNCFG)
|
||||
TIMN_IMAGE := $$(grep "Image Filename:" -m 1 $(TIMNCFG) | cut -c 17-)
|
||||
else #MARVELL_SECURE_BOOT
|
||||
DOIMAGE_CFG := $(DOIMAGEPATH)/atf-ntim.txt
|
||||
DOIMAGE_CFG := $(BUILD_PLAT)/atf-ntim.txt
|
||||
DOIMAGEUART_CFG := $(BUILD_PLAT)/$(BUILD_UART)/atf-ntim.txt
|
||||
IMAGESPATH := $(DOIMAGEPATH)/tim/untrusted
|
||||
TIM2IMGARGS := -i $(DOIMAGE_CFG)
|
||||
endif #MARVELL_SECURE_BOOT
|
||||
|
|
@ -99,18 +107,11 @@ $(TIMBUILD): $(TIMDDRTOOL)
|
|||
# baremetal binary of fuse programming in A3700_utils.
|
||||
WTMI_IMG := $(DOIMAGEPATH)/wtmi/fuse/build/fuse.bin
|
||||
|
||||
# WTMI_SYSINIT_IMG is used for the system early initialization,
|
||||
# such as AVS settings, clock-tree setup and dynamic DDR PHY training.
|
||||
# After the initialization is done, this image will be wiped out
|
||||
# from the memory and CM3 will continue with RTOS image or other application.
|
||||
WTMI_SYSINIT_IMG := $(DOIMAGEPATH)/wtmi/sys_init/build/sys_init.bin
|
||||
|
||||
# WTMI_MULTI_IMG is composed of CM3 RTOS image (WTMI_IMG)
|
||||
# and sys-init image (WTMI_SYSINIT_IMG).
|
||||
# and sys-init image.
|
||||
WTMI_MULTI_IMG := $(DOIMAGEPATH)/wtmi/build/wtmi.bin
|
||||
|
||||
WTMI_ENC_IMG := $(BUILD_PLAT)/wtmi-enc.bin
|
||||
BUILD_UART := uart-images
|
||||
WTMI_ENC_IMG := wtmi-enc.bin
|
||||
|
||||
SRCPATH := $(dir $(BL33))
|
||||
|
||||
|
|
@ -125,90 +126,106 @@ TIM_IMAGE := $$(grep "Image Filename:" -m 1 $(DOIMAGE_CFG) | cut -c 17-)
|
|||
TIMBLDARGS := $(MARVELL_SECURE_BOOT) $(BOOTDEV) $(IMAGESPATH) $(DOIMAGEPATH) $(CLOCKSPRESET) \
|
||||
$(DDR_TOPOLOGY) $(PARTNUM) $(DEBUG) $(DOIMAGE_CFG) $(TIMNCFG) $(TIMNSIG) 1
|
||||
TIMBLDUARTARGS := $(MARVELL_SECURE_BOOT) UART $(IMAGESPATH) $(DOIMAGEPATH) $(CLOCKSPRESET) \
|
||||
$(DDR_TOPOLOGY) 0 0 $(DOIMAGE_CFG) $(TIMNCFG) $(TIMNSIG) 0
|
||||
DOIMAGE_FLAGS := -r $(DOIMAGE_CFG) -v -D
|
||||
$(DDR_TOPOLOGY) 0 0 $(DOIMAGEUART_CFG) $(TIMNUARTCFG) $(TIMNSIG) 0
|
||||
|
||||
CRYPTOPP_LIBDIR ?= $(CRYPTOPP_PATH)
|
||||
CRYPTOPP_INCDIR ?= $(CRYPTOPP_PATH)
|
||||
|
||||
$(DOIMAGETOOL): FORCE
|
||||
$(if $(value CRYPTOPP_PATH),,$(error "Platform '${PLAT}' for WTP image tool requires CRYPTOPP_PATH. Please set CRYPTOPP_PATH to point to the right directory"))
|
||||
$(if $(CRYPTOPP_LIBDIR),,$(error "Platform '$(PLAT)' for WTP image tool requires CRYPTOPP_PATH or CRYPTOPP_LIBDIR. Please set CRYPTOPP_PATH or CRYPTOPP_LIBDIR to point to the right directory"))
|
||||
$(if $(CRYPTOPP_INCDIR),,$(error "Platform '$(PLAT)' for WTP image tool requires CRYPTOPP_PATH or CRYPTOPP_INCDIR. Please set CRYPTOPP_PATH or CRYPTOPP_INCDIR to point to the right directory"))
|
||||
$(if $(wildcard $(CRYPTOPP_LIBDIR)/*),,$(error "Either 'CRYPTOPP_PATH' or 'CRYPTOPP_LIB' was set to '$(CRYPTOPP_LIBDIR)', but '$(CRYPTOPP_LIBDIR)' does not exist"))
|
||||
$(if $(wildcard $(CRYPTOPP_INCDIR)/*),,$(error "Either 'CRYPTOPP_PATH' or 'CRYPTOPP_INCDIR' was set to '$(CRYPTOPP_INCDIR)', but '$(CRYPTOPP_INCDIR)' does not exist"))
|
||||
ifdef CRYPTOPP_PATH
|
||||
$(Q)$(MAKE) --no-print-directory -C $(CRYPTOPP_PATH) -f GNUmakefile
|
||||
$(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH)/wtptp/src/TBB_Linux -f TBB_linux.mak LIBDIR=$(CRYPTOPP_PATH)
|
||||
endif
|
||||
$(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH)/wtptp/src/TBB_Linux -f TBB_linux.mak LIBDIR=$(CRYPTOPP_LIBDIR) INCDIR=$(CRYPTOPP_INCDIR)
|
||||
|
||||
$(WTMI_MULTI_IMG): FORCE
|
||||
$(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH) WTMI_IMG=$(WTMI_IMG) WTMI
|
||||
$(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH) WTMI_IMG=$(WTMI_IMG) DDR_TOPOLOGY=$(DDR_TOPOLOGY) CLOCKSPRESET=$(CLOCKSPRESET) WTMI
|
||||
|
||||
$(BUILD_PLAT)/wtmi.bin: $(WTMI_MULTI_IMG)
|
||||
$(Q)cp -a $(WTMI_MULTI_IMG) $(BUILD_PLAT)/wtmi.bin
|
||||
|
||||
$(TIMDDRTOOL): FORCE
|
||||
$(if $(value MV_DDR_PATH),,$(error "Platform '${PLAT}' for ddr tool requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory"))
|
||||
$(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH) MV_DDR_PATH=$(MV_DDR_PATH) mv_ddr
|
||||
$(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist"))
|
||||
$(if $(shell test -s "$(value MV_DDR_PATH)/branch.txt" || git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid Marvell mv_ddr release tarball nor git repository"))
|
||||
$(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH) MV_DDR_PATH=$(MV_DDR_PATH) DDR_TOPOLOGY=$(DDR_TOPOLOGY) mv_ddr
|
||||
|
||||
.PHONY: mrvl_flash
|
||||
mrvl_flash: ${BUILD_PLAT}/${BOOT_IMAGE} ${WTMI_MULTI_IMG} ${DOIMAGETOOL} ${TIMBUILD}
|
||||
@echo
|
||||
$(BUILD_PLAT)/$(UART_IMAGE): $(BUILD_PLAT)/$(BOOT_IMAGE) $(BUILD_PLAT)/wtmi.bin $(DOIMAGETOOL) $(TIMBUILD) $(TIMDDRTOOL)
|
||||
@$(ECHO_BLANK_LINE)
|
||||
@echo "Building uart images"
|
||||
$(TIMBUILD) $(TIMBLDUARTARGS)
|
||||
@sed -i 's|WTMI_IMG|$(WTMI_MULTI_IMG)|1' $(DOIMAGE_CFG)
|
||||
@sed -i 's|BOOT_IMAGE|$(BUILD_PLAT)/$(BOOT_IMAGE)|1' $(DOIMAGE_CFG)
|
||||
$(Q)mkdir -p $(BUILD_PLAT)/$(BUILD_UART)
|
||||
$(Q)cp -a $(BUILD_PLAT)/wtmi.bin $(BUILD_PLAT)/$(BUILD_UART)/wtmi.bin
|
||||
$(Q)cp -a $(BUILD_PLAT)/$(BOOT_IMAGE) $(BUILD_PLAT)/$(BUILD_UART)/$(BOOT_IMAGE)
|
||||
$(Q)cd $(BUILD_PLAT)/$(BUILD_UART) && $(TIMBUILD) $(TIMBLDUARTARGS)
|
||||
$(Q)sed -i 's|WTMI_IMG|wtmi.bin|1' $(DOIMAGEUART_CFG)
|
||||
$(Q)sed -i 's|BOOT_IMAGE|$(BOOT_IMAGE)|1' $(DOIMAGEUART_CFG)
|
||||
ifeq ($(MARVELL_SECURE_BOOT),1)
|
||||
@sed -i 's|WTMI_IMG|$(WTMI_MULTI_IMG)|1' $(TIMNCFG)
|
||||
@sed -i 's|BOOT_IMAGE|$(BUILD_PLAT)/$(BOOT_IMAGE)|1' $(TIMNCFG)
|
||||
$(Q)sed -i 's|WTMI_IMG|wtmi.bin|1' $(TIMNUARTCFG)
|
||||
$(Q)sed -i 's|BOOT_IMAGE|$(BOOT_IMAGE)|1' $(TIMNUARTCFG)
|
||||
endif
|
||||
$(DOIMAGETOOL) $(DOIMAGE_FLAGS)
|
||||
@if [ -e "$(TIMNCFG)" ]; then $(DOIMAGETOOL) -r $(TIMNCFG); fi
|
||||
@rm -rf $(BUILD_PLAT)/$(BUILD_UART)*
|
||||
@mkdir $(BUILD_PLAT)/$(BUILD_UART)
|
||||
@mv -t $(BUILD_PLAT)/$(BUILD_UART) $(TIM_IMAGE) $(DOIMAGE_CFG) $(TIMN_IMAGE) $(TIMNCFG)
|
||||
@find . -name "*_h.*" |xargs cp -ut $(BUILD_PLAT)/$(BUILD_UART)
|
||||
@mv $(subst .bin,_h.bin,$(WTMI_MULTI_IMG)) $(BUILD_PLAT)/$(BUILD_UART)/wtmi_h.bin
|
||||
@tar czf $(BUILD_PLAT)/$(BUILD_UART).tgz.bin -C $(BUILD_PLAT) ./$(BUILD_UART)
|
||||
@echo
|
||||
@echo "Building flash image"
|
||||
$(TIMBUILD) $(TIMBLDARGS)
|
||||
sed -i 's|WTMI_IMG|$(WTMI_MULTI_IMG)|1' $(DOIMAGE_CFG)
|
||||
sed -i 's|BOOT_IMAGE|$(BUILD_PLAT)/$(BOOT_IMAGE)|1' $(DOIMAGE_CFG)
|
||||
$(Q)cd $(BUILD_PLAT)/$(BUILD_UART) && $(DOIMAGETOOL) -r $(DOIMAGEUART_CFG) -v -D
|
||||
ifeq ($(MARVELL_SECURE_BOOT),1)
|
||||
@sed -i 's|WTMI_IMG|$(WTMI_MULTI_IMG)|1' $(TIMNCFG)
|
||||
@sed -i 's|BOOT_IMAGE|$(BUILD_PLAT)/$(BOOT_IMAGE)|1' $(TIMNCFG)
|
||||
$(Q)cd $(BUILD_PLAT)/$(BUILD_UART) && $(DOIMAGETOOL) -r $(TIMNUARTCFG)
|
||||
endif
|
||||
$(Q)tar czf $(BUILD_PLAT)/$(UART_IMAGE) -C $(BUILD_PLAT) $(BUILD_UART)/$(TIM_IMAGE) $(BUILD_UART)/wtmi_h.bin $(BUILD_UART)/boot-image_h.bin
|
||||
@$(ECHO_BLANK_LINE)
|
||||
@echo "Built $@ successfully"
|
||||
@$(ECHO_BLANK_LINE)
|
||||
|
||||
$(BUILD_PLAT)/$(FLASH_IMAGE): $(BUILD_PLAT)/$(BOOT_IMAGE) $(BUILD_PLAT)/wtmi.bin $(DOIMAGETOOL) $(TIMBUILD) $(TIMDDRTOOL) $(TIM2IMG)
|
||||
@$(ECHO_BLANK_LINE)
|
||||
@echo "Building flash image"
|
||||
$(Q)cd $(BUILD_PLAT) && $(TIMBUILD) $(TIMBLDARGS)
|
||||
$(Q)sed -i 's|WTMI_IMG|wtmi.bin|1' $(DOIMAGE_CFG)
|
||||
$(Q)sed -i 's|BOOT_IMAGE|$(BOOT_IMAGE)|1' $(DOIMAGE_CFG)
|
||||
ifeq ($(MARVELL_SECURE_BOOT),1)
|
||||
$(Q)sed -i 's|WTMI_IMG|wtmi.bin|1' $(TIMNCFG)
|
||||
$(Q)sed -i 's|BOOT_IMAGE|$(BOOT_IMAGE)|1' $(TIMNCFG)
|
||||
@echo -e "\n\t=======================================================\n";
|
||||
@echo -e "\t Secure boot. Encrypting wtmi and boot-image \n";
|
||||
@echo -e "\t=======================================================\n";
|
||||
@cp $(WTMI_MULTI_IMG) $(BUILD_PLAT)/wtmi-align.bin
|
||||
@truncate -s %16 $(BUILD_PLAT)/wtmi-align.bin
|
||||
@openssl enc -aes-256-cbc -e -in $(BUILD_PLAT)/wtmi-align.bin \
|
||||
-out $(WTMI_ENC_IMG) \
|
||||
$(Q)cp $(BUILD_PLAT)/wtmi.bin $(BUILD_PLAT)/wtmi-align.bin
|
||||
$(Q)truncate -s %16 $(BUILD_PLAT)/wtmi-align.bin
|
||||
$(Q)openssl enc -aes-256-cbc -e -in $(BUILD_PLAT)/wtmi-align.bin \
|
||||
-out $(BUILD_PLAT)/$(WTMI_ENC_IMG) \
|
||||
-K `cat $(IMAGESPATH)/aes-256.txt` -nosalt \
|
||||
-iv `cat $(IMAGESPATH)/iv.txt` -p
|
||||
@truncate -s %16 $(BUILD_PLAT)/$(BOOT_IMAGE);
|
||||
@openssl enc -aes-256-cbc -e -in $(BUILD_PLAT)/$(BOOT_IMAGE) \
|
||||
$(Q)truncate -s %16 $(BUILD_PLAT)/$(BOOT_IMAGE);
|
||||
$(Q)openssl enc -aes-256-cbc -e -in $(BUILD_PLAT)/$(BOOT_IMAGE) \
|
||||
-out $(BUILD_PLAT)/$(BOOT_ENC_IMAGE) \
|
||||
-K `cat $(IMAGESPATH)/aes-256.txt` -nosalt \
|
||||
-iv `cat $(IMAGESPATH)/iv.txt` -p
|
||||
endif
|
||||
$(DOIMAGETOOL) $(DOIMAGE_FLAGS)
|
||||
@if [ -e "$(TIMNCFG)" ]; then $(DOIMAGETOOL) -r $(TIMNCFG); fi
|
||||
$(Q)cd $(BUILD_PLAT) && $(DOIMAGETOOL) -r $(DOIMAGE_CFG) -v -D
|
||||
ifeq ($(MARVELL_SECURE_BOOT),1)
|
||||
@sed -i 's|$(WTMI_MULTI_IMG)|$(WTMI_ENC_IMG)|1;s|$(BOOT_IMAGE)|$(BOOT_ENC_IMAGE)|1;' $(TIMNCFG)
|
||||
$(Q)cd $(BUILD_PLAT) && $(DOIMAGETOOL) -r $(TIMNCFG)
|
||||
$(Q)sed -i 's|wtmi.bin|$(WTMI_ENC_IMG)|1' $(TIMNCFG)
|
||||
$(Q)sed -i 's|$(BOOT_IMAGE)|$(BOOT_ENC_IMAGE)|1' $(TIMNCFG)
|
||||
endif
|
||||
$(TIM2IMG) $(TIM2IMGARGS) -o $(BUILD_PLAT)/$(FLASH_IMAGE)
|
||||
@mv -t $(BUILD_PLAT) $(TIM_IMAGE) $(DOIMAGE_CFG) $(TIMN_IMAGE) $(TIMNCFG)
|
||||
@cp -t $(BUILD_PLAT) $(WTMI_IMG) $(WTMI_SYSINIT_IMG) $(WTMI_MULTI_IMG)
|
||||
ifeq ($(MARVELL_SECURE_BOOT),1)
|
||||
@mv -t $(BUILD_PLAT) OtpHash.txt
|
||||
endif
|
||||
@find . -name "*.txt" | grep -E "CSK[[:alnum:]]_KeyHash.txt|Tim_msg.txt|TIMHash.txt" | xargs rm -f
|
||||
$(Q)cd $(BUILD_PLAT) && $(TIM2IMG) $(TIM2IMGARGS) -o $(BUILD_PLAT)/$(FLASH_IMAGE)
|
||||
@$(ECHO_BLANK_LINE)
|
||||
@echo "Built $@ successfully"
|
||||
@$(ECHO_BLANK_LINE)
|
||||
|
||||
clean realclean distclean: mrvl_clean
|
||||
|
||||
.PHONY: mrvl_clean
|
||||
mrvl_clean:
|
||||
-$(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH) MV_DDR_PATH=$(MV_DDR_PATH) clean
|
||||
-$(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH)/wtptp/src/TBB_Linux -f TBB_linux.mak LIBDIR=$(CRYPTOPP_PATH) clean
|
||||
-$(Q)$(MAKE) --no-print-directory -C $(DOIMAGEPATH)/wtptp/src/TBB_Linux -f TBB_linux.mak clean
|
||||
ifdef CRYPTOPP_PATH
|
||||
-$(Q)$(MAKE) --no-print-directory -C $(CRYPTOPP_PATH) -f GNUmakefile clean
|
||||
endif
|
||||
|
||||
else # WTP
|
||||
|
||||
.PHONY: mrvl_flash
|
||||
mrvl_flash:
|
||||
$(BUILD_PLAT)/$(UART_IMAGE) $(BUILD_PLAT)/$(FLASH_IMAGE):
|
||||
$(error "Platform '${PLAT}' for target '$@' requires WTP. Please set WTP to point to the right directory")
|
||||
|
||||
endif # WTP
|
||||
|
||||
.PHONY: mrvl_uart
|
||||
mrvl_uart: $(BUILD_PLAT)/$(UART_IMAGE)
|
||||
|
|
|
|||
|
|
@ -163,6 +163,10 @@ ${DOIMAGETOOL}: FORCE
|
|||
@$(DOIMAGE_LIBS_CHECK)
|
||||
${Q}${MAKE} --no-print-directory -C ${DOIMAGEPATH}
|
||||
|
||||
.PHONY: mrvl_flash
|
||||
mrvl_flash: ${BUILD_PLAT}/${BOOT_IMAGE} ${DOIMAGETOOL}
|
||||
${DOIMAGETOOL} ${DOIMAGE_FLAGS} ${BUILD_PLAT}/${BOOT_IMAGE} ${BUILD_PLAT}/${FLASH_IMAGE}
|
||||
${BUILD_PLAT}/${FLASH_IMAGE}: ${ROM_BIN_EXT} ${BUILD_PLAT}/${BOOT_IMAGE} ${DOIMAGETOOL}
|
||||
@${ECHO_BLANK_LINE}
|
||||
@echo "Building flash image"
|
||||
${Q}${DOIMAGETOOL} ${DOIMAGE_FLAGS} ${BUILD_PLAT}/${BOOT_IMAGE} ${BUILD_PLAT}/${FLASH_IMAGE}
|
||||
@${ECHO_BLANK_LINE}
|
||||
@echo "Built $@ successfully"
|
||||
@${ECHO_BLANK_LINE}
|
||||
|
|
|
|||
|
|
@ -92,7 +92,12 @@ $(BUILD_PLAT)/$(BOOT_IMAGE): $(BUILD_PLAT)/bl1.bin $(BUILD_PLAT)/$(FIP_NAME)
|
|||
@truncate -s %128K $(BUILD_PLAT)/$(BOOT_IMAGE) || { rm -f $(BUILD_PLAT)/$(BOOT_IMAGE); false; }
|
||||
@cat $(BUILD_PLAT)/$(FIP_NAME) >> $(BUILD_PLAT)/$(BOOT_IMAGE) || { rm -f $(BUILD_PLAT)/$(BOOT_IMAGE); false; }
|
||||
@truncate -s %4 $(BUILD_PLAT)/$(BOOT_IMAGE) || { rm -f $(BUILD_PLAT)/$(BOOT_IMAGE); false; }
|
||||
@$(ECHO_BLANK_LINE)
|
||||
@echo "Built $@ successfully"
|
||||
@$(ECHO_BLANK_LINE)
|
||||
|
||||
.PHONY: mrvl_bootimage
|
||||
mrvl_bootimage: $(BUILD_PLAT)/$(BOOT_IMAGE)
|
||||
|
||||
.PHONY: mrvl_flash
|
||||
mrvl_flash: $(BUILD_PLAT)/$(FLASH_IMAGE)
|
||||
|
|
|
|||
Loading…
Reference in New Issue