enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Meson S4/T7: Allow building on arm64 platform

Browse Source
This commit is contained in:
Gunjan Gupta 2024-05-02 15:55:07 +05:30 committed by Igor
parent c7492bedc1
commit a14578f355
2 changed files with 119 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/sources/families/meson-s4t7.conf
View File

@ -50,14 +50,16 @@ function add_host_dependencies__khadas_fips_needs_xxd() {
function fetch_sources_tools__meson_s4t7_download_uboot_toolchain() {
display_alert "$BOARD" "preparing linaro toolchain for bootloader fip" "info"
if [[ "${HOSTARCH}" != "amd64" ]]; then
exit_with_error "vim1s/vim4 uboot requires amd64 system to build"
if [[ "${HOSTARCH}" != "amd64" ]] && [[ "${HOSTARCH}" != "arm64" ]]; then
exit_with_error "vim1s/vim4 uboot requires amd64 or arm64 system to build"
fi
declare tversion="7.3.1-2018.05"
declare tbasedir="${SRC}/cache/toolchain"
declare tdir="${tbasedir}/gcc-linaro-${tversion}-x86_64_aarch64-elf"
declare tfile="gcc-linaro-${tversion}-x86_64_aarch64-elf.tar.xz"
declare tos="x86_64"
[[ "${HOSTARCH}" == "arm64" ]] && tos="aarch64"
declare tdir="${tbasedir}/gcc-linaro-${tversion}-${tos}_aarch64-elf"
declare tfile="gcc-linaro-${tversion}-${tos}_aarch64-elf.tar.xz"
declare turl="https://dl.armbian.com/_toolchain/${tfile}"
if [[ ! -d "${tdir}" ]]; then

113
patch/u-boot/u-boot-meson-s4t7/allow-aarch64-compilation.patch Normal file
View File

@ -0,0 +1,113 @@
From b3e36f79e4e71699366575716ac34da15dfdd9a2 Mon Sep 17 00:00:00 2001
From: Gunjan Gupta <viraniac@gmail.com>
Date: Thu, 2 May 2024 11:06:51 +0000
Subject: [PATCH] Allow building on arm64 platform
---
fip/s4/bin/add-dvinit-params.sh | 4 ++++
fip/s4/bin/gen-bl.sh | 5 +++++
fip/s4/build.sh | 6 +++++-
fip/t7/bin/add-dvinit-params.sh | 4 ++++
fip/t7/bin/gen-bl.sh | 5 +++++
fip/t7/build.sh | 6 +++++-
6 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/fip/s4/bin/add-dvinit-params.sh b/fip/s4/bin/add-dvinit-params.sh
index 79e7afc0c0c..f98c7a79bd8 100755
--- a/fip/s4/bin/add-dvinit-params.sh
+++ b/fip/s4/bin/add-dvinit-params.sh
@@ -10,6 +10,10 @@ set -e
EXEC_BASEDIR=$(dirname $(readlink -f $0))
ACPU_IMAGETOOL=${EXEC_BASEDIR}/../binary-tool/acpu-imagetool
+if [ $(arch) != "x86_64" ]; then
+ ACPU_IMAGETOOL="qemu-x86_64-static ${ACPU_IMAGETOOL}"
+fi
+
BASEDIR_TOP=$(readlink -f ${EXEC_BASEDIR}/..)
#
diff --git a/fip/s4/bin/gen-bl.sh b/fip/s4/bin/gen-bl.sh
index 5a8d267fd15..6d0bf541059 100755
--- a/fip/s4/bin/gen-bl.sh
+++ b/fip/s4/bin/gen-bl.sh
@@ -9,6 +9,11 @@ set -e
EXEC_BASEDIR=$(dirname $(readlink -f $0))
ACPU_IMAGETOOL=${EXEC_BASEDIR}/../binary-tool/acpu-imagetool
+
+if [ $(arch) != "x86_64" ]; then
+ ACPU_IMAGETOOL="qemu-x86_64-static ${ACPU_IMAGETOOL}"
+fi
+
CP=cp
BASEDIR_TOP=$(readlink -f ${EXEC_BASEDIR}/..)
diff --git a/fip/s4/build.sh b/fip/s4/build.sh
index ec0705c9081..3b54617c391 100755
--- a/fip/s4/build.sh
+++ b/fip/s4/build.sh
@@ -577,7 +577,11 @@ function cleanup() {
function encrypt_step() {
dbg "encrypt: $@"
local ret=0
- ./${FIP_FOLDER}${CUR_SOC}/aml_encrypt_${CUR_SOC} $@
+ if [ $(arch) != "x86_64" ]; then
+ qemu-x86_64-static ./${FIP_FOLDER}${CUR_SOC}/aml_encrypt_${CUR_SOC} $@
+ else
+ ./${FIP_FOLDER}${CUR_SOC}/aml_encrypt_${CUR_SOC} $@
+ fi
ret=$?
if [ 0 != $ret ]; then
echo "Err! aml_encrypt_${CUR_SOC} return $ret"
diff --git a/fip/t7/bin/add-dvinit-params.sh b/fip/t7/bin/add-dvinit-params.sh
index 261edb6aa45..116a64360a8 100755
--- a/fip/t7/bin/add-dvinit-params.sh
+++ b/fip/t7/bin/add-dvinit-params.sh
@@ -10,6 +10,10 @@ set -e
EXEC_BASEDIR=$(dirname $(readlink -f $0))
ACPU_IMAGETOOL=${EXEC_BASEDIR}/../binary-tool/acpu-imagetool
+if [ $(arch) != "x86_64" ]; then
+ ACPU_IMAGETOOL="qemu-x86_64-static ${ACPU_IMAGETOOL}"
+fi
+
BASEDIR_TOP=$(readlink -f ${EXEC_BASEDIR}/..)
#
diff --git a/fip/t7/bin/gen-bl.sh b/fip/t7/bin/gen-bl.sh
index 9122db65ed8..d87c696bd2b 100755
--- a/fip/t7/bin/gen-bl.sh
+++ b/fip/t7/bin/gen-bl.sh
@@ -9,6 +9,11 @@ set -e
EXEC_BASEDIR=$(dirname $(readlink -f $0))
ACPU_IMAGETOOL=${EXEC_BASEDIR}/../binary-tool/acpu-imagetool
+
+if [ $(arch) != "x86_64" ]; then
+ ACPU_IMAGETOOL="qemu-x86_64-static ${ACPU_IMAGETOOL}"
+fi
+
CP=cp
BASEDIR_TOP=$(readlink -f ${EXEC_BASEDIR}/..)
diff --git a/fip/t7/build.sh b/fip/t7/build.sh
index 2ad7bf85076..9209fff49c3 100755
--- a/fip/t7/build.sh
+++ b/fip/t7/build.sh
@@ -576,7 +576,11 @@ function cleanup() {
function encrypt_step() {
dbg "encrypt: $@"
local ret=0
- ./${FIP_FOLDER}${CUR_SOC}/aml_encrypt_${CUR_SOC} $@
+ if [ $(arch) != "x86_64" ]; then
+ qemu-x86_64-static ./${FIP_FOLDER}${CUR_SOC}/aml_encrypt_${CUR_SOC} $@
+ else
+ ./${FIP_FOLDER}${CUR_SOC}/aml_encrypt_${CUR_SOC} $@
+ fi
ret=$?
if [ 0 != $ret ]; then
echo "Err! aml_encrypt_${CUR_SOC} return $ret"
--
2.34.1