MIRRORS/meta-rockchip
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-rockchip.git synced 2026-01-27 09:31:23 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use TF-A recipe from meta-arm

Browse Source 
Converts the build to pull the canonical TF-A recipe from meta-arm
instead of duplicating it in this layer.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
This commit is contained in:
Joshua Watt 2020-06-12 12:38:23 -05:00 committed by Trevor Woerner
parent 3a123838fd
commit d269803649
6 changed files with 16 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -11,6 +11,10 @@ Dependencies:
layers: meta
branch: matched branches (e.g. master, sumo, ...)
URI: git://git.yoctoproject.org/meta-arm
layers: meta-arm
branch: matched branches (e.g. master, sumo, ...)
Status of supported boards:
--------------------------
builds and boots wic image:

2
conf/layer.conf
View File

@ -15,4 +15,4 @@ BBFILE_PRIORITY_rockchip = "1"
# cause compatibility issues with other layers
LAYERVERSION_rockchip = "1"
LAYERSERIES_COMPAT_rockchip = "dunfell"
LAYERDEPENDS_rockchip = "core"
LAYERDEPENDS_rockchip = "core meta-arm"

5
conf/machine/include/rk3399.inc
View File

@ -13,9 +13,8 @@ KBUILD_DEFCONFIG ?= "defconfig"
KERNEL_CLASSES = "kernel-fitimage"
KERNEL_IMAGETYPE = "fitImage"
ATF_PLATFORM ?= "rk3399"
ATF_TARGET ?= "bl31"
ATF_SUFFIX ?= "elf"
TFA_PLATFORM = "rk3399"
TFA_BUILD_TARGET = "bl31"
UBOOT_SUFFIX ?= "itb"
UBOOT_ENTRYPOINT ?= "0x06000000"

43
recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.3.bb
View File

@ -1,43 +0,0 @@
# Copyright (C) 2019 Garmin Ltd. or its subsidaries
# Released under the MIT license (see COPYING.MIT for the terms)
SUMMARY = "Arm Trusted Firmware"
HOMEPAGE = "https://developer.trustedfirmware.org/"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
# Rockchip RK3399 compiles some M0 firmware which requires an arm-none-eabi GCC
# toolchain
DEPENDS_rk3399 = "virtual/arm-none-eabi-gcc"
PROVIDES = "virtual/atf"
BRANCH = "master"
SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=http;branch=${BRANCH} \
"
SRCREV = "8ff55a9e14a23d7c7f89f52465bcc6307850aa33"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
inherit deploy
ATF_SUFFIX ??= "bin"
do_compile() {
unset LDFLAGS
unset CFLAGS
unset CPPFLAGS
oe_runmake -C ${S} BUILD_BASE=${B} DEBUG=0 CROSS_COMPILE=${TARGET_PREFIX} \
PLAT=${ATF_PLATFORM} ${ATF_TARGET}
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
do_deploy() {
install -m 644 ${B}/${ATF_PLATFORM}/release/${ATF_TARGET}/${ATF_TARGET}.${ATF_SUFFIX} \
${DEPLOYDIR}/${ATF_TARGET}.${ATF_SUFFIX}
}
addtask deploy after do_compile

6
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend Normal file
View File

@ -0,0 +1,6 @@
# Rockchip RK3399 compiles some M0 firmware which requires an arm-none-eabi GCC
# toolchain
DEPENDS_append_rk3399 = " virtual/arm-none-eabi-gcc"
COMPATIBLE_MACHINE_append_rk3399 = "|rk3399"

6
recipes-bsp/u-boot/u-boot%.bbappend
View File

@ -7,8 +7,8 @@ do_compile_append_rock2-square () {
ATF_DEPENDS ??= ""
EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31.elf"
ATF_DEPENDS_rk3399 = "virtual/atf:do_deploy"
EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
ATF_DEPENDS_rk3399 = " virtual/trusted-firmware-a:do_deploy"
do_compile[depends] += "${ATF_DEPENDS}"
do_compile[depends] .= "${ATF_DEPENDS}"