qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make.sh: improve aarch32 build 

Change-Id: I7e39b0cb71a534cf073d38f2bab28069dbad1b26
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2019-05-23 10:20:25 +08:00 committed by Jianhong Chen
parent 9ad51843bf
commit 5202fe1fb4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
make.sh
View File

@ -66,7 +66,6 @@ PLATFORM_RSA=
PLATFORM_SHA= PLATFORM_SHA=
PLATFORM_UBOOT_IMG_SIZE= PLATFORM_UBOOT_IMG_SIZE=
PLATFORM_TRUST_IMG_SIZE= PLATFORM_TRUST_IMG_SIZE=
PLATFORM_AARCH32=
# Out env param # Out env param
PACK_IGNORE_BL32=$TRUST_PACK_IGNORE_BL32 # Value only: "--ignore-bl32" PACK_IGNORE_BL32=$TRUST_PACK_IGNORE_BL32 # Value only: "--ignore-bl32"
@ -413,10 +412,11 @@ fixup_platform_configure()
PLATFORM_TRUST_IMG_SIZE="--size 1024 2" PLATFORM_TRUST_IMG_SIZE="--size 1024 2"
fi fi
# <*> Fixup PLATFORM_AARCH32 for ARM64 cpu platforms # <*> Fixup AARCH32 for ARM64 cpu platforms
if [ $RKCHIP = "RK3308" ]; then if [ $RKCHIP = "RK3308" ]; then
if grep -q '^CONFIG_ARM64_BOOT_AARCH32=y' ${OUTDIR}/.config ; then if grep -q '^CONFIG_ARM64_BOOT_AARCH32=y' ${OUTDIR}/.config ; then
PLATFORM_AARCH32="AARCH32" RKCHIP_LABEL=${RKCHIP_LABEL}"AARCH32"
RKCHIP_TRUST=${RKCHIP_TRUST}"AARCH32"
fi fi
fi fi
} }
@ -643,9 +643,9 @@ pack_trust_image()
ls trust*.img >/dev/null && rm trust*.img ls trust*.img >/dev/null && rm trust*.img
# ARM64 uses trust_merger # ARM64 uses trust_merger
if grep -Eq ''^CONFIG_ARM64=y'|'^CONFIG_ARM64_BOOT_AARCH32=y'' ${OUTDIR}/.config ; then if grep -Eq ''^CONFIG_ARM64=y'|'^CONFIG_ARM64_BOOT_AARCH32=y'' ${OUTDIR}/.config ; then
ini=${RKBIN}/RKTRUST/${RKCHIP_TRUST}${PLATFORM_AARCH32}TRUST.ini ini=${RKBIN}/RKTRUST/${RKCHIP_TRUST}TRUST.ini
if [ "${mode}" = 'all' ]; then if [ "${mode}" = 'all' ]; then
files=`ls ${RKBIN}/RKTRUST/${RKCHIP_TRUST}${PLATFORM_AARCH32}TRUST*.ini` files=`ls ${RKBIN}/RKTRUST/${RKCHIP_TRUST}TRUST*.ini`
for ini in $files for ini in $files
do do
__pack_64bit_trust_image ${ini} __pack_64bit_trust_image ${ini}
@ -672,9 +672,9 @@ finish()
{ {
echo echo
if [ "$BOARD" = '' ]; then if [ "$BOARD" = '' ]; then
echo "Platform ${RKCHIP_LABEL}${PLATFORM_AARCH32} is build OK, with exist .config" echo "Platform ${RKCHIP_LABEL} is build OK, with exist .config"
else else
echo "Platform ${RKCHIP_LABEL}${PLATFORM_AARCH32} is build OK, with new .config(make ${BOARD}_defconfig)" echo "Platform ${RKCHIP_LABEL} is build OK, with new .config(make ${BOARD}_defconfig)"
fi fi
} }