Attachment 224088 Details for Bug 255038 – atf-marvell-gtk patch

[patch] atf-marvell-gtk patch

20210413-02-atf-marvell-gt8k.diff (text/plain), 4.98 KB, created by Bjoern A. Zeeb on 2021-04-13 18:48:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bjoern A. Zeeb

Created: 2021-04-13 18:48:55 UTC

Size: 4.98 KB

patch

obsolete

>diff --git sysutils/atf-marvell-gt8k/Makefile sysutils/atf-marvell-gt8k/Makefile
>new file mode 100644
>index 000000000000..b3a9963012d2
>--- /dev/null
>+++ sysutils/atf-marvell-gt8k/Makefile
>@@ -0,0 +1,36 @@
>+# $FreeBSD$
>+
>+MASTERDIR=	${.CURDIR}/../atf-master
>+
>+.if defined(BUILD_MCBIN)
>+IGNORE=		No U-Boot support yet for MACCHIATObin
>+PKGNAMESUFFIX=	-marvell_a80x0_mcbin
>+UBOOTDIR=	u-boot-MACCHIATObin
>+BUILD_DEPENDS+=	${BL33}:sysutils/u-boot-MACCHIATObin
>+.else
>+PKGNAMESUFFIX=	-marvell_a80x0_gt8k
>+UBOOTDIR=	u-boot-clearfog_gt_8k
>+BUILD_DEPENDS+=	${BL33}:sysutils/u-boot-clearfog-gt8k
>+.endif
>+
>+BUILD_DEPENDS+=	arm-none-eabi-gcc:devel/arm-none-eabi-gcc
>+
>+PLAT=		a80x0_mcbin
>+BL33=		${PREFIX}/share/u-boot/${UBOOTDIR}/u-boot.bin
>+
>+GH_TUPLE+=	MarvellEmbeddedProcessors:binaries-marvell:binaries-marvell-armada-18.12:mv_bin \
>+		MarvellEmbeddedProcessors:mv-ddr-marvell:mv-ddr-devel:mv_ddr
>+
>+MAKE_ARGS+=	HOSTCC="${CC}"
>+MAKE_ENV+=	BL33=${BL33}
>+MAKE_ENV+=	SCP_BL2=${WRKDIR}/binaries-marvell-binaries-marvell-armada-18.12/mrvl_scp_bl2.img
>+MAKE_ENV+=	MV_DDR_PATH=${WRKDIR}/mv-ddr-marvell-mv-ddr-devel
>+# Options based on https://github.com/SolidRun/clearfog-gt-8k-build/blob/master/buildme.sh
>+MAKE_ENV+=	USE_COHERENT_MEM=0 LOG_LEVEL=20 WORKAROUND_CVE_2018_3639=0
>+
>+ATF_BUILD_TARGETS=	all fip mrvl_flash
>+
>+_INSTDIR:=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
>+INSTALL_FILE=	flash-image.bin
>+
>+.include "${MASTERDIR}/Makefile"
>diff --git sysutils/atf-marvell-gt8k/pkg-descr sysutils/atf-marvell-gt8k/pkg-descr
>new file mode 100644
>index 000000000000..0e7a0f723513
>--- /dev/null
>+++ sysutils/atf-marvell-gt8k/pkg-descr
>@@ -0,0 +1,11 @@
>+Arm Trusted Framework for SoliDRun Marvell GT 8K SoCs.
>+
>+Trusted Firmware-A (TF-A) provides a reference implementation of secure world
>+software for Armv7-A and Armv8-A, including a Secure Monitor executing at
>+Exception Level 3 (EL3).
>+
>+To install this bootloader on an sdcard do similar to this:
>+dd if=/usr/local/share/atf-marvell_a80x0_gt8k/flash-image.bin of=/path/to/sdcard conv=sync bs=512 seek=1
>+
>+WWW: https://github.com/ARM-software/arm-trusted-firmware
>+WWW: https://www.solid-run.com/arm-servers-networking-platforms/macchiatobin/
>diff --git sysutils/atf-master/Makefile sysutils/atf-master/Makefile
>index 8abc5764eead..ef568c2e74b8 100644
>--- sysutils/atf-master/Makefile
>+++ sysutils/atf-master/Makefile
>@@ -21,12 +21,16 @@ GH_TAGNAME=	${ATF_VERSION}
> 
> SSP_UNSAFE=	yes
> MAKE_ENV+=	CROSS_COMPILE="aarch64-none-elf-"
>-ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 CFLAGS= bl31
>+ATF_BUILD_TARGETS?=	bl31
>+INSTALL_FILE?=	${BL31}
>+ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 CFLAGS= ${ATF_BUILD_TARGETS}
> 
> # Default to the latest release
> ATF_VERSION?=	v2.4
> 
>-PLIST_FILES?=	${PREFIX}/share/${PORTNAME}-${PLAT}/${BL31:T}
>+_INSTDIR?=	${PREFIX}/share/${PORTNAME}-${PLAT}
>+
>+PLIST_FILES?=	${_INSTDIR}/${INSTALL_FILE:T}
> 
> DESCR?=		${.CURDIR}/pkg-descr
> 
>@@ -38,8 +42,8 @@ IGNORE=		is a metaport; there is nothing to build
> .endif
> 
> do-install:
>-	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
>-	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
>+	${MKDIR} ${STAGEDIR}/${_INSTDIR}
>+	${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${INSTALL_FILE} ${STAGEDIR}/${_INSTDIR}/
> 	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README
> 
> .include <bsd.port.mk>
>diff --git sysutils/atf-master/distinfo sysutils/atf-master/distinfo
>index d1acd15798f3..7165dd54bdd4 100644
>--- sysutils/atf-master/distinfo
>+++ sysutils/atf-master/distinfo
>@@ -1,3 +1,7 @@
>-TIMESTAMP = 1606065143
>+TIMESTAMP = 1618013321
> SHA256 (ARM-software-arm-trusted-firmware-v2.4_GH0.tar.gz) = 4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d
> SIZE (ARM-software-arm-trusted-firmware-v2.4_GH0.tar.gz) = 4593582
>+SHA256 (MarvellEmbeddedProcessors-binaries-marvell-binaries-marvell-armada-18.12_GH0.tar.gz) = 1281a6198aba9da47be4cf66643e4bfdb9e64faaf3aaaeb15e3d16abe935de9c
>+SIZE (MarvellEmbeddedProcessors-binaries-marvell-binaries-marvell-armada-18.12_GH0.tar.gz) = 17529
>+SHA256 (MarvellEmbeddedProcessors-mv-ddr-marvell-mv-ddr-devel_GH0.tar.gz) = 0186fd677206ec15249c4bccb52b80b13f4082356675443e5aacbacf44d120a9
>+SIZE (MarvellEmbeddedProcessors-mv-ddr-marvell-mv-ddr-devel_GH0.tar.gz) = 383603
>diff --git sysutils/atf-master/files/patch-plat_marvell_armada_a8k_common_ble_ble.mk sysutils/atf-master/files/patch-plat_marvell_armada_a8k_common_ble_ble.mk
>new file mode 100644
>index 000000000000..bcf758ded451
>--- /dev/null
>+++ sysutils/atf-master/files/patch-plat_marvell_armada_a8k_common_ble_ble.mk
>@@ -0,0 +1,8 @@
>+--- plat/marvell/armada/a8k/common/ble/ble.mk.orig	2020-11-17 16:43:51 UTC
>++++ plat/marvell/armada/a8k/common/ble/ble.mk
>+@@ -29,4 +29,4 @@ BLE_LINKERFILE		:=	$(BLE_PATH)/ble.ld.S
>+ FORCE:
>+ 
>+ $(MV_DDR_LIB): FORCE
>+-	@+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(PLAT_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble
>++	@+${MAKE} -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(PLAT_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble

Actions: View | Diff

Attachments on bug 255038: 224088