diff options
| author | Manish Pandey <manish.pandey2@arm.com> | 2021-02-02 11:17:54 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-02-02 11:17:54 +0000 |
| commit | 6803d9894596e5981564a9350a0febe7ef6e3e0a (patch) | |
| tree | 68098b6b5560d0ba383919df7a35a85e4d56b478 | |
| parent | 72645d5b607a4455c6bfcb3a046a3f5f2476a8bb (diff) | |
| parent | e01658ea94b0fc6dabca73a56c778eef6342aa0f (diff) | |
| download | platform_external_arm-trusted-firmware-6803d9894596e5981564a9350a0febe7ef6e3e0a.tar.gz platform_external_arm-trusted-firmware-6803d9894596e5981564a9350a0febe7ef6e3e0a.tar.bz2 platform_external_arm-trusted-firmware-6803d9894596e5981564a9350a0febe7ef6e3e0a.zip | |
Merge changes from topic "marvell-a3k-separate-flash-and-uart" into integration
* changes:
plat: marvell: armada: a3k: Do not use 'echo -e' in Makefile
docs: marvell: Update info about BOOTDEV=SATA
| -rw-r--r-- | docs/plat/marvell/armada/build.rst | 4 | ||||
| -rw-r--r-- | plat/marvell/armada/a3k/common/a3700_common.mk | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/docs/plat/marvell/armada/build.rst b/docs/plat/marvell/armada/build.rst index 10d30aec9..ae67ab0b0 100644 --- a/docs/plat/marvell/armada/build.rst +++ b/docs/plat/marvell/armada/build.rst @@ -174,6 +174,10 @@ There are several build options: - SATA - SATA device boot + Image needs to be stored at disk LBA 0 or at disk partition with + MBR type 0x4d (ASCII 'M' as in Marvell) or at disk partition with + GPT name ``MARVELL BOOT PARTITION``. + - PARTNUM For Armada37x0 only, the boot partition number, default is 0. diff --git a/plat/marvell/armada/a3k/common/a3700_common.mk b/plat/marvell/armada/a3k/common/a3700_common.mk index c64be39cc..8775e8934 100644 --- a/plat/marvell/armada/a3k/common/a3700_common.mk +++ b/plat/marvell/armada/a3k/common/a3700_common.mk @@ -184,9 +184,11 @@ $(BUILD_PLAT)/$(FLASH_IMAGE): $(BUILD_PLAT)/$(BOOT_IMAGE) $(BUILD_PLAT)/wtmi.bin 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"; + @$(ECHO_BLANK_LINE) + @echo "======================================================="; + @echo " Secure boot. Encrypting wtmi and boot-image"; + @echo "======================================================="; + @$(ECHO_BLANK_LINE) $(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 \ |