diff --git a/config/sources/families/mvebu64.conf b/config/sources/families/mvebu64.conf
index 90b0a97d4..1a78ace60 100644
--- a/config/sources/families/mvebu64.conf
+++ b/config/sources/families/mvebu64.conf
@@ -28,7 +28,8 @@ BOOTSCRIPT_OUTPUT='boot.scr'
OVERLAY_DIR="/boot/dtb/marvell/overlay"
ATFSOURCE='https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git'
ATFDIR='arm-trusted-firmware-espressobin'
-ATFBRANCH='tag:v2.8'
+ATFBRANCH='tag:v2.10'
+#ATFBRANCH='tag:v2.8'
ATF_USE_GCC='> 7.2'
if [[ "${SKIP_EXTERNAL_TOOLCHAINS}" == "yes" ]]; then
@@ -126,7 +127,7 @@ uboot_custom_postprocess() {
local atfdir="$SRC/cache/sources/$ATFDIR/${ATFBRANCH##*:}"
local ubootdir="$SRC/cache/sources/u-boot-worktree/$BOOTDIR/${BOOTBRANCH##*:}"
local moxbootdir="$SRC/cache/sources/mox-boot"
- cd $atfdir
+ cd $atfdir
if [[ $BOARD = macchiatobin-doubleshot ]]; then
run_host_command_logged make distclean
@@ -139,6 +140,9 @@ uboot_custom_postprocess() {
run_host_command_logged cp -pv build/a80x0_mcbin/release/flash-image.bin $ubootdir/$FILENAME
else
cd $moxbootdir
+#$HL
+ [[ -f Makefile ]] && sed -i "s/aarch64-unknown-linux-gnu-/aarch64-linux-gnu-/" Makefile
+ [[ -f wtmi/a53_helper/Makefile ]] && sed -i "s/aarch64-unknown-linux-gnu-/aarch64-linux-gnu-/" wtmi/a53_helper/Makefile
make clean # @TODO: rpardini: why?
run_host_command_logged "CFLAGS=-fdiagnostics-color=always" pipetty make CROSS_CM3=$ATF2 wtmi_app.bin
cd $atfdir
diff --git a/lib/functions/compilation/atf.sh b/lib/functions/compilation/atf.sh
index 2c6b55408..7205c0366 100644
--- a/lib/functions/compilation/atf.sh
+++ b/lib/functions/compilation/atf.sh
@@ -71,7 +71,8 @@ compile_atf() {
display_alert "Binutils version for ATF" "${binutils_version}" "info"
if linux-version compare "${binutils_version}" ge "2.39"; then
display_alert "Binutils version for ATF" ">= 2.39, adding --no-warn-rwx-segment" "info"
- binutils_flags_atf="-Wl,--no-warn-rwx-segment"
+ #binutils_flags_atf="-Wl,--no-warn-rwx-segment"
+ binutils_flags_atf="--no-warn-rwx-segment"
fi
# - ENABLE_BACKTRACE="0" has been added to workaround a regression in ATF. Check: https://github.com/armbian/build/issues/1157
with the patch, I am able to generate a image to run a espressobin v5 board, it should be ok for v7 board.
