114 lines
3.4 KiB
Diff
114 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Gunjan Gupta <viraniac@gmail.com>
|
|
Date: Thu, 2 May 2024 11:06:51 +0000
|
|
Subject: 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 111111111111..222222222222 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 111111111111..222222222222 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 111111111111..222222222222 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 111111111111..222222222222 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 111111111111..222222222222 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 111111111111..222222222222 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"
|
|
--
|
|
Armbian
|
|
|