GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload/lpgcc: Add more variables to support in-tree builds 

Add $_DOTCONFIG and $_XCOMPILE pointing to the respective files and
use them.

Change-Id: I719b42d1c8abf055948daf5b000daa30cd249edd
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47630
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Nico Huber 2020-11-14 23:37:39 +01:00
parent 3b39cb98d4
commit 3e0b3f17af
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
payloads/libpayload/bin/lpgcc
View File

@ -57,11 +57,17 @@ BASE=`dirname $0`
# This will set the _LIBDIR and _INCDIR variables used below # This will set the _LIBDIR and _INCDIR variables used below
. $BASE/lp.functions . $BASE/lp.functions
if [ $_LIBDIR != $_OBJ ]; then
_DOTCONFIG=$BASE/../libpayload.config
_XCOMPILE=$BASE/../libpayload.xcompile
else
_DOTCONFIG=$_OBJ/libpayload.config
_XCOMPILE=$_OBJ/xcompile
fi
# include libpayload config # include libpayload config
if [ -f $BASE/../libpayload.config ]; then if [ -f $_DOTCONFIG ]; then
. $BASE/../libpayload.config . $_DOTCONFIG
elif [ -f $BASE/../.config ]; then
. $BASE/../.config
else else
echo "Can't find config" echo "Can't find config"
exit 1 exit 1
@ -174,8 +180,8 @@ else
exit 1 exit 1
fi fi
if grep -q ARM64_A53_ERRATUM_843419=y $BASE/../libpayload.config && if [ "$CONFIG_LP_ARM64_A53_ERRATUM_843419" = y ] &&
grep -q fix-cortex-a53-843419 $BASE/../libpayload.xcompile; then grep -q fix-cortex-a53-843419 $_XCOMPILE; then
_LDFLAGS="$_LDFLAGS -Wl,--fix-cortex-a53-843419" _LDFLAGS="$_LDFLAGS -Wl,--fix-cortex-a53-843419"
fi fi