Add RockPi 4 support
cover Add RockPi 4 support
Add support for building the Raxada Rock Pi 4 development board
Joshua Watt (4):
arm-trusted-firmware: Add recipe
gcc-arm-none-eabi-native: Add recipe
rk3399: Add generic rk3399 support
rock-pi-4-rk3399: Add machine
conf/machine/include/rk3066.inc | 3 + conf/machine/include/rk3188.inc | 3 + conf/machine/include/rk3288.inc | 3 + conf/machine/include/rk3399.inc | 27 ++++++ conf/machine/include/rockchip-defaults.inc | 2 - conf/machine/rock-pi-4-rk3399.conf | 28 ++++++ ...hip-Prevent-macro-expansion-in-paths.patch | 94 +++++++++++++++++++ .../arm-trusted-firmware_2.2.bb | 44 +++++++++ recipes-bsp/u-boot/u-boot%.bbappend | 8 ++ ...cc-arm-none-eabi-native_9-2019-q4-major.bb | 37 ++++++++ recipes-graphics/mesa/mesa_%.bbappend | 1 + wic/rk3399-boot.wks | 24 +++++ wic/rock-pi-4-rk3399.wks | 7 ++ 13 files changed, 279 insertions(+), 2 deletions(-) create mode 100644 conf/machine/include/rk3399.inc create mode 100644 conf/machine/rock-pi-4-rk3399.conf create mode 100644 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware/0001-rockchip-Prevent-macro-expansion-in-paths.patch create mode 100644 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb create mode 100644 recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb create mode 100644 wic/rk3399-boot.wks create mode 100644 wic/rock-pi-4-rk3399.wks
Signature · 1 line
2.24.1
PATCH 1/4 arm-trusted-firmware: Add recipe
Adds a recipe to build Arm Trusted Firmware
--- .../arm-trusted-firmware_2.2.bb | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb
recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb new file +38 -0
@@ -0,0 +1,38 @@ +# 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" + +PROVIDES = "virtual/atf" + +BRANCH = "master" +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=http;branch=${BRANCH}" +SRCREV = "a04808c16cfc126d9fe572ae7c4b5a3d39de5796" + +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 +
Signature · 1 line
2.24.1
PATCH 2/4 gcc-arm-none-eabi-native: Add recipe
In reply to Joshua WattAdds a recipe to pull down the prebuilt GCC for compiling on Cortex-R and Cortex-M processors from ARM. This toolchain is required to build Arm Trusted Firmware for the Rockchip rk3399 SoC, since it must compile some firmware for the M0 coprocessor.
--- ...cc-arm-none-eabi-native_9-2019-q4-major.bb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb
recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb new file +37 -0
@@ -0,0 +1,37 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" + +PROVIDES = "virtual/arm-none-eabi-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/${BPN}-${PV}-x86_64-linux.tar.bz2" + +SRC_URI[md5sum] = "fe0029de4f4ec43cf7008944e34ff8cc" +SRC_URI[sha256sum] = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a" + +S = "${WORKDIR}/${BPN}-${PV}" + +inherit native + +COMPATIBLE_HOST = "x86_64.*-linux" + +do_install() { + install -d ${D}${datadir}/arm-none-eabi/ + cp -r ${S}/. ${D}${datadir}/arm-none-eabi/ + + install -d ${D}${bindir} + # Symlink all executables into bindir + for f in ${D}${datadir}/arm-none-eabi/bin/arm-none-eabi-*; do + lnr $f ${D}${bindir}/$(basename $f) + done +} + +INSANE_SKIP_${PN} = "already-stripped" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
Signature · 1 line
2.24.1
Re: [yocto][meta-rockchip][PATCH 2/4] gcc-arm-none-eabi-native: Add recipe
Quoted 6 lines · Joshua Watt
Adds a recipe to pull down the prebuilt GCC for compiling on Cortex-R and Cortex-M processors from ARM. This toolchain is required to build Arm Trusted Firmware for the Rockchip rk3399 SoC, since it must compile some firmware for the M0 coprocessor.
can this use mutliconfig ?
This seems then can be avoided
Quoted 53 lines
Signed-off-by Joshua Watt <[email protected]>--- ...cc-arm-none-eabi-native_9-2019-q4-major.bb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bbrecipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb new file +37
-1@@ -0,0 +1,37 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" + +PROVIDES = "virtual/arm-none-eabi-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/${BPN}-${PV}-x86_64-linux.tar.bz2" + +SRC_URI[md5sum] = "fe0029de4f4ec43cf7008944e34ff8cc" +SRC_URI[sha256sum] = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a" + +S = "${WORKDIR}/${BPN}-${PV}" + +inherit native + +COMPATIBLE_HOST = "x86_64.*-linux" + +do_install() { + install -d ${D}${datadir}/arm-none-eabi/ + cp -r ${S}/. ${D}${datadir}/arm-none-eabi/ + + install -d ${D}${bindir} + # Symlink all executables into bindir + for f in ${D}${datadir}/arm-none-eabi/bin/arm-none-eabi-*; do + lnr $f ${D}${bindir}/$(basename $f) + done +} + +INSANE_SKIP_${PN} = "already-stripped" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" --2.24.1
Re: [yocto][meta-rockchip][PATCH 2/4] gcc-arm-none-eabi-native: Add recipe
Quoted 8 lines · Khem Raj
Quoted 5 lines · Joshua Watt
Adds a recipe to pull down the prebuilt GCC for compiling on Cortex-R and Cortex-M processors from ARM. This toolchain is required to build Arm Trusted Firmware for the Rockchip rk3399 SoC, since it must compile some firmware for the M0 coprocessor.
can this use mutliconfig ?
This seems then can be avoided
I'm not sure if multiconfig is applicable in this case; This is required because the same recipe (arm-trusted-firmware) requires 2 different compilers to be available; the target compiler (aarch64-poky-linux), and an arm-none-eabi-gcc compiler specifically to compile some M0 firmware that goes into ATF.
Multiconfig would work (I think), if the recipe only needed one or the other, but not in this case where it needs both.
I also looked at building an additional gcc-cross recipe that explicitly targets arm-none-eabi, but the maintenance was going to be a pain unless A) the recipe lived in OE-core or B) this layer copied all of the GCC recipes. Neither of those was appealing at the moment, but I plan on revisiting it. Even when I did have it in OE-core, I had some trouble with some manifest warnings, so I'm not quite sure I was doing it correctly.
Quoted 54 lines
Quoted 54 lines
Signed-off-by Joshua Watt <[email protected]>--- ...cc-arm-none-eabi-native_9-2019-q4-major.bb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+)create mode 100644 recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb
recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb new file +37
-1@@ -0,0 +1,37 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" + +PROVIDES = "virtual/arm-none-eabi-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/${BPN}-${PV}-x86_64-linux.tar.bz2" + +SRC_URI[md5sum] = "fe0029de4f4ec43cf7008944e34ff8cc" +SRC_URI[sha256sum] = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a" + +S = "${WORKDIR}/${BPN}-${PV}" + +inherit native + +COMPATIBLE_HOST = "x86_64.*-linux" + +do_install() { + install -d ${D}${datadir}/arm-none-eabi/ + cp -r ${S}/. ${D}${datadir}/arm-none-eabi/ + + install -d ${D}${bindir} + # Symlink all executables into bindir + for f in ${D}${datadir}/arm-none-eabi/bin/arm-none-eabi-*; do + lnr $f ${D}${bindir}/$(basename $f) + done +} + +INSANE_SKIP_${PN} = "already-stripped" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" --2.24.1
Re: [yocto][meta-rockchip][PATCH 2/4] gcc-arm-none-eabi-native: Add recipe
Quoted 12 lines · Joshua Watt
Quoted 8 lines · Khem Raj
Quoted 5 lines · Joshua Watt
Adds a recipe to pull down the prebuilt GCC for compiling on Cortex-R and Cortex-M processors from ARM. This toolchain is required to build Arm Trusted Firmware for the Rockchip rk3399 SoC, since it must compile some firmware for the M0 coprocessor.
can this use mutliconfig ?
This seems then can be avoided
Quoted 8 lines
I'm not sure if multiconfig is applicable in this case; This is required because the same recipe (arm-trusted-firmware) requires 2 different compilers to be available; the target compiler (aarch64-poky-linux), and an arm-none-eabi-gcc compiler specifically to compile some M0 firmware that goes into ATF.
Multiconfig would work (I think), if the recipe only needed one or the other, but not in this case where it needs both.
right, so question is if this recipe can be effectively two such recipes. If not then perhaps this solution is ok or perhaps we can just use prebuilts for the M0
Quoted 62 lines
I also looked at building an additional gcc-cross recipe that explicitly targets arm-none-eabi, but the maintenance was going to be a pain unless
A) the recipe lived in OE-core or B) this layer copied all of the GCC recipes. Neither of those was appealing at the moment, but I plan on revisiting it. Even when I did have it in OE-core, I had some trouble with some manifest warnings, so I'm not quite sure I was doing it correctly.Quoted 54 lines
Quoted 54 lines
Signed-off-by Joshua Watt <[email protected]>--- ...cc-arm-none-eabi-native_9-2019-q4-major.bb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+)create mode 100644 recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb
recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb new file +37
-1@@ -0,0 +1,37 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" + +PROVIDES = "virtual/arm-none-eabi-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/${BPN}-${PV}-x86_64-linux.tar.bz2" + +SRC_URI[md5sum] = "fe0029de4f4ec43cf7008944e34ff8cc" +SRC_URI[sha256sum] = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a" + +S = "${WORKDIR}/${BPN}-${PV}" + +inherit native + +COMPATIBLE_HOST = "x86_64.*-linux" + +do_install() { + install -d ${D}${datadir}/arm-none-eabi/ + cp -r ${S}/. ${D}${datadir}/arm-none-eabi/ + + install -d ${D}${bindir} + # Symlink all executables into bindir + for f in ${D}${datadir}/arm-none-eabi/bin/arm-none-eabi-*; do + lnr $f ${D}${bindir}/$(basename $f) + done +} + +INSANE_SKIP_${PN} = "already-stripped" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" --2.24.1
Re: [yocto][meta-rockchip][PATCH 2/4] gcc-arm-none-eabi-native: Add recipe
Quoted 17 lines · Khem Raj
Quoted 16 lines · Joshua Watt
Quoted 8 lines · Khem Raj
Quoted 5 lines · Joshua Watt
Adds a recipe to pull down the prebuilt GCC for compiling on Cortex-R and Cortex-M processors from ARM. This toolchain is required to build Arm Trusted Firmware for the Rockchip rk3399 SoC, since it must compile some firmware for the M0 coprocessor.
can this use mutliconfig ?
This seems then can be avoidedI'm not sure if multiconfig is applicable in this case; This is required because the same recipe (arm-trusted-firmware) requires 2 different compilers to be available; the target compiler (aarch64-poky-linux), and an arm-none-eabi-gcc compiler specifically to compile some M0 firmware that goes into ATF.
Quoted 4 lines
Quoted 2 lines
Multiconfig would work (I think), if the recipe only needed one or the other, but not in this case where it needs both.
right, so question is if this recipe can be effectively two such recipes. If not then perhaps this solution is ok or perhaps we can just use prebuilts for the M0
It *might* be possible to build it in two passes, but I'd rather not because its not the way the ATF is intended to be built. The code currently expects that it can build with the arm-none-eabi-gcc, so anything thing we do differently is more likely to break. Right now, the AFT recipe should be pretty easy to maintain; breaking it apart will make it quite a bit more complicated.
I'd rather have a prebuilt (for now) GCC building some firmware from source that download a prebuilt firmware image :)
Like I said, long term I'd like to build up the arm-none-eabi-gcc from gcc-cross in OE-core, I just haven't figured out the best way to do that yet.
Quoted 61 lines
Quoted 61 lines
I also looked at building an additional gcc-cross recipe that explicitly targets arm-none-eabi, but the maintenance was going to be a pain unless
A) the recipe lived in OE-core or B) this layer copied all of the GCC recipes. Neither of those was appealing at the moment, but I plan on revisiting it. Even when I did have it in OE-core, I had some trouble with some manifest warnings, so I'm not quite sure I was doing it correctly.Quoted 53 lines
Quoted 53 lines
Signed-off-by Joshua Watt <[email protected]>--- ...cc-arm-none-eabi-native_9-2019-q4-major.bb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+)create mode 100644 recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb
recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb new file +37
-1@@ -0,0 +1,37 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" + +PROVIDES = "virtual/arm-none-eabi-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/${BPN}-${PV}-x86_64-linux.tar.bz2" + +SRC_URI[md5sum] = "fe0029de4f4ec43cf7008944e34ff8cc" +SRC_URI[sha256sum] = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a" + +S = "${WORKDIR}/${BPN}-${PV}" + +inherit native + +COMPATIBLE_HOST = "x86_64.*-linux" + +do_install() { + install -d ${D}${datadir}/arm-none-eabi/ + cp -r ${S}/. ${D}${datadir}/arm-none-eabi/ + + install -d ${D}${bindir} + # Symlink all executables into bindir + for f in ${D}${datadir}/arm-none-eabi/bin/arm-none-eabi-*; do + lnr $f ${D}${bindir}/$(basename $f) + done +} + +INSANE_SKIP_${PN} = "already-stripped" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" --2.24.1
Re: [yocto][meta-rockchip][PATCH 2/4] gcc-arm-none-eabi-native: Add recipe
Quoted 31 lines · Joshua Watt
Quoted 17 lines · Khem Raj
Quoted 16 lines · Joshua Watt
Quoted 8 lines · Khem Raj
Quoted 5 lines · Joshua Watt
Adds a recipe to pull down the prebuilt GCC for compiling on Cortex-R and Cortex-M processors from ARM. This toolchain is required to build Arm Trusted Firmware for the Rockchip rk3399 SoC, since it must compile some firmware for the M0 coprocessor.
can this use mutliconfig ?
This seems then can be avoidedI'm not sure if multiconfig is applicable in this case; This is required because the same recipe (arm-trusted-firmware) requires 2 different compilers to be available; the target compiler (aarch64-poky-linux), and an arm-none-eabi-gcc compiler specifically to compile some M0 firmware that goes into ATF.
Quoted 4 lines
Quoted 2 lines
Multiconfig would work (I think), if the recipe only needed one or the other, but not in this case where it needs both.
right, so question is if this recipe can be effectively two such recipes. If not then perhaps this solution is ok or perhaps we can just use prebuilts for the M0
It *might* be possible to build it in two passes, but I'd rather not because its not the way the ATF is intended to be built. The code currently expects that it can build with the arm-none-eabi-gcc, so anything thing we do differently is more likely to break. Right now, the AFT recipe should be pretty easy to maintain; breaking it apart will make it quite a bit more complicated.
Quoted 6 lines
I'd rather have a prebuilt (for now) GCC building some firmware from source that download a prebuilt firmware image :)
Like I said, long term I'd like to build up the arm-none-eabi-gcc from gcc-cross in OE-core, I just haven't figured out the best way to do that yet.
Ha, this is quite familiar as well! We had these gcc-arm-none-eabi-native and other recipes in meta-ti for compiling different pieces for secondary cores in our SoCs - MCUs, DSPs, etc. That was way before multiconfig was available.
Recently I was looking into converting the old model into multiconfig - there was a discussion with fray last month regarding this and he posted a more generic proposal to oe-architecture list. I still need to get back to that activity - kind of got busy after the holidays...
Signature · 1 line
Denys
Quoted 62 lines
Quoted 60 lines
Quoted 60 lines
I also looked at building an additional gcc-cross recipe that explicitly targets arm-none-eabi, but the maintenance was going to be a pain unless
A) the recipe lived in OE-core or B) this layer copied all of the GCC recipes. Neither of those was appealing at the moment, but I plan on revisiting it. Even when I did have it in OE-core, I had some trouble with some manifest warnings, so I'm not quite sure I was doing it correctly.Quoted 53 lines
Quoted 53 lines
Signed-off-by Joshua Watt <[email protected]>--- ...cc-arm-none-eabi-native_9-2019-q4-major.bb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+)create mode 100644 recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb
recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb new file +37
-1@@ -0,0 +1,37 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" + +PROVIDES = "virtual/arm-none-eabi-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/${BPN}-${PV}-x86_64-linux.tar.bz2" + +SRC_URI[md5sum] = "fe0029de4f4ec43cf7008944e34ff8cc" +SRC_URI[sha256sum] = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a" + +S = "${WORKDIR}/${BPN}-${PV}" + +inherit native + +COMPATIBLE_HOST = "x86_64.*-linux" + +do_install() { + install -d ${D}${datadir}/arm-none-eabi/ + cp -r ${S}/. ${D}${datadir}/arm-none-eabi/ + + install -d ${D}${bindir} + # Symlink all executables into bindir + for f in ${D}${datadir}/arm-none-eabi/bin/arm-none-eabi-*; do + lnr $f ${D}${bindir}/$(basename $f) + done +} + +INSANE_SKIP_${PN} = "already-stripped" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" --2.24.1
Re: [yocto][meta-rockchip][PATCH 2/4] gcc-arm-none-eabi-native: Add recipe
In reply to Joshua WattI know you have a working solution, however, I was thinking if we want ATF to work well with yocto build system and therefore might require better re-architecting upstream. Since arm and aarch32 backends are different you will need two compiler backends essentially, it wont work like x86 could work. So perhaps its best for ATF to build these components separately ot atleast have possibility to do so.
Quoted 101 lines · Joshua Watt
Quoted 17 lines · Khem Raj
Quoted 16 lines · Joshua Watt
Quoted 8 lines · Khem Raj
Quoted 5 lines · Joshua Watt
Adds a recipe to pull down the prebuilt GCC for compiling on Cortex-R and Cortex-M processors from ARM. This toolchain is required to build Arm Trusted Firmware for the Rockchip rk3399 SoC, since it must compile some firmware for the M0 coprocessor.
can this use mutliconfig ?
This seems then can be avoidedI'm not sure if multiconfig is applicable in this case; This is required because the same recipe (arm-trusted-firmware) requires 2 different compilers to be available; the target compiler (aarch64-poky-linux), and an arm-none-eabi-gcc compiler specifically to compile some M0 firmware that goes into ATF.
Quoted 4 lines
Quoted 2 lines
Multiconfig would work (I think), if the recipe only needed one or the other, but not in this case where it needs both.
right, so question is if this recipe can be effectively two such recipes. If not then perhaps this solution is ok or perhaps we can just use prebuilts for the M0
It *might* be possible to build it in two passes, but I'd rather not because its not the way the ATF is intended to be built. The code currently expects that it can build with the arm-none-eabi-gcc, so anything thing we do differently is more likely to break. Right now, the AFT recipe should be pretty easy to maintain; breaking it apart will make it quite a bit more complicated.
I'd rather have a prebuilt (for now) GCC building some firmware from source that download a prebuilt firmware image :)
Like I said, long term I'd like to build up the arm-none-eabi-gcc from gcc-cross in OE-core, I just haven't figured out the best way to do that yet.
Quoted 61 lines
Quoted 61 lines
I also looked at building an additional gcc-cross recipe that explicitly targets arm-none-eabi, but the maintenance was going to be a pain unless
A) the recipe lived in OE-core or B) this layer copied all of the GCC recipes. Neither of those was appealing at the moment, but I plan on revisiting it. Even when I did have it in OE-core, I had some trouble with some manifest warnings, so I'm not quite sure I was doing it correctly.Quoted 53 lines
Quoted 53 lines
Signed-off-by Joshua Watt <[email protected]>--- ...cc-arm-none-eabi-native_9-2019-q4-major.bb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+)create mode 100644 recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb
recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb new file +37
-1@@ -0,0 +1,37 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" + +PROVIDES = "virtual/arm-none-eabi-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/${BPN}-${PV}-x86_64-linux.tar.bz2" + +SRC_URI[md5sum] = "fe0029de4f4ec43cf7008944e34ff8cc" +SRC_URI[sha256sum] = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a" + +S = "${WORKDIR}/${BPN}-${PV}" + +inherit native + +COMPATIBLE_HOST = "x86_64.*-linux" + +do_install() { + install -d ${D}${datadir}/arm-none-eabi/ + cp -r ${S}/. ${D}${datadir}/arm-none-eabi/ + + install -d ${D}${bindir} + # Symlink all executables into bindir + for f in ${D}${datadir}/arm-none-eabi/bin/arm-none-eabi-*; do + lnr $f ${D}${bindir}/$(basename $f) + done +} + +INSANE_SKIP_${PN} = "already-stripped" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" --2.24.1
PATCH 3/4 rk3399: Add generic rk3399 support
In reply to Joshua WattAdds support for the rk3399 SoC. Notably:
*) Split out the default kernel config and image type from
rockchip-defaults.inc now that not all support chips are ARMv7
*) Apply a patch to Arm Trusted Firmware to fix a compile issue *) Arm Trusted Firmware requires the arm-none-eabi-native compiler to
compile the M0 firmware.
*) Modify u-boot to pull in the ATF files when compiling *) The rk3399 is support by the panfrost driver in mesa, so enable it
--- conf/machine/include/rk3066.inc | 3 + conf/machine/include/rk3188.inc | 3 + conf/machine/include/rk3288.inc | 3 + conf/machine/include/rk3399.inc | 27 ++++++ conf/machine/include/rockchip-defaults.inc | 2 - ...hip-Prevent-macro-expansion-in-paths.patch | 94 +++++++++++++++++++ .../arm-trusted-firmware_2.2.bb | 8 +- recipes-bsp/u-boot/u-boot%.bbappend | 8 ++ recipes-graphics/mesa/mesa_%.bbappend | 1 + wic/rk3399-boot.wks | 24 +++++ 10 files changed, 170 insertions(+), 3 deletions(-) create mode 100644 conf/machine/include/rk3399.inc create mode 100644 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware/0001-rockchip-Prevent-macro-expansion-in-paths.patch create mode 100644 wic/rk3399-boot.wks
conf/machine/include/rk3066.inc +3 -0
@@ -6,3 +6,6 @@ SOC_FAMILY = "rk3066" require conf/machine/include/tune-cortexa9.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc + +KBUILD_DEFCONFIG = "multi_v7_defconfig" +KERNEL_IMAGETYPE = "zImage"
conf/machine/include/rk3188.inc +3 -0
@@ -6,3 +6,6 @@ SOC_FAMILY = "rk3188" require conf/machine/include/tune-cortexa9.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc + +KBUILD_DEFCONFIG = "multi_v7_defconfig" +KERNEL_IMAGETYPE = "zImage"
conf/machine/include/rk3288.inc +3 -0
@@ -7,6 +7,9 @@ require conf/machine/include/tune-cortexa17.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc +KBUILD_DEFCONFIG = "multi_v7_defconfig" +KERNEL_IMAGETYPE = "zImage" + SERIAL_CONSOLES = "115200;ttyS2" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
conf/machine/include/rk3399.inc new file +27 -0
@@ -0,0 +1,27 @@ +# Copyright (C) 2020 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +SOC_FAMILY = "rk3399" + +DEFAULTTUNE ?= "cortexa72-cortexa53-crypto" + +require conf/machine/include/tune-cortexa72-cortexa53.inc +require conf/machine/include/soc-family.inc +require conf/machine/include/rockchip-defaults.inc + +KBUILD_DEFCONFIG ?= "defconfig" +KERNEL_CLASSES = "kernel-fitimage" +KERNEL_IMAGETYPE = "fitImage" + +ATF_PLATFORM ?= "rk3399" +ATF_TARGET ?= "bl31" +ATF_SUFFIX ?= "elf" + +UBOOT_SUFFIX ?= "itb" +UBOOT_ENTRYPOINT ?= "0x06000000" + +SERIAL_CONSOLES = "115200;ttyS2" + +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +SPL_BINARY ?= "idbloader.img" +
conf/machine/include/rockchip-defaults.inc +0 -2
@@ -3,8 +3,6 @@ # kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable" LINUX_VERSION_EXTENSION ?= "-rockchip" -KBUILD_DEFCONFIG = "multi_v7_defconfig" -KERNEL_IMAGETYPE = "zImage" # xserver PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
recipes-bsp/arm-trusted-firmware/arm-trusted-firmware/0001-rockchip-Prevent-macro-expansion-in-paths.patch new file +94 -0
94 lines not on this page · raw message
recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb +7 -1
@@ -6,10 +6,16 @@ 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}" +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=http;branch=${BRANCH} \ + file://0001-rockchip-Prevent-macro-expansion-in-paths.patch \ + " SRCREV = "a04808c16cfc126d9fe572ae7c4b5a3d39de5796" S = "${WORKDIR}/git"
recipes-bsp/u-boot/u-boot%.bbappend +8 -0
@@ -4,3 +4,11 @@ do_compile_append_rock2-square () { cp ${B}/spl/${SPL_BINARY} ${B} fi } + +ATF_DEPENDS ??= "" + +EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31.elf" +ATF_DEPENDS_rk3399 = "virtual/atf:do_deploy" + +do_compile[depends] += "${ATF_DEPENDS}" +
recipes-graphics/mesa/mesa_%.bbappend +1 -0
@@ -1 +1,2 @@ PACKAGECONFIG_append_rk3288 = " kmsro panfrost" +PACKAGECONFIG_append_rk3399 = " kmsro panfrost"
wic/rk3399-boot.wks new file +24 -0
@@ -0,0 +1,24 @@ +# Copyright (C) 2020 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) +# +# Disk layout +# Note that the reference documentation refers to 512 byte disk sectors, but +# wic uses 1KB blocks +# +# Partition Start Sector Number of Sectors +# loader1 64 8000 +# reserved1 8064 128 +# reserved2 8192 8192 +# loader2 16384 8192 +# atf 24576 8192 +# boot 32768 229376 +# root 262144 - +# + +part loader1 --align 32 --size 4000K --source rawcopy --sourceparams="file=idbloader.img" +part reserved1 --align 4032 --size 64K +part reserved2 --align 4096 --size 4096K +part loader2 --align 8192 --size 4096K --source rawcopy --sourceparams="file=u-boot.itb" +part atf --align 12288 --size 4096K +part /boot --align 16384 --size=114688K --active --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot" +
Signature · 1 line
2.24.1
PATCH 4/4 rock-pi-4-rk3399: Add machine
In reply to Joshua WattAdds the machine definition for the Rock Pi 4 based around the RK3399 SoC.
--- conf/machine/rock-pi-4-rk3399.conf | 28 ++++++++++++++++++++++++++++ wic/rock-pi-4-rk3399.wks | 7 +++++++ 2 files changed, 35 insertions(+) create mode 100644 conf/machine/rock-pi-4-rk3399.conf create mode 100644 wic/rock-pi-4-rk3399.wks
conf/machine/rock-pi-4-rk3399.conf new file +28 -0
@@ -0,0 +1,28 @@ +# Copyright (C) 2020 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +#@TYPE: Machine +#@NAME: Rock Pi 4 RK3288 +#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor. + +require conf/machine/include/rk3399.inc + +KERNEL_DEVICETREE = "rockchip/rk3399-rock-pi-4.dtb" +UBOOT_MACHINE = "rock-pi-4-rk3399_defconfig" + +WKS_FILE ?= "rock-pi-4-rk3399.wks" +IMAGE_FSTYPES += "wic wic.bmap" + +WKS_FILE_DEPENDS ?= " \ + mtools-native \ + dosfstools-native \ + virtual/bootloader \ + virtual/kernel \ + " +IMAGE_BOOT_FILES ?= "\ + ${KERNEL_IMAGETYPE} \ + " + +SERIAL_CONSOLES = "1500000;ttyS2" + +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
wic/rock-pi-4-rk3399.wks new file +7 -0
@@ -0,0 +1,7 @@ +# Copyright (C) 2020 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +include rk3399-boot.wks +part / --align 131072 --source rootfs --fstype=ext4 --label root + +bootloader --ptable gpt --append="console=tty1 console=ttyS2,1500000n8 rw root=/dev/mmcblk1p7 rootfstype=ext4 init=/sbin/init"
Signature · 1 line
2.24.1
v2 cover Add Rock Pi 4 Support
In reply to Joshua WattAdd support for building the Raxada Rock Pi 4 development board
V2: Machine has been renamed "rock-pi-4" to match the manufacturers name
Joshua Watt (4):
arm-trusted-firmware: Add recipe
gcc-arm-none-eabi-native: Add recipe
rk3399: Add generic rk3399 support
rock-pi-4: Add machine
README | 1 + conf/machine/include/rk3066.inc | 3 + conf/machine/include/rk3188.inc | 3 + conf/machine/include/rk3288.inc | 3 + conf/machine/include/rk3399.inc | 27 ++++++ conf/machine/include/rockchip-defaults.inc | 2 - conf/machine/rock-pi-4.conf | 28 ++++++ ...hip-Prevent-macro-expansion-in-paths.patch | 94 +++++++++++++++++++ .../arm-trusted-firmware_2.2.bb | 44 +++++++++ recipes-bsp/u-boot/u-boot%.bbappend | 8 ++ ...cc-arm-none-eabi-native_9-2019-q4-major.bb | 37 ++++++++ recipes-graphics/mesa/mesa_%.bbappend | 1 + wic/rk3399-boot.wks | 24 +++++ wic/rock-pi-4.wks | 7 ++ 14 files changed, 280 insertions(+), 2 deletions(-) create mode 100644 conf/machine/include/rk3399.inc create mode 100644 conf/machine/rock-pi-4.conf create mode 100644 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware/0001-rockchip-Prevent-macro-expansion-in-paths.patch create mode 100644 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb create mode 100644 recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb create mode 100644 wic/rk3399-boot.wks create mode 100644 wic/rock-pi-4.wks
Signature · 1 line
2.24.1
PATCH v2 1/4 arm-trusted-firmware: Add recipe
Adds a recipe to build Arm Trusted Firmware
--- .../arm-trusted-firmware_2.2.bb | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb
recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb new file +38 -0
@@ -0,0 +1,38 @@ +# 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" + +PROVIDES = "virtual/atf" + +BRANCH = "master" +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=http;branch=${BRANCH}" +SRCREV = "a04808c16cfc126d9fe572ae7c4b5a3d39de5796" + +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 +
Signature · 1 line
2.24.1
Re: [yocto][meta-rockchip][PATCH v2 1/4] arm-trusted-firmware: Add recipe
Heh, I've been sitting on arm-trusted-firmware recipe in meta-ti for some time[1], wondering if I should submit it to oe-core, as it's being used more widely among arm64 platforms these days...
I know each SoC/platform has few customizations on top of generic ATF/TF-A, but we can probably have a common base in oe-core and then add our own pieces on top in each BSP layer.
I already had some preliminary work done in making the recipe more generic, but after seeing your version here, I borrowed couple things. Would you mind if I submit that to oe-core and we can beef it up as needed to be usable as a common base for differen BSPs, if accepted to oe-core?
[Though, I'm not a big fan of vanity copyright banners, but I can add your SoB line, if needed.]
Denys
Quoted 57 lines · Joshua Watt
Adds a recipe to build Arm Trusted Firmware
Signed-off-by Joshua Watt <[email protected]>--- .../arm-trusted-firmware_2.2.bb | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bbrecipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb new file +38
-0@@ -0,0 +1,38 @@ +# 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" + +PROVIDES = "virtual/atf" + +BRANCH = "master" +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=http;branch=${BRANCH}" +SRCREV = "a04808c16cfc126d9fe572ae7c4b5a3d39de5796" + +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 +Signature · 1 line
2.24.1
PATCH v2 2/4 gcc-arm-none-eabi-native: Add recipe
In reply to Joshua WattAdds a recipe to pull down the prebuilt GCC for compiling on Cortex-R and Cortex-M processors from ARM. This toolchain is required to build Arm Trusted Firmware for the Rockchip rk3399 SoC, since it must compile some firmware for the M0 coprocessor.
--- ...cc-arm-none-eabi-native_9-2019-q4-major.bb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb
recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9-2019-q4-major.bb new file +37 -0
@@ -0,0 +1,37 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" + +PROVIDES = "virtual/arm-none-eabi-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/${BPN}-${PV}-x86_64-linux.tar.bz2" + +SRC_URI[md5sum] = "fe0029de4f4ec43cf7008944e34ff8cc" +SRC_URI[sha256sum] = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a" + +S = "${WORKDIR}/${BPN}-${PV}" + +inherit native + +COMPATIBLE_HOST = "x86_64.*-linux" + +do_install() { + install -d ${D}${datadir}/arm-none-eabi/ + cp -r ${S}/. ${D}${datadir}/arm-none-eabi/ + + install -d ${D}${bindir} + # Symlink all executables into bindir + for f in ${D}${datadir}/arm-none-eabi/bin/arm-none-eabi-*; do + lnr $f ${D}${bindir}/$(basename $f) + done +} + +INSANE_SKIP_${PN} = "already-stripped" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
Signature · 1 line
2.24.1
PATCH v2 3/4 rk3399: Add generic rk3399 support
In reply to Joshua WattAdds support for the rk3399 SoC. Notably:
*) Split out the default kernel config and image type from
rockchip-defaults.inc now that not all support chips are ARMv7
*) Apply a patch to Arm Trusted Firmware to fix a compile issue *) Arm Trusted Firmware requires the arm-none-eabi-native compiler to
compile the M0 firmware.
*) Modify u-boot to pull in the ATF files when compiling *) The rk3399 is support by the panfrost driver in mesa, so enable it
--- conf/machine/include/rk3066.inc | 3 + conf/machine/include/rk3188.inc | 3 + conf/machine/include/rk3288.inc | 3 + conf/machine/include/rk3399.inc | 27 ++++++ conf/machine/include/rockchip-defaults.inc | 2 - ...hip-Prevent-macro-expansion-in-paths.patch | 94 +++++++++++++++++++ .../arm-trusted-firmware_2.2.bb | 8 +- recipes-bsp/u-boot/u-boot%.bbappend | 8 ++ recipes-graphics/mesa/mesa_%.bbappend | 1 + wic/rk3399-boot.wks | 24 +++++ 10 files changed, 170 insertions(+), 3 deletions(-) create mode 100644 conf/machine/include/rk3399.inc create mode 100644 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware/0001-rockchip-Prevent-macro-expansion-in-paths.patch create mode 100644 wic/rk3399-boot.wks
conf/machine/include/rk3066.inc +3 -0
@@ -6,3 +6,6 @@ SOC_FAMILY = "rk3066" require conf/machine/include/tune-cortexa9.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc + +KBUILD_DEFCONFIG = "multi_v7_defconfig" +KERNEL_IMAGETYPE = "zImage"
conf/machine/include/rk3188.inc +3 -0
@@ -6,3 +6,6 @@ SOC_FAMILY = "rk3188" require conf/machine/include/tune-cortexa9.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc + +KBUILD_DEFCONFIG = "multi_v7_defconfig" +KERNEL_IMAGETYPE = "zImage"
conf/machine/include/rk3288.inc +3 -0
@@ -7,6 +7,9 @@ require conf/machine/include/tune-cortexa17.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc +KBUILD_DEFCONFIG = "multi_v7_defconfig" +KERNEL_IMAGETYPE = "zImage" + SERIAL_CONSOLES = "115200;ttyS2" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
conf/machine/include/rk3399.inc new file +27 -0
@@ -0,0 +1,27 @@ +# Copyright (C) 2020 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +SOC_FAMILY = "rk3399" + +DEFAULTTUNE ?= "cortexa72-cortexa53-crypto" + +require conf/machine/include/tune-cortexa72-cortexa53.inc +require conf/machine/include/soc-family.inc +require conf/machine/include/rockchip-defaults.inc + +KBUILD_DEFCONFIG ?= "defconfig" +KERNEL_CLASSES = "kernel-fitimage" +KERNEL_IMAGETYPE = "fitImage" + +ATF_PLATFORM ?= "rk3399" +ATF_TARGET ?= "bl31" +ATF_SUFFIX ?= "elf" + +UBOOT_SUFFIX ?= "itb" +UBOOT_ENTRYPOINT ?= "0x06000000" + +SERIAL_CONSOLES = "115200;ttyS2" + +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +SPL_BINARY ?= "idbloader.img" +
conf/machine/include/rockchip-defaults.inc +0 -2
@@ -3,8 +3,6 @@ # kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable" LINUX_VERSION_EXTENSION ?= "-rockchip" -KBUILD_DEFCONFIG = "multi_v7_defconfig" -KERNEL_IMAGETYPE = "zImage" # xserver PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
recipes-bsp/arm-trusted-firmware/arm-trusted-firmware/0001-rockchip-Prevent-macro-expansion-in-paths.patch new file +94 -0
94 lines not on this page · raw message
recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb +7 -1
@@ -6,10 +6,16 @@ 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}" +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=http;branch=${BRANCH} \ + file://0001-rockchip-Prevent-macro-expansion-in-paths.patch \ + " SRCREV = "a04808c16cfc126d9fe572ae7c4b5a3d39de5796" S = "${WORKDIR}/git"
recipes-bsp/u-boot/u-boot%.bbappend +8 -0
@@ -4,3 +4,11 @@ do_compile_append_rock2-square () { cp ${B}/spl/${SPL_BINARY} ${B} fi } + +ATF_DEPENDS ??= "" + +EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31.elf" +ATF_DEPENDS_rk3399 = "virtual/atf:do_deploy" + +do_compile[depends] += "${ATF_DEPENDS}" +
recipes-graphics/mesa/mesa_%.bbappend +1 -0
@@ -1 +1,2 @@ PACKAGECONFIG_append_rk3288 = " kmsro panfrost" +PACKAGECONFIG_append_rk3399 = " kmsro panfrost"
wic/rk3399-boot.wks new file +24 -0
@@ -0,0 +1,24 @@ +# Copyright (C) 2020 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) +# +# Disk layout +# Note that the reference documentation refers to 512 byte disk sectors, but +# wic uses 1KB blocks +# +# Partition Start Sector Number of Sectors +# loader1 64 8000 +# reserved1 8064 128 +# reserved2 8192 8192 +# loader2 16384 8192 +# atf 24576 8192 +# boot 32768 229376 +# root 262144 - +# + +part loader1 --align 32 --size 4000K --source rawcopy --sourceparams="file=idbloader.img" +part reserved1 --align 4032 --size 64K +part reserved2 --align 4096 --size 4096K +part loader2 --align 8192 --size 4096K --source rawcopy --sourceparams="file=u-boot.itb" +part atf --align 12288 --size 4096K +part /boot --align 16384 --size=114688K --active --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot" +
Signature · 1 line
2.24.1
PATCH v2 4/4 rock-pi-4: Add machine
In reply to Joshua WattAdds the machine definition for the Rock Pi 4 based around the RK3399 SoC.
--- README | 1 + conf/machine/rock-pi-4.conf | 28 ++++++++++++++++++++++++++++ wic/rock-pi-4.wks | 7 +++++++ 3 files changed, 36 insertions(+) create mode 100644 conf/machine/rock-pi-4.conf create mode 100644 wic/rock-pi-4.wks
README +1 -0
@@ -14,6 +14,7 @@ Dependencies: Status of supported boards: -------------------------- builds and boots gpt image: + rock-pi-4 tinker-rk3288 vyasa-rk3288 firefly-rk3288
conf/machine/rock-pi-4.conf new file +28 -0
@@ -0,0 +1,28 @@ +# Copyright (C) 2020 Garmin Ltd. or its subsidaries +# Released under the MIT license (see COPYING.MIT for the terms) + +#@TYPE: Machine +#@NAME: Rock Pi 4 RK3288 +#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor. + +require conf/machine/include/rk3399.inc + +KERNEL_DEVICETREE = "rockchip/rk3399-rock-pi-4.dtb" +UBOOT_MACHINE = "rock-pi-4-rk3399_defconfig" + +WKS_FILE ?= "rock-pi-4.wks" +IMAGE_FSTYPES += "wic wic.bmap" + +WKS_FILE_DEPENDS ?= " \ + mtools-native \ + dosfstools-native \ + virtual/bootloader \ + virtual/kernel \ + " +IMAGE_BOOT_FILES ?= "\ + ${KERNEL_IMAGETYPE} \ + " + +SERIAL_CONSOLES = "1500000;ttyS2" + +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
wic/rock-pi-4.wks new file +7 -0
@@ -0,0 +1,7 @@ +# Copyright (C) 2020 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +include rk3399-boot.wks +part / --align 131072 --source rootfs --fstype=ext4 --label root + +bootloader --ptable gpt --append="console=tty1 console=ttyS2,1500000n8 rw root=/dev/mmcblk1p7 rootfstype=ext4 init=/sbin/init"
Signature · 1 line
2.24.1