diff options
Diffstat (limited to 'meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware')
3 files changed, 20 insertions, 10 deletions
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc index d64fad9cc..785f915ea 100644 --- a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc +++ b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc @@ -13,7 +13,7 @@ S = "${WORKDIR}/git" B = "${WORKDIR}/build" XILINX_RELEASE_VERSION ?= "" -ATF_VERSION ?= "1.4" +ATF_VERSION ?= "2.0" ATF_VERSION_EXTENSION ?= "-xilinx-${XILINX_RELEASE_VERSION}" PV = "${ATF_VERSION}${ATF_VERSION_EXTENSION}+git${SRCPV}" @@ -25,9 +25,12 @@ SRC_URI = "${REPO};${BRANCHARG}" ATF_BASE_NAME ?= "${PN}-${PKGE}-${PKGV}-${PKGR}-${DATETIME}" ATF_BASE_NAME[vardepsexclude] = "DATETIME" -COMPATIBLE_MACHINE = "zynqmp" -PLATFORM_zynqmp = "zynqmp" +COMPATIBLE_MACHINE ?= "^$" +COMPATIBLE_MACHINE_zynqmp = ".*" +COMPATIBLE_MACHINE_versal = ".*" +PLATFORM_zynqmp = "zynqmp" +PLATFORM_versal = "versal" # requires CROSS_COMPILE set by hand as there is no configure script export CROSS_COMPILE="${TARGET_PREFIX}" @@ -40,9 +43,13 @@ LD[unexport] = "1" ATF_CONSOLE ?= "" ATF_CONSOLE_zynqmp = "cadence" +ATF_CONSOLE_versal ?= "pl011" DEBUG ?= "" +DEBUG_versal ?= "1" + EXTRA_OEMAKE_zynqmp_append = "${@' ZYNQMP_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}" +EXTRA_OEMAKE_append_versal = "${@' VERSAL_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}" EXTRA_OEMAKE_append = " ${@bb.utils.contains('DEBUG', '1', ' DEBUG=${DEBUG}', '', d)}" OUTPUT_DIR = "${@bb.utils.contains('DEBUG', '1', '${B}/${PLATFORM}/debug', '${B}/${PLATFORM}/release', d)}" @@ -53,6 +60,9 @@ ATF_MEM_SIZE ?= "" EXTRA_OEMAKE_zynqmp_append = "${@' ZYNQMP_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}" EXTRA_OEMAKE_zynqmp_append = "${@' ZYNQMP_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}" +EXTRA_OEMAKE_append_versal = "${@' VERSAL_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}" +EXTRA_OEMAKE_append_versal = "${@' VERSAL_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}" + do_configure() { oe_runmake clean -C ${S} BUILD_BASE=${B} PLAT=${PLATFORM} } diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2018.3.bb b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2018.3.bb deleted file mode 100644 index 8c8a5d00c..000000000 --- a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2018.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -ATF_VERSION = "1.5" -XILINX_RELEASE_VERSION = "v2018.3" -BRANCH ?= "master" -SRCREV ?= "08560c36ea5b6f48b962cb4bd9a79b35bb3d95ce" - -include arm-trusted-firmware.inc - diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2019.1.bb b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2019.1.bb new file mode 100644 index 000000000..64cbddc4e --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2019.1.bb @@ -0,0 +1,7 @@ +ATF_VERSION = "2.0" +XILINX_RELEASE_VERSION = "v2019.1" +BRANCH ?= "master" +SRCREV ?= "80d1c79007fda42d4cc0be31b185a1da5799cd4d" + +include arm-trusted-firmware.inc + |