• Subject: [edk2] [PATCH] BaseTools/build_rule: disable DTC legacy phandle format
  • Author: Ard Biesheuvel
  • Date: Jan. 5, 2018, 9:36 a.m.
  • Patches: 1 / 1
Changeset
BaseTools/Conf/build_rule.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Git apply log
Switched to a new branch '20180105093629.7885-1-ard.biesheuvel@linaro.org'
Applying: BaseTools/build_rule: disable DTC legacy phandle format
error: patch failed: BaseTools/Conf/build_rule.template:250
error: BaseTools/Conf/build_rule.template: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Using index info to reconstruct a base tree...
Patch failed at 0001 BaseTools/build_rule: disable DTC legacy phandle format
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Failed to apply patch:
[edk2] [PATCH] BaseTools/build_rule: disable DTC legacy phandle format
[edk2] [PATCH] BaseTools/build_rule: disable DTC legacy phandle format
Posted by Ard Biesheuvel, 24 weeks ago
By default, the device tree compiler emits phandle properties twice:
one called 'phandle' and another called 'linux,phandle'. Given that
Linux was updated in early 2010 [0] to accept the former (which is
what is specified in the ePAPR and device tree specifications), there
is no point in emitting both when compiling device trees for UEFI
platforms.

[0] 04b954a673dd02f585a2769c4945a43880faa989
    "of/flattree: Make the kernel accept ePAPR style phandle information"

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 BaseTools/Conf/build_rule.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 3e6aa8ff0f34..10a91fe3a6c6 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -250,7 +250,7 @@
 
     <Command.GCC>
         "$(PP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
-        "$(DTC)" -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
+        "$(DTC)" -H epapr -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
 
 [Visual-Form-Representation-File]
     <InputFile>
-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] BaseTools/build_rule: disable DTC legacy phandle format
Posted by Laszlo Ersek, 24 weeks ago
On 01/05/18 10:36, Ard Biesheuvel wrote:
> By default, the device tree compiler emits phandle properties twice:
> one called 'phandle' and another called 'linux,phandle'. Given that
> Linux was updated in early 2010 [0] to accept the former (which is
> what is specified in the ePAPR and device tree specifications), there
> is no point in emitting both when compiling device trees for UEFI
> platforms.
> 
> [0] 04b954a673dd02f585a2769c4945a43880faa989
>     "of/flattree: Make the kernel accept ePAPR style phandle information"
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  BaseTools/Conf/build_rule.template | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
> index 3e6aa8ff0f34..10a91fe3a6c6 100755
> --- a/BaseTools/Conf/build_rule.template
> +++ b/BaseTools/Conf/build_rule.template
> @@ -250,7 +250,7 @@
>  
>      <Command.GCC>
>          "$(PP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
> -        "$(DTC)" -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
> +        "$(DTC)" -H epapr -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
>  
>  [Visual-Form-Representation-File]
>      <InputFile>
> 

[0] is part of Linux v2.6.34 :)

Reviewed-by: Laszlo Ersek <lersek@redhat.com>


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] BaseTools/build_rule: disable DTC legacy phandle format
Posted by Gao, Liming, 23 weeks ago
Ard:
  How about introduce DTC_FLAGS in tools_def.txt? It can avoid the future change in build_rule.txt.

Thanks
Liming
>-----Original Message-----
>From: Laszlo Ersek [mailto:lersek@redhat.com]
>Sent: Saturday, January 06, 2018 4:20 AM
>To: Ard Biesheuvel <ard.biesheuvel@linaro.org>; edk2-devel@lists.01.org;
>Gao, Liming <liming.gao@intel.com>
>Subject: Re: [edk2] [PATCH] BaseTools/build_rule: disable DTC legacy phandle
>format
>
>On 01/05/18 10:36, Ard Biesheuvel wrote:
>> By default, the device tree compiler emits phandle properties twice:
>> one called 'phandle' and another called 'linux,phandle'. Given that
>> Linux was updated in early 2010 [0] to accept the former (which is
>> what is specified in the ePAPR and device tree specifications), there
>> is no point in emitting both when compiling device trees for UEFI
>> platforms.
>>
>> [0] 04b954a673dd02f585a2769c4945a43880faa989
>>     "of/flattree: Make the kernel accept ePAPR style phandle information"
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> ---
>>  BaseTools/Conf/build_rule.template | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/BaseTools/Conf/build_rule.template
>b/BaseTools/Conf/build_rule.template
>> index 3e6aa8ff0f34..10a91fe3a6c6 100755
>> --- a/BaseTools/Conf/build_rule.template
>> +++ b/BaseTools/Conf/build_rule.template
>> @@ -250,7 +250,7 @@
>>
>>      <Command.GCC>
>>          "$(PP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
>> -        "$(DTC)" -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
>> +        "$(DTC)" -H epapr -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
>>
>>  [Visual-Form-Representation-File]
>>      <InputFile>
>>
>
>[0] is part of Linux v2.6.34 :)
>
>Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel