diff options
| author | Alistair Delva <adelva@google.com> | 2021-02-16 21:01:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 21:01:22 +0000 |
| commit | efb2826bb8160e2d8e0fcec85133a7468484f9fd (patch) | |
| tree | 37a21c69306801ee7cdda5167a30896c8740155b /plat/marvell/marvell.mk | |
| parent | b00a71fc312c9781fa6f404dccfb55b062b2ccac (diff) | |
| parent | faa476c0caaa598afa5a6109d17102db5fe35ec6 (diff) | |
| download | platform_external_arm-trusted-firmware-master.tar.gz platform_external_arm-trusted-firmware-master.tar.bz2 platform_external_arm-trusted-firmware-master.zip | |
Merge branch 'aosp/upstream-master' into HEAD am: faa476c0caHEADandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/arm-trusted-firmware/+/1589611
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a25534ceed4f8e188510641080d8b8ed49b8f62
Diffstat (limited to 'plat/marvell/marvell.mk')
| -rw-r--r-- | plat/marvell/marvell.mk | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/plat/marvell/marvell.mk b/plat/marvell/marvell.mk index d8be0dd17..b6a2b9995 100644 --- a/plat/marvell/marvell.mk +++ b/plat/marvell/marvell.mk @@ -16,39 +16,6 @@ $(eval $(call add_define,MARVELL_SECURE_BOOT)) PALLADIUM := 0 $(eval $(call add_define,PALLADIUM)) -ifeq (${MARVELL_SECURE_BOOT},1) -DOIMAGE_SEC_FLAGS := -c $(DOIMAGE_SEC) -DOIMAGE_LIBS_CHECK = \ - if ! [ -d "/usr/include/mbedtls" ]; then \ - echo "****************************************" >&2; \ - echo "Missing mbedTLS installation! " >&2; \ - echo "Please download it from \"tls.mbed.org\"" >&2; \ - echo "Alternatively on Debian/Ubuntu system install" >&2; \ - echo "\"libmbedtls-dev\" package" >&2; \ - echo "Make sure to use version 2.1.0 or later" >&2; \ - echo "****************************************" >&2; \ - exit 1; \ - else if ! [ -f "/usr/include/libconfig.h" ]; then \ - echo "********************************************************" >&2; \ - echo "Missing Libconfig installation!" >&2; \ - echo "Please download it from \"www.hyperrealm.com/libconfig/\"" >&2; \ - echo "Alternatively on Debian/Ubuntu system install packages" >&2; \ - echo "\"libconfig8\" and \"libconfig8-dev\"" >&2; \ - echo "********************************************************" >&2; \ - exit 1; \ - fi \ - fi -else #MARVELL_SECURE_BOOT -DOIMAGE_LIBS_CHECK = -DOIMAGE_SEC_FLAGS = -endif #MARVELL_SECURE_BOOT - -mrvl_clean: - @echo " Doimage CLEAN" - ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${DOIMAGEPATH} clean - -${DOIMAGETOOL}: mrvl_clean - @$(DOIMAGE_LIBS_CHECK) - ${Q}${MAKE} --no-print-directory -C ${DOIMAGEPATH} VERSION=$(SUBVERSION) WTMI_IMG=$(WTMI_IMG) - - +# Set board to work with DDR 32bit +DDR32 := 0 +$(eval $(call add_define,DDR32)) |