[Linaro-uefi,1/2] atf, opteed: Support BL32_EXTRA1 and BL32_EXTRA2

Message ID 20180131172743.15875-2-victor.chong@linaro.org
State Superseded
Headers show
Series
  • Add support for ATF BL32_EXTRA1 and BL32_EXTRA2
Related show

Commit Message

Victor Chong Jan. 31, 2018, 5:27 p.m.
Signed-off-by: Victor Chong <victor.chong@linaro.org>
---
 atf-build.sh    | 14 ++++++++++++--
 opteed-build.sh |  4 ++++
 2 files changed, 16 insertions(+), 2 deletions(-)

Comments

Leif Lindholm Feb. 27, 2018, 11:24 a.m. | #1
Commit message, please.

I think this looks unlikely to disrupt any current users, but a
comment from Haojian would still be appreciated.

One style comment below.

On Wed, Jan 31, 2018 at 05:27:42PM +0000, Victor Chong wrote:
> Signed-off-by: Victor Chong <victor.chong@linaro.org>
> ---
>  atf-build.sh    | 14 ++++++++++++--
>  opteed-build.sh |  4 ++++
>  2 files changed, 16 insertions(+), 2 deletions(-)
> 
> diff --git a/atf-build.sh b/atf-build.sh
> index 65d4dbc..21a7645 100755
> --- a/atf-build.sh
> +++ b/atf-build.sh
> @@ -67,7 +67,7 @@ function build_platform
>  		echo "PLATFORM_BUILDFLAGS=$PLATFORM_BUILDFLAGS"
>  	fi
>  
> -	unset BL30 BL31 BL32 BL33
> +	unset BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33
>  	BL30="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o scp_bin`"
>  	if [ $ATF_BUILDVER -gt 1 ]; then
>  		unset SCP_BL2
> @@ -100,9 +100,17 @@ function build_platform
>  		SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`"
>  
>  		TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
> +		TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"
> +		TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`"
>  		if [ X"$TOS_BIN" != X"" ]; then
>  			BL32=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN
>  		fi
> +		if [ X"$TOS_BIN_EXTRA1" != X"" ]; then
> +			BL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1
> +		fi
> +		if [ X"$TOS_BIN_EXTRA2" != X"" ]; then
> +			BL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2
> +		fi
>  
>  		if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then
>  			#
> @@ -149,7 +157,7 @@ function build_platform
>  		;;
>  	esac
>  
> -	export BL30 BL31 BL32 BL33
> +	export BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33
>  
>  	echo "BL30=$BL30"
>  	if [ $ATF_BUILDVER -gt 1 ] && [ X"$BL30" != X"" ]; then
> @@ -158,6 +166,8 @@ function build_platform
>  	fi
>  	echo "BL31=$BL31"
>  	echo "BL32=$BL32"
> +	echo "BL32_EXTRA1=$BL32_EXTRA1"
> +	echo "BL32_EXTRA2=$BL32_EXTRA2"
>  	echo "BL33=$BL33"
>  	echo "$SPD_OPTION"
>  	echo "BUILD_TYPE=$BUILD_TYPE"
> diff --git a/opteed-build.sh b/opteed-build.sh
> index 702860e..ac9a9cb 100755
> --- a/opteed-build.sh
> +++ b/opteed-build.sh
> @@ -100,10 +100,14 @@ function build_platform
>  		# Copy resulting images to UEFI image dir
>  		#
>  		TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
> +		TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"
> +                TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`"

Indentation looks funny. Please use tabs to conform with surrounding code.

/
    Leif

>  		if [ $VERBOSE -eq 1 ]; then
>  			echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'"
>  		fi
>  		cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
> +		cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA1" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
> +		cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA2" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
>  	else
>  		return 1
>  	fi
> -- 
> 2.15.1
>
Haojian Zhuang Feb. 28, 2018, 1:44 a.m. | #2
On 02/27/2018 07:24 PM, Leif Lindholm wrote:
> Commit message, please.
> 
> I think this looks unlikely to disrupt any current users, but a
> comment from Haojian would still be appreciated.
> 
> One style comment below.
> 
> On Wed, Jan 31, 2018 at 05:27:42PM +0000, Victor Chong wrote:
>> Signed-off-by: Victor Chong <victor.chong@linaro.org>
>> ---
>>   atf-build.sh    | 14 ++++++++++++--
>>   opteed-build.sh |  4 ++++
>>   2 files changed, 16 insertions(+), 2 deletions(-)
>>
>> diff --git a/atf-build.sh b/atf-build.sh
>> index 65d4dbc..21a7645 100755
>> --- a/atf-build.sh
>> +++ b/atf-build.sh
>> @@ -67,7 +67,7 @@ function build_platform
>>   		echo "PLATFORM_BUILDFLAGS=$PLATFORM_BUILDFLAGS"
>>   	fi
>>   
>> -	unset BL30 BL31 BL32 BL33
>> +	unset BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33
>>   	BL30="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o scp_bin`"
>>   	if [ $ATF_BUILDVER -gt 1 ]; then
>>   		unset SCP_BL2
>> @@ -100,9 +100,17 @@ function build_platform
>>   		SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`"
>>   
>>   		TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
>> +		TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"
>> +		TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`"
>>   		if [ X"$TOS_BIN" != X"" ]; then
>>   			BL32=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN
>>   		fi
>> +		if [ X"$TOS_BIN_EXTRA1" != X"" ]; then
>> +			BL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1
>> +		fi
>> +		if [ X"$TOS_BIN_EXTRA2" != X"" ]; then
>> +			BL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2
>> +		fi
>>   
>>   		if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then
>>   			#
>> @@ -149,7 +157,7 @@ function build_platform
>>   		;;
>>   	esac
>>   
>> -	export BL30 BL31 BL32 BL33
>> +	export BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33
>>   
>>   	echo "BL30=$BL30"
>>   	if [ $ATF_BUILDVER -gt 1 ] && [ X"$BL30" != X"" ]; then
>> @@ -158,6 +166,8 @@ function build_platform
>>   	fi
>>   	echo "BL31=$BL31"
>>   	echo "BL32=$BL32"
>> +	echo "BL32_EXTRA1=$BL32_EXTRA1"
>> +	echo "BL32_EXTRA2=$BL32_EXTRA2"
>>   	echo "BL33=$BL33"
>>   	echo "$SPD_OPTION"
>>   	echo "BUILD_TYPE=$BUILD_TYPE"
>> diff --git a/opteed-build.sh b/opteed-build.sh
>> index 702860e..ac9a9cb 100755
>> --- a/opteed-build.sh
>> +++ b/opteed-build.sh
>> @@ -100,10 +100,14 @@ function build_platform
>>   		# Copy resulting images to UEFI image dir
>>   		#
>>   		TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
>> +		TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"
>> +                TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`"
> 
> Indentation looks funny. Please use tabs to conform with surrounding code.
> 
> /
>      Leif
> 
>>   		if [ $VERBOSE -eq 1 ]; then
>>   			echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'"
>>   		fi
>>   		cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
>> +		cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA1" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
>> +		cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA2" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
>>   	else
>>   		return 1
>>   	fi
>> -- 
>> 2.15.1
>>

Acked. Please update according to Leif's comment.

Best Regards
Haojian
Victor Chong March 2, 2018, 3:12 a.m. | #3
On Wed, Feb 28, 2018 at 10:44 AM, Haojian Zhuang
<haojian.zhuang@linaro.org> wrote:
> On 02/27/2018 07:24 PM, Leif Lindholm wrote:
>> Commit message, please.
>>
>> I think this looks unlikely to disrupt any current users, but a
>> comment from Haojian would still be appreciated.
>>
>> One style comment below.
>>
>> On Wed, Jan 31, 2018 at 05:27:42PM +0000, Victor Chong wrote:
>>> Signed-off-by: Victor Chong <victor.chong@linaro.org>
>>> ---
>>>   atf-build.sh    | 14 ++++++++++++--
>>>   opteed-build.sh |  4 ++++
>>>   2 files changed, 16 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/atf-build.sh b/atf-build.sh
>>> index 65d4dbc..21a7645 100755
>>> --- a/atf-build.sh
>>> +++ b/atf-build.sh
>>> @@ -67,7 +67,7 @@ function build_platform
>>>              echo "PLATFORM_BUILDFLAGS=$PLATFORM_BUILDFLAGS"
>>>      fi
>>>
>>> -    unset BL30 BL31 BL32 BL33
>>> +    unset BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33
>>>      BL30="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o scp_bin`"
>>>      if [ $ATF_BUILDVER -gt 1 ]; then
>>>              unset SCP_BL2
>>> @@ -100,9 +100,17 @@ function build_platform
>>>              SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`"
>>>
>>>              TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
>>> +            TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"
>>> +            TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`"
>>>              if [ X"$TOS_BIN" != X"" ]; then
>>>                      BL32=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN
>>>              fi
>>> +            if [ X"$TOS_BIN_EXTRA1" != X"" ]; then
>>> +                    BL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1
>>> +            fi
>>> +            if [ X"$TOS_BIN_EXTRA2" != X"" ]; then
>>> +                    BL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2
>>> +            fi
>>>
>>>              if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then
>>>                      #
>>> @@ -149,7 +157,7 @@ function build_platform
>>>              ;;
>>>      esac
>>>
>>> -    export BL30 BL31 BL32 BL33
>>> +    export BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33
>>>
>>>      echo "BL30=$BL30"
>>>      if [ $ATF_BUILDVER -gt 1 ] && [ X"$BL30" != X"" ]; then
>>> @@ -158,6 +166,8 @@ function build_platform
>>>      fi
>>>      echo "BL31=$BL31"
>>>      echo "BL32=$BL32"
>>> +    echo "BL32_EXTRA1=$BL32_EXTRA1"
>>> +    echo "BL32_EXTRA2=$BL32_EXTRA2"
>>>      echo "BL33=$BL33"
>>>      echo "$SPD_OPTION"
>>>      echo "BUILD_TYPE=$BUILD_TYPE"
>>> diff --git a/opteed-build.sh b/opteed-build.sh
>>> index 702860e..ac9a9cb 100755
>>> --- a/opteed-build.sh
>>> +++ b/opteed-build.sh
>>> @@ -100,10 +100,14 @@ function build_platform
>>>              # Copy resulting images to UEFI image dir
>>>              #
>>>              TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
>>> +            TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"
>>> +                TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`"
>>
>> Indentation looks funny. Please use tabs to conform with surrounding code.

Sorry, will fix and send out v2.

>>
>> /
>>      Leif
>>
>>>              if [ $VERBOSE -eq 1 ]; then
>>>                      echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'"
>>>              fi
>>>              cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
>>> +            cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA1" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
>>> +            cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA2" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
>>>      else
>>>              return 1
>>>      fi
>>> --
>>> 2.15.1
>>>
>
> Acked. Please update according to Leif's comment.

Ok. Thanks!

>
> Best Regards
> Haojian

Patch

diff --git a/atf-build.sh b/atf-build.sh
index 65d4dbc..21a7645 100755
--- a/atf-build.sh
+++ b/atf-build.sh
@@ -67,7 +67,7 @@  function build_platform
 		echo "PLATFORM_BUILDFLAGS=$PLATFORM_BUILDFLAGS"
 	fi
 
-	unset BL30 BL31 BL32 BL33
+	unset BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33
 	BL30="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o scp_bin`"
 	if [ $ATF_BUILDVER -gt 1 ]; then
 		unset SCP_BL2
@@ -100,9 +100,17 @@  function build_platform
 		SPD="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o atf_spd`"
 
 		TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
+		TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"
+		TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`"
 		if [ X"$TOS_BIN" != X"" ]; then
 			BL32=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN
 		fi
+		if [ X"$TOS_BIN_EXTRA1" != X"" ]; then
+			BL32_EXTRA1=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA1
+		fi
+		if [ X"$TOS_BIN_EXTRA2" != X"" ]; then
+			BL32_EXTRA2=$WORKSPACE/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/$TOS_BIN_EXTRA2
+		fi
 
 		if [ X"$SPD" != X"" ] && [ X"$BL32" != X"" ]; then
 			#
@@ -149,7 +157,7 @@  function build_platform
 		;;
 	esac
 
-	export BL30 BL31 BL32 BL33
+	export BL30 BL31 BL32 BL32_EXTRA1 BL32_EXTRA2 BL33
 
 	echo "BL30=$BL30"
 	if [ $ATF_BUILDVER -gt 1 ] && [ X"$BL30" != X"" ]; then
@@ -158,6 +166,8 @@  function build_platform
 	fi
 	echo "BL31=$BL31"
 	echo "BL32=$BL32"
+	echo "BL32_EXTRA1=$BL32_EXTRA1"
+	echo "BL32_EXTRA2=$BL32_EXTRA2"
 	echo "BL33=$BL33"
 	echo "$SPD_OPTION"
 	echo "BUILD_TYPE=$BUILD_TYPE"
diff --git a/opteed-build.sh b/opteed-build.sh
index 702860e..ac9a9cb 100755
--- a/opteed-build.sh
+++ b/opteed-build.sh
@@ -100,10 +100,14 @@  function build_platform
 		# Copy resulting images to UEFI image dir
 		#
 		TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`"
+		TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`"
+                TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`"
 		if [ $VERBOSE -eq 1 ]; then
 			echo "Copying '$TOS_BIN' to '$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/'"
 		fi
 		cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
+		cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA1" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
+		cp -a out/arm-plat-"$TOS_PLATFORM"/core/"$TOS_BIN_EXTRA2" "$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/"
 	else
 		return 1
 	fi